@codingame/monaco-vscode-multi-diff-editor-service-override 34.1.3 → 35.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 (3) hide show
  1. package/package.json +2 -2
  2. package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/actions.js +46 -18
  3. package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.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": "34.1.3",
3
+ "version": "35.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,7 +15,7 @@
15
15
  },
16
16
  "type": "module",
17
17
  "dependencies": {
18
- "@codingame/monaco-vscode-api": "34.1.3"
18
+ "@codingame/monaco-vscode-api": "35.0.0"
19
19
  },
20
20
  "main": "index.js",
21
21
  "module": "index.js",
package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/actions.js CHANGED
@@ -12,13 +12,13 @@ import { MultiDiffEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
12
12
  import { MultiDiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
13
13
  import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
14
14
  import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
15
- import { ActiveEditorContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
15
+ import { ActiveEditorContext, IsSessionsWindowContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
16
16
 
17
17
  class GoToFileAction extends Action2 {
18
18
  constructor() {
19
19
  super({
20
20
  id: "multiDiffEditor.goToFile",
21
- title: ( localize2(11712, "Open File")),
21
+ title: ( localize2(12343, "Open File")),
22
22
  icon: Codicon.goToFile,
23
23
  precondition: ( ActiveEditorContext.isEqualTo(MultiDiffEditor.ID)),
24
24
  menu: {
@@ -60,7 +60,7 @@ class GoToNextChangeAction extends Action2 {
60
60
  constructor() {
61
61
  super({
62
62
  id: "multiDiffEditor.goToNextChange",
63
- title: ( localize2(11713, "Go to Next Change")),
63
+ title: ( localize2(12344, "Go to Next Change")),
64
64
  icon: Codicon.arrowDown,
65
65
  precondition: ( ContextKeyExpr.equals("activeEditor", MultiDiffEditor.ID)),
66
66
  menu: ( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
@@ -90,7 +90,7 @@ class GoToPreviousChangeAction extends Action2 {
90
90
  constructor() {
91
91
  super({
92
92
  id: "multiDiffEditor.goToPreviousChange",
93
- title: ( localize2(11714, "Go to Previous Change")),
93
+ title: ( localize2(12345, "Go to Previous Change")),
94
94
  icon: Codicon.arrowUp,
95
95
  precondition: ( ContextKeyExpr.equals("activeEditor", MultiDiffEditor.ID)),
96
96
  menu: ( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
@@ -120,15 +120,29 @@ class CollapseAllAction extends Action2 {
120
120
  constructor() {
121
121
  super({
122
122
  id: "multiDiffEditor.collapseAll",
123
- title: ( localize2(11715, "Collapse All Diffs")),
123
+ title: ( localize2(12346, "Collapse All Diffs")),
124
124
  icon: Codicon.collapseAll,
125
125
  precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals("activeEditor", MultiDiffEditor.ID)), ContextKeyExpr.not("multiDiffEditorAllCollapsed"))),
126
- menu: ( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
127
- id,
128
- when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("activeEditor", MultiDiffEditor.ID)), ContextKeyExpr.not("multiDiffEditorAllCollapsed"))),
129
- group: "navigation",
130
- order: 100
131
- }))),
126
+ menu: [
127
+ {
128
+ id: MenuId.EditorTitle,
129
+ when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("activeEditor", MultiDiffEditor.ID)), ContextKeyExpr.not("multiDiffEditorAllCollapsed"), ( IsSessionsWindowContext.toNegated()))),
130
+ group: "navigation",
131
+ order: 100
132
+ },
133
+ {
134
+ id: MenuId.CompactWindowEditorTitle,
135
+ when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("activeEditor", MultiDiffEditor.ID)), ContextKeyExpr.not("multiDiffEditorAllCollapsed"))),
136
+ group: "navigation",
137
+ order: 100
138
+ },
139
+ {
140
+ id: MenuId.EditorTitle,
141
+ when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("activeEditor", MultiDiffEditor.ID)), ContextKeyExpr.not("multiDiffEditorAllCollapsed"), IsSessionsWindowContext)),
142
+ group: "4_collapse",
143
+ order: 10
144
+ }
145
+ ],
132
146
  f1: true
133
147
  });
134
148
  }
@@ -154,15 +168,29 @@ class ExpandAllAction extends Action2 {
154
168
  constructor() {
155
169
  super({
156
170
  id: "multiDiffEditor.expandAll",
157
- title: ( localize2(11716, "Expand All Diffs")),
171
+ title: ( localize2(12347, "Expand All Diffs")),
158
172
  icon: Codicon.expandAll,
159
173
  precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals("activeEditor", MultiDiffEditor.ID)), ( ContextKeyExpr.has("multiDiffEditorAllCollapsed")))),
160
- menu: ( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
161
- id,
162
- when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("activeEditor", MultiDiffEditor.ID)), ( ContextKeyExpr.has("multiDiffEditorAllCollapsed")))),
163
- group: "navigation",
164
- order: 100
165
- }))),
174
+ menu: [
175
+ {
176
+ id: MenuId.EditorTitle,
177
+ when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("activeEditor", MultiDiffEditor.ID)), ( ContextKeyExpr.has("multiDiffEditorAllCollapsed")), ( IsSessionsWindowContext.toNegated()))),
178
+ group: "navigation",
179
+ order: 100
180
+ },
181
+ {
182
+ id: MenuId.CompactWindowEditorTitle,
183
+ when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("activeEditor", MultiDiffEditor.ID)), ( ContextKeyExpr.has("multiDiffEditorAllCollapsed")))),
184
+ group: "navigation",
185
+ order: 100
186
+ },
187
+ {
188
+ id: MenuId.EditorTitle,
189
+ when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("activeEditor", MultiDiffEditor.ID)), ( ContextKeyExpr.has("multiDiffEditorAllCollapsed")), IsSessionsWindowContext)),
190
+ group: "4_collapse",
191
+ order: 10
192
+ }
193
+ ],
166
194
  f1: true
167
195
  });
168
196
  }
package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.js CHANGED
@@ -26,7 +26,7 @@ registerWorkbenchContribution2(
26
26
  WorkbenchPhase.BlockStartup
27
27
  );
28
28
  ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
29
- EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localize(11718, "Multi Diff Editor"))),
29
+ EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localize(12349, "Multi Diff Editor"))),
30
30
  [( new SyncDescriptor(MultiDiffEditorInput))]
31
31
  );
32
32
  ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(MultiDiffEditorInput.ID, MultiDiffEditorSerializer);