@codingame/monaco-vscode-multi-diff-editor-service-override 17.2.0 → 18.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +8 -8
  2. package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/actions.js +9 -9
  3. package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.js +3 -2
  4. package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-multi-diff-editor-service-override",
3
- "version": "17.2.0",
3
+ "version": "18.0.0",
4
4
  "private": false,
5
5
  "description": "VSCode public API plugged on the monaco editor - multi-diff-editor service-override",
6
6
  "keywords": [],
@@ -15,13 +15,13 @@
15
15
  },
16
16
  "type": "module",
17
17
  "dependencies": {
18
- "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common": "17.2.0",
19
- "@codingame/monaco-vscode-25a9b730-95ad-54d3-8807-71421ad9b891-common": "17.2.0",
20
- "@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common": "17.2.0",
21
- "@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common": "17.2.0",
22
- "@codingame/monaco-vscode-api": "17.2.0",
23
- "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common": "17.2.0",
24
- "@codingame/monaco-vscode-f99b74f5-fcb7-512f-8c6c-35f5a107577d-common": "17.2.0"
18
+ "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common": "18.0.0",
19
+ "@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common": "18.0.0",
20
+ "@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common": "18.0.0",
21
+ "@codingame/monaco-vscode-api": "18.0.0",
22
+ "@codingame/monaco-vscode-dcfc2191-2da1-54c7-8fb7-e92c5d11ecef-common": "18.0.0",
23
+ "@codingame/monaco-vscode-f24b7f0a-ceeb-5877-9148-81eb98a4f5d7-common": "18.0.0",
24
+ "@codingame/monaco-vscode-f99b74f5-fcb7-512f-8c6c-35f5a107577d-common": "18.0.0"
25
25
  },
26
26
  "main": "index.js",
27
27
  "module": "index.js",
package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/actions.js CHANGED
@@ -16,7 +16,7 @@ class GoToFileAction extends Action2 {
16
16
  constructor() {
17
17
  super({
18
18
  id: 'multiDiffEditor.goToFile',
19
- title: ( localize2(7902, 'Open File')),
19
+ title: ( localize2(8130, 'Open File')),
20
20
  icon: Codicon.goToFile,
21
21
  precondition: ( ActiveEditorContext.isEqualTo(MultiDiffEditor.ID)),
22
22
  menu: {
@@ -57,15 +57,15 @@ class CollapseAllAction extends Action2 {
57
57
  constructor() {
58
58
  super({
59
59
  id: 'multiDiffEditor.collapseAll',
60
- title: ( localize2(7903, 'Collapse All Diffs')),
60
+ title: ( localize2(8131, 'Collapse All Diffs')),
61
61
  icon: Codicon.collapseAll,
62
62
  precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)), ContextKeyExpr.not('multiDiffEditorAllCollapsed'))),
63
- menu: {
63
+ menu: ( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
64
+ id,
64
65
  when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)), ContextKeyExpr.not('multiDiffEditorAllCollapsed'))),
65
- id: MenuId.EditorTitle,
66
66
  group: 'navigation',
67
67
  order: 100
68
- },
68
+ }))),
69
69
  f1: true,
70
70
  });
71
71
  }
@@ -86,15 +86,15 @@ class ExpandAllAction extends Action2 {
86
86
  constructor() {
87
87
  super({
88
88
  id: 'multiDiffEditor.expandAll',
89
- title: ( localize2(7904, 'Expand All Diffs')),
89
+ title: ( localize2(8132, 'Expand All Diffs')),
90
90
  icon: Codicon.expandAll,
91
91
  precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)), ( ContextKeyExpr.has('multiDiffEditorAllCollapsed')))),
92
- menu: {
92
+ menu: ( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
93
+ id,
93
94
  when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)), ( ContextKeyExpr.has('multiDiffEditorAllCollapsed')))),
94
- id: MenuId.EditorTitle,
95
95
  group: 'navigation',
96
96
  order: 100
97
- },
97
+ }))),
98
98
  f1: true,
99
99
  });
100
100
  }
package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.js CHANGED
@@ -4,12 +4,13 @@ import { registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform
4
4
  import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
5
5
  import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
6
6
  import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
7
- import { EditorPaneDescriptor } from '@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/workbench/browser/editor';
7
+ import { EditorPaneDescriptor } from '@codingame/monaco-vscode-dcfc2191-2da1-54c7-8fb7-e92c5d11ecef-common/vscode/vs/workbench/browser/editor';
8
8
  import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
9
9
  import { EditorExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
10
10
  import { MultiDiffEditor } from './multiDiffEditor.js';
11
11
  import { MultiDiffEditorResolverContribution, MultiDiffEditorInput, MultiDiffEditorSerializer } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
12
12
  import { GoToFileAction, CollapseAllAction, ExpandAllAction } from './actions.js';
13
+ import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
13
14
  import '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
14
15
  import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
15
16
  import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
@@ -30,7 +31,7 @@ registerAction2(ExpandAllAction);
30
31
  });
31
32
  registerWorkbenchContribution2(MultiDiffEditorResolverContribution.ID, MultiDiffEditorResolverContribution, WorkbenchPhase.BlockStartup );
32
33
  ( Registry.as(EditorExtensions.EditorPane))
33
- .registerEditorPane(EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localize(7906, "Multi Diff Editor"))), [( new SyncDescriptor(MultiDiffEditorInput))]);
34
+ .registerEditorPane(EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localize(8134, "Multi Diff Editor"))), [( new SyncDescriptor(MultiDiffEditorInput))]);
34
35
  ( Registry.as(EditorExtensions.EditorFactory))
35
36
  .registerEditorSerializer(MultiDiffEditorInput.ID, MultiDiffEditorSerializer);
36
37
  registerAction2(OpenScmGroupAction);
package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.js CHANGED
@@ -6,7 +6,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
6
6
  import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
7
7
  import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
8
8
  import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
9
- import { ResourceLabel } from '@codingame/monaco-vscode-25a9b730-95ad-54d3-8807-71421ad9b891-common/vscode/vs/workbench/browser/labels';
9
+ import { ResourceLabel } from '@codingame/monaco-vscode-f24b7f0a-ceeb-5877-9148-81eb98a4f5d7-common/vscode/vs/workbench/browser/labels';
10
10
  import { AbstractEditorWithViewState } from '@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common/vscode/vs/workbench/browser/parts/editor/editorWithViewState';
11
11
  import { MultiDiffEditorInput } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
12
12
  import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';