@codingame/monaco-vscode-multi-diff-editor-service-override 19.1.4 → 20.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 (6) hide show
  1. package/index.js +1 -1
  2. package/package.json +8 -8
  3. package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/actions.js +6 -5
  4. package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.js +3 -3
  5. package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.d.ts +4 -4
  6. package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.js +3 -3
package/index.js CHANGED
@@ -1,7 +1,7 @@
1
1
 
2
2
  import '@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices';
3
3
  import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
4
- import { MultiDiffSourceResolverService } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
4
+ import { MultiDiffSourceResolverService } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
5
5
  import { IMultiDiffSourceResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service';
6
6
  import './vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.js';
7
7
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-multi-diff-editor-service-override",
3
- "version": "19.1.4",
3
+ "version": "20.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": "19.1.4",
19
- "@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common": "19.1.4",
20
- "@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common": "19.1.4",
21
- "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "19.1.4",
22
- "@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common": "19.1.4",
23
- "@codingame/monaco-vscode-api": "19.1.4",
24
- "@codingame/monaco-vscode-f99b74f5-fcb7-512f-8c6c-35f5a107577d-common": "19.1.4"
18
+ "@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common": "20.0.0",
19
+ "@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common": "20.0.0",
20
+ "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "20.0.0",
21
+ "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common": "20.0.0",
22
+ "@codingame/monaco-vscode-api": "20.0.0",
23
+ "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common": "20.0.0",
24
+ "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "20.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
@@ -5,9 +5,9 @@ import { Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform
5
5
  import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
6
6
  import { TextEditorSelectionRevealType } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
7
7
  import { IListService } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService.service';
8
- import { resolveCommandsContext } from '@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
8
+ import { resolveCommandsContext } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
9
9
  import { MultiDiffEditor } from './multiDiffEditor.js';
10
- import { MultiDiffEditorInput } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
10
+ import { MultiDiffEditorInput } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
11
11
  import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
12
12
  import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
13
13
  import { ActiveEditorContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
@@ -16,7 +16,7 @@ class GoToFileAction extends Action2 {
16
16
  constructor() {
17
17
  super({
18
18
  id: 'multiDiffEditor.goToFile',
19
- title: ( localize2(8353, 'Open File')),
19
+ title: ( localize2(8510, 'Open File')),
20
20
  icon: Codicon.goToFile,
21
21
  precondition: ( ActiveEditorContext.isEqualTo(MultiDiffEditor.ID)),
22
22
  menu: {
@@ -45,6 +45,7 @@ class GoToFileAction extends Action2 {
45
45
  targetUri = item.goToFileUri;
46
46
  }
47
47
  await editorService.openEditor({
48
+ label: item?.goToFileEditorTitle,
48
49
  resource: targetUri,
49
50
  options: {
50
51
  selection: selections?.[0],
@@ -57,7 +58,7 @@ class CollapseAllAction extends Action2 {
57
58
  constructor() {
58
59
  super({
59
60
  id: 'multiDiffEditor.collapseAll',
60
- title: ( localize2(8354, 'Collapse All Diffs')),
61
+ title: ( localize2(8511, 'Collapse All Diffs')),
61
62
  icon: Codicon.collapseAll,
62
63
  precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)), ContextKeyExpr.not('multiDiffEditorAllCollapsed'))),
63
64
  menu: ( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
@@ -86,7 +87,7 @@ class ExpandAllAction extends Action2 {
86
87
  constructor() {
87
88
  super({
88
89
  id: 'multiDiffEditor.expandAll',
89
- title: ( localize2(8355, 'Expand All Diffs')),
90
+ title: ( localize2(8512, 'Expand All Diffs')),
90
91
  icon: Codicon.expandAll,
91
92
  precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)), ( ContextKeyExpr.has('multiDiffEditorAllCollapsed')))),
92
93
  menu: ( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.js CHANGED
@@ -8,13 +8,13 @@ import { EditorPaneDescriptor } from '@codingame/monaco-vscode-60014c9d-b815-501
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
- import { MultiDiffEditorResolverContribution, MultiDiffEditorInput, MultiDiffEditorSerializer } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
11
+ import { MultiDiffEditorResolverContribution, MultiDiffEditorInput, MultiDiffEditorSerializer } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
12
12
  import { GoToFileAction, CollapseAllAction, ExpandAllAction } from './actions.js';
13
13
  import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
14
14
  import '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
15
15
  import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
16
16
  import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
17
- import { OpenScmGroupAction, ScmMultiDiffSourceResolverContribution } from '@codingame/monaco-vscode-f99b74f5-fcb7-512f-8c6c-35f5a107577d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
17
+ import { OpenScmGroupAction, ScmMultiDiffSourceResolverContribution } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
18
18
 
19
19
  registerAction2(GoToFileAction);
20
20
  registerAction2(CollapseAllAction);
@@ -31,7 +31,7 @@ registerAction2(ExpandAllAction);
31
31
  });
32
32
  registerWorkbenchContribution2(MultiDiffEditorResolverContribution.ID, MultiDiffEditorResolverContribution, WorkbenchPhase.BlockStartup );
33
33
  ( Registry.as(EditorExtensions.EditorPane))
34
- .registerEditorPane(EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localize(8357, "Multi Diff Editor"))), [( new SyncDescriptor(MultiDiffEditorInput))]);
34
+ .registerEditorPane(EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localize(8514, "Multi Diff Editor"))), [( new SyncDescriptor(MultiDiffEditorInput))]);
35
35
  ( Registry.as(EditorExtensions.EditorFactory))
36
36
  .registerEditorSerializer(MultiDiffEditorInput.ID, MultiDiffEditorSerializer);
37
37
  registerAction2(OpenScmGroupAction);
package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.d.ts CHANGED
@@ -5,20 +5,20 @@ import { InstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pla
5
5
  import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
6
6
  import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
7
7
  import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
8
- import { AbstractEditorWithViewState } from "@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common/vscode/vs/workbench/browser/parts/editor/editorWithViewState";
8
+ import { AbstractEditorWithViewState } from "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/browser/parts/editor/editorWithViewState";
9
9
  import { ICompositeControl } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/composite";
10
10
  import { IEditorOpenContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
11
11
  import { EditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput";
12
- import { MultiDiffEditorInput } from "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput";
12
+ import { MultiDiffEditorInput } from "@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput";
13
13
  import { IEditorGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService";
14
14
  import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
15
15
  import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
16
16
  import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
17
- import { MultiDiffEditorViewModel } from "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel";
17
+ import { MultiDiffEditorViewModel } from "@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel";
18
18
  import { IMultiDiffEditorOptions, IMultiDiffEditorViewState } from "@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common/vscode/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl";
19
19
  import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
20
20
  import { IDiffEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon";
21
- import { MultiDiffEditorItem } from "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
21
+ import { MultiDiffEditorItem } from "@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
22
22
  import { IEditorProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
23
23
  export declare class MultiDiffEditor extends AbstractEditorWithViewState<IMultiDiffEditorViewState> {
24
24
  private editorProgressService;
package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.js CHANGED
@@ -6,9 +6,9 @@ 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-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/browser/labels';
10
- import { AbstractEditorWithViewState } from '@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common/vscode/vs/workbench/browser/parts/editor/editorWithViewState';
11
- import { MultiDiffEditorInput } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
9
+ import { ResourceLabel } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/workbench/browser/labels';
10
+ import { AbstractEditorWithViewState } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/browser/parts/editor/editorWithViewState';
11
+ import { MultiDiffEditorInput } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-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';
13
13
  import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
14
14
  import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';