Skip to content

Fix IME composition handling in input box #829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+6 −3
Open

Fix IME composition handling in input box #829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b081ec1
Fix IME composition handling in input box
izerui Jul 17, 2025
792ba73
Fix function name syntax in code.sh script
izerui Jul 18, 2025
45dd0a4
Merge branch 'voideditor:main' into main
izerui Jul 26, 2025
eceede7
Merge branch 'voideditor:main' into main
izerui Aug 5, 2025
d427707
Merge branch 'voideditor:main' into main
izerui Aug 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/code.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function code() {
exec "$CODE" . $DISABLE_TEST_EXTENSION "$@"
}

function code-wsl()
function code_wsl()
{
HOST_IP=$(echo "" | powershell.exe -noprofile -Command "& {(Get-NetIPAddress | Where-Object {\$_.InterfaceAlias -like '*WSL*' -and \$_.AddressFamily -eq 'IPv4'}).IPAddress | Write-Host -NoNewline}")
export DISPLAY="$HOST_IP:0"
Expand All @@ -77,7 +77,7 @@ function code-wsl()
}

if [ "$IN_WSL" == "true" ] && [ -z "$DISPLAY" ]; then
code-wsl "$@"
code_wsl "$@"
elif [ -f /mnt/wslg/versions.txt ]; then
code --disable-gpu "$@"
elif [ -f /.dockerenv ]; then
Expand Down
5 changes: 4 additions & 1 deletion src/vs/workbench/contrib/void/browser/react/src/util/inputs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,10 @@ export const VoidInputBox2 = forwardRef<HTMLTextAreaElement, InputBox2Props>(fun
if (e.key === 'Enter') {
// Shift + Enter when multiline = newline
const shouldAddNewline = e.shiftKey && multiline
if (!shouldAddNewline) e.preventDefault(); // prevent newline from being created
// 只有在非输入法组合状态下才阻止默认行为
if (!shouldAddNewline && !e.nativeEvent.isComposing) {
e.preventDefault(); // prevent newline from being created
}
}
onKeyDown?.(e)
}, [onKeyDown, onMenuKeyDown, multiline])}
Expand Down