Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-05 21:07:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #210460 (#210543)

Browse Source 
Signed-off-by: Henning Dieterichs <hdieterichs@microsoft.com>
This commit is contained in:
Henning Dieterichs
2024-04-25 11:50:00 +02:00
committed by GitHub
parent d7b54f7b04
commit 39e7f05ca6
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/browser/parts/editor/diffEditorCommands.ts
+21 -11
View File
@@ -3,15 +3,15 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
import { localize2, localize } from 'vs/nls';
import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
import { localize, localize2 } from 'vs/nls';
import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
import { TextDiffEditor } from 'vs/workbench/browser/parts/editor/textDiffEditor';
import { TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveCompareEditorCanSwapContext } from 'vs/workbench/common/contextkeys';
import { ActiveCompareEditorCanSwapContext, TextCompareEditorActiveContext, TextCompareEditorVisibleContext } from 'vs/workbench/common/contextkeys';
import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -104,17 +104,27 @@ export function registerDiffEditorCommands(): void {
}
function toggleDiffSideBySide(accessor: ServicesAccessor): void {
const configurationService = accessor.get(IConfigurationService);
const configService = accessor.get(ITextResourceConfigurationService);
const activeTextDiffEditor = getActiveTextDiffEditor(accessor);
const newValue = !configurationService.getValue('diffEditor.renderSideBySide');
configurationService.updateValue('diffEditor.renderSideBySide', newValue);
const m = activeTextDiffEditor?.getControl()?.getModifiedEditor()?.getModel();
if (!m) { return; }
const key = 'diffEditor.renderSideBySide';
const val = configService.getValue(m.uri, key);
configService.updateValue(m.uri, key, !val);
}
function toggleDiffIgnoreTrimWhitespace(accessor: ServicesAccessor): void {
const configurationService = accessor.get(IConfigurationService);
const configService = accessor.get(ITextResourceConfigurationService);
const activeTextDiffEditor = getActiveTextDiffEditor(accessor);
const newValue = !configurationService.getValue('diffEditor.ignoreTrimWhitespace');
configurationService.updateValue('diffEditor.ignoreTrimWhitespace', newValue);
const m = activeTextDiffEditor?.getControl()?.getModifiedEditor()?.getModel();
if (!m) { return; }
const key = 'diffEditor.ignoreTrimWhitespace';
const val = configService.getValue(m.uri, key);
configService.updateValue(m.uri, key, !val);
}
async function swapDiffSides(accessor: ServicesAccessor): Promise<void> {