From d2b7d737237f34d3816eb0448ae0df79eb316622 Mon Sep 17 00:00:00 2001 From: ohah Date: Sun, 26 Jan 2025 00:18:19 +0900 Subject: [PATCH 1/2] fix: scm open file use editable --- .../browser/widget/multiDiffEditor/diffEditorItemTemplate.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts b/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts index 48ac35815d4c9..9d6ae530321f8 100644 --- a/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts +++ b/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts @@ -161,7 +161,7 @@ export class DiffEditorItemTemplate extends Disposable implements IPooledObject< this._contextKeyService = this._register(_parentContextKeyService.createScoped(this._elements.actions)); const instantiationService = this._register(this._instantiationService.createChild(new ServiceCollection([IContextKeyService, this._contextKeyService]))); this._register(instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.actions, MenuId.MultiDiffEditorFileToolbar, { - actionRunner: this._register(new ActionRunnerWithContext(() => (this._viewModel.get()?.modifiedUri))), + actionRunner: this._register(new ActionRunnerWithContext(() => (this._viewModel.get()?.modifiedUri?.with({ scheme: 'file' })))), menuOptions: { shouldForwardArgs: true, }, From 3119cf27757f213c2e123eca7f84627ae9eee677 Mon Sep 17 00:00:00 2001 From: ohah Date: Sun, 26 Jan 2025 19:46:33 +0900 Subject: [PATCH 2/2] fix: path clear --- .../browser/widget/multiDiffEditor/diffEditorItemTemplate.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts b/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts index 9d6ae530321f8..09aaaddef57bd 100644 --- a/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts +++ b/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts @@ -161,7 +161,7 @@ export class DiffEditorItemTemplate extends Disposable implements IPooledObject< this._contextKeyService = this._register(_parentContextKeyService.createScoped(this._elements.actions)); const instantiationService = this._register(this._instantiationService.createChild(new ServiceCollection([IContextKeyService, this._contextKeyService]))); this._register(instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.actions, MenuId.MultiDiffEditorFileToolbar, { - actionRunner: this._register(new ActionRunnerWithContext(() => (this._viewModel.get()?.modifiedUri?.with({ scheme: 'file' })))), + actionRunner: this._register(new ActionRunnerWithContext(() => (this._viewModel.get()?.modifiedUri?.with({ scheme: 'file', query: '' })))), menuOptions: { shouldForwardArgs: true, },