b72a46db68
Some checks failed
Update All Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Triage Project Sync (#84) / Sync triage project (push) Has been cancelled
release_nightly / notify_on_failure (push) Has been cancelled
release_nightly / check_style (push) Has been cancelled
release_nightly / run_tests_windows (push) Has been cancelled
release_nightly / clippy_windows (push) Has been cancelled
release_nightly / bundle_linux_aarch64 (push) Has been cancelled
release_nightly / bundle_linux_x86_64 (push) Has been cancelled
release_nightly / bundle_mac_aarch64 (push) Has been cancelled
release_nightly / bundle_mac_x86_64 (push) Has been cancelled
release_nightly / bundle_windows_aarch64 (push) Has been cancelled
release_nightly / bundle_windows_x86_64 (push) Has been cancelled
release_nightly / build_nix_linux_x86_64 (push) Has been cancelled
release_nightly / build_nix_mac_aarch64 (push) Has been cancelled
release_nightly / update_nightly_tag (push) Has been cancelled
Hotfix Review Monitor / check-hotfix-reviews (push) Has been cancelled
Stale PR Review Reminder / check-stale-prs (push) Has been cancelled
Update Weekly Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Bump collab-staging Tag / update-collab-staging-tag (push) Has been cancelled
compliance_check / scheduled_compliance_check (push) Has been cancelled
Single-commit orphan branch: full zed-industries/zed @ 8c74db0 source tree with a 3-file patch applied (no upstream history). Patch (crates/gpui_linux/src/linux/wayland/): - serial.rs: add SerialKind::KeyboardEnter - client.rs: store wl_keyboard.enter serial; add latest_serial_of() - window.rs: activate() uses keyboard-enter serial (Mutter focus gate) Mutter honors window activation only when the token carries the keyboard- focus serial from wl_keyboard.enter; GPUI used a stale mouse-press serial. See docs/tray-window-focus-wayland.md in logiguard. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
89 lines
4.0 KiB
Markdown
89 lines
4.0 KiB
Markdown
+++
|
|
repository_url = "https://github.com/microsoft/vscode"
|
|
revision = "29e6da6efa2287aaa981635a475d425ff4fd5d5c"
|
|
+++
|
|
|
|
## Edit History
|
|
|
|
```diff
|
|
--- a/src/vs/workbench/contrib/debug/browser/debugCommands.ts
|
|
+++ b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
|
|
@@ -304,8 +304,8 @@ CommandsRegistry.registerCommand({
|
|
|
|
CommandsRegistry.registerCommand({
|
|
id: REVERSE_CONTINUE_ID,
|
|
- handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
|
|
- getThreadAndRun(accessor, context, thread => thread.reverseContinue());
|
|
+ handler: async (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
|
|
+ await getThreadAndRun(accessor, context, thread => thread.reverseContinue());
|
|
}
|
|
});
|
|
--- a/src/vs/workbench/contrib/debug/browser/debugCommands.ts
|
|
+++ b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
|
|
@@ -311,11 +311,11 @@ CommandsRegistry.registerCommand({
|
|
|
|
CommandsRegistry.registerCommand({
|
|
id: STEP_BACK_ID,
|
|
- handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
|
|
+ handler: async (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
|
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
if (CONTEXT_DISASSEMBLY_VIEW_FOCUS.getValue(contextKeyService)) {
|
|
- getThreadAndRun(accessor, context, (thread: IThread) => thread.stepBack('instruction'));
|
|
+ await getThreadAndRun(accessor, context, (thread: IThread) => thread.stepBack('instruction'));
|
|
} else {
|
|
- getThreadAndRun(accessor, context, (thread: IThread) => thread.stepBack());
|
|
+ await getThreadAndRun(accessor, context, (thread: IThread) => thread.stepBack());
|
|
}
|
|
}
|
|
});
|
|
--- a/src/vs/workbench/contrib/debug/browser/debugCommands.ts
|
|
+++ b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
|
|
@@ -323,8 +323,8 @@ CommandsRegistry.registerCommand({
|
|
|
|
CommandsRegistry.registerCommand({
|
|
id: TERMINATE_THREAD_ID,
|
|
- handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
|
|
- getThreadAndRun(accessor, context, thread => thread.terminate());
|
|
+ handler: async (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
|
|
+ await getThreadAndRun(accessor, context, thread => thread.terminate());
|
|
}
|
|
});
|
|
```
|
|
|
|
## Cursor Position
|
|
|
|
```src/vs/workbench/contrib/debug/browser/debugCommands.ts
|
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
primary: isWeb ? (KeyMod.Alt | KeyCode.F10) : KeyCode.F10, // Browsers do not allow F10 to be binded so we have to bind an alternative
|
|
when: CONTEXT_DEBUG_STATE.isEqualTo('stopped'),
|
|
handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
|
|
// ^[CURSOR_POSITION]
|
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
if (CONTEXT_DISASSEMBLY_VIEW_FOCUS.getValue(contextKeyService)) {
|
|
getThreadAndRun(accessor, context, (thread: IThread) => thread.next('instruction'));
|
|
} else {
|
|
```
|
|
|
|
## Expected Patch
|
|
|
|
```diff
|
|
--- a/src/vs/workbench/contrib/debug/browser/debugCommands.ts
|
|
+++ b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
|
|
@@ -467,10 +467,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
primary: isWeb ? (KeyMod.Alt | KeyCode.F10) : KeyCode.F10, // Browsers do not allow F10 to be binded so we have to bind an alternative
|
|
when: CONTEXT_DEBUG_STATE.isEqualTo('stopped'),
|
|
- handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
|
|
+ handler: async (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
|
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
if (CONTEXT_DISASSEMBLY_VIEW_FOCUS.getValue(contextKeyService)) {
|
|
- getThreadAndRun(accessor, context, (thread: IThread) => thread.next('instruction'));
|
|
+ await getThreadAndRun(accessor, context, (thread: IThread) => thread.next('instruction'));
|
|
} else {
|
|
- getThreadAndRun(accessor, context, (thread: IThread) => thread.next());
|
|
+ await getThreadAndRun(accessor, context, (thread: IThread) => thread.next());
|
|
}
|
|
}
|
|
});
|
|
```
|