diff --git a/package-lock.json b/package-lock.json index 1795ca5..0977ef2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,6 +44,7 @@ "@codingame/monaco-vscode-markers-service-override": "^3.0.0", "@codingame/monaco-vscode-media-preview-default-extension": "^3.0.0", "@codingame/monaco-vscode-model-service-override": "^3.0.0", + "@codingame/monaco-vscode-multi-diff-editor-service-override": "^3.0.0", "@codingame/monaco-vscode-notifications-service-override": "^3.0.0", "@codingame/monaco-vscode-npm-default-extension": "^3.0.0", "@codingame/monaco-vscode-objective-c-default-extension": "^3.0.0", @@ -698,6 +699,15 @@ "vscode": "npm:@codingame/monaco-vscode-api@3.0.0" } }, + "node_modules/@codingame/monaco-vscode-multi-diff-editor-service-override": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-multi-diff-editor-service-override/-/monaco-vscode-multi-diff-editor-service-override-3.0.0.tgz", + "integrity": "sha512-ttHPUokLQfjtEerjbomHni5xI73zJmRtjA8moO+7GeinuLCkQhSgAsmxW/H9xL0Tq9BhIZUsNWw/h/uQCkispA==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@3.0.0", + "vscode-marked": "npm:marked@=3.0.2" + } + }, "node_modules/@codingame/monaco-vscode-notifications-service-override": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-notifications-service-override/-/monaco-vscode-notifications-service-override-3.0.0.tgz", diff --git a/package.json b/package.json index 5286713..b2a2245 100644 --- a/package.json +++ b/package.json @@ -123,6 +123,7 @@ "@codingame/monaco-vscode-markers-service-override": "^3.0.0", "@codingame/monaco-vscode-media-preview-default-extension": "^3.0.0", "@codingame/monaco-vscode-model-service-override": "^3.0.0", + "@codingame/monaco-vscode-multi-diff-editor-service-override": "^3.0.0", "@codingame/monaco-vscode-notifications-service-override": "^3.0.0", "@codingame/monaco-vscode-npm-default-extension": "^3.0.0", "@codingame/monaco-vscode-objective-c-default-extension": "^3.0.0", diff --git a/src/features/views.ts b/src/features/views.ts index 39e1b54..2967850 100644 --- a/src/features/views.ts +++ b/src/features/views.ts @@ -1,6 +1,7 @@ import getViewsServiceOverride from '@codingame/monaco-vscode-views-service-override' import getStatusBarServiceOverride from '@codingame/monaco-vscode-view-status-bar-service-override' import getQuickAccessServiceOverride from '@codingame/monaco-vscode-quickaccess-service-override' +import getMultiDiffEditorServiceOverride from '@codingame/monaco-vscode-multi-diff-editor-service-override' import { editorOpenHandlerRegistry, registerServices, useGlobalPicker } from '../services' import '@codingame/monaco-vscode-theme-seti-default-extension' @@ -13,6 +14,7 @@ registerServices({ ...getViewsServiceOverride((model, input, sideBySide) => { return editorOpenHandlerRegistry.openCodeEditor(model, input, sideBySide) }), + ...getMultiDiffEditorServiceOverride(), ...getStatusBarServiceOverride(), ...getQuickAccessServiceOverride({ shouldUseGlobalPicker () { diff --git a/src/features/workbench.ts b/src/features/workbench.ts index 46e9351..313fe44 100644 --- a/src/features/workbench.ts +++ b/src/features/workbench.ts @@ -1,5 +1,6 @@ import getWorkbenchServiceOverride from '@codingame/monaco-vscode-workbench-service-override' import getQuickAccessServiceOverride from '@codingame/monaco-vscode-quickaccess-service-override' +import getMultiDiffEditorServiceOverride from '@codingame/monaco-vscode-multi-diff-editor-service-override' import { registerServices, useGlobalPicker } from '../services' import '@codingame/monaco-vscode-theme-seti-default-extension' @@ -10,6 +11,7 @@ import '@codingame/monaco-vscode-configuration-editing-default-extension' registerServices({ ...getWorkbenchServiceOverride(), + ...getMultiDiffEditorServiceOverride(), ...getQuickAccessServiceOverride({ shouldUseGlobalPicker () { return useGlobalPicker()