@theia/scm 1.58.3 → 1.59.0-next.62

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 (5) hide show
  1. package/lib/browser/scm-contribution.d.ts.map +1 -1
  2. package/lib/browser/scm-contribution.js +43 -4
  3. package/lib/browser/scm-contribution.js.map +1 -1
  4. package/package.json +7 -7
  5. package/src/browser/scm-contribution.ts +44 -5
package/lib/browser/scm-contribution.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"scm-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/scm-contribution.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"scm-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/scm-contribution.ts"],"names":[],"mappings":"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"}
package/lib/browser/scm-contribution.js CHANGED
@@ -34,6 +34,7 @@ const nls_1 = require("@theia/core/lib/common/nls");
34
34
  const theme_1 = require("@theia/core/lib/common/theme");
35
35
  const browser_2 = require("@theia/editor/lib/browser");
36
36
  const dirty_diff_navigator_1 = require("./dirty-diff/dirty-diff-navigator");
37
+ const monaco_diff_editor_1 = require("@theia/monaco/lib/browser/monaco-diff-editor");
37
38
  exports.SCM_WIDGET_FACTORY_ID = scm_widget_1.ScmWidget.ID;
38
39
  exports.SCM_VIEW_CONTAINER_ID = 'scm-view-container';
39
40
  exports.SCM_VIEW_CONTAINER_TITLE_OPTIONS = {
@@ -83,12 +84,14 @@ var SCM_COMMANDS;
83
84
  SCM_COMMANDS.GOTO_NEXT_CHANGE = common_1.Command.toDefaultLocalizedCommand({
84
85
  id: 'workbench.action.editor.nextChange',
85
86
  category: 'Source Control',
86
- label: 'Go to Next Change'
87
+ label: 'Go to Next Change',
88
+ iconClass: (0, browser_1.codicon)('arrow-down')
87
89
  });
88
90
  SCM_COMMANDS.GOTO_PREVIOUS_CHANGE = common_1.Command.toDefaultLocalizedCommand({
89
91
  id: 'workbench.action.editor.previousChange',
90
92
  category: 'Source Control',
91
- label: 'Go to Previous Change'
93
+ label: 'Go to Previous Change',
94
+ iconClass: (0, browser_1.codicon)('arrow-up')
92
95
  });
93
96
  SCM_COMMANDS.SHOW_NEXT_CHANGE = common_1.Command.toDefaultLocalizedCommand({
94
97
  id: 'editor.action.dirtydiff.next',
@@ -157,10 +160,36 @@ let ScmContribution = class ScmContribution extends browser_1.AbstractViewContri
157
160
  // This is consistent with behavior in VS Code, and also with other similar commands (such as `Next Problem/Previous Problem`) in Theia.
158
161
  // See https://github.com/eclipse-theia/theia/pull/13104#discussion_r1497316614 for a detailed discussion.
159
162
  commandRegistry.registerCommand(SCM_COMMANDS.GOTO_NEXT_CHANGE, {
160
- execute: () => this.dirtyDiffNavigator.gotoNextChange()
163
+ execute: widget => {
164
+ if (widget instanceof browser_2.EditorWidget && widget.editor instanceof monaco_diff_editor_1.MonacoDiffEditor) {
165
+ widget.editor.diffNavigator.next();
166
+ }
167
+ else {
168
+ this.dirtyDiffNavigator.gotoNextChange();
169
+ }
170
+ },
171
+ isEnabled: widget => {
172
+ if (widget instanceof browser_2.EditorWidget && widget.editor instanceof monaco_diff_editor_1.MonacoDiffEditor) {
173
+ return widget.editor.diffNavigator.hasNext();
174
+ }
175
+ return true;
176
+ }
161
177
  });
162
178
  commandRegistry.registerCommand(SCM_COMMANDS.GOTO_PREVIOUS_CHANGE, {
163
- execute: () => this.dirtyDiffNavigator.gotoPreviousChange()
179
+ execute: widget => {
180
+ if (widget instanceof browser_2.EditorWidget && widget.editor instanceof monaco_diff_editor_1.MonacoDiffEditor) {
181
+ widget.editor.diffNavigator.previous();
182
+ }
183
+ else {
184
+ this.dirtyDiffNavigator.gotoPreviousChange();
185
+ }
186
+ },
187
+ isEnabled: widget => {
188
+ if (widget instanceof browser_2.EditorWidget && widget.editor instanceof monaco_diff_editor_1.MonacoDiffEditor) {
189
+ return widget.editor.diffNavigator.hasPrevious();
190
+ }
191
+ return true;
192
+ }
164
193
  });
165
194
  commandRegistry.registerCommand(SCM_COMMANDS.SHOW_NEXT_CHANGE, {
166
195
  execute: () => this.dirtyDiffNavigator.showNextChange()
@@ -227,6 +256,16 @@ let ScmContribution = class ScmContribution extends browser_1.AbstractViewContri
227
256
  return false;
228
257
  }
229
258
  });
259
+ registry.registerItem({
260
+ id: SCM_COMMANDS.GOTO_PREVIOUS_CHANGE.id,
261
+ command: SCM_COMMANDS.GOTO_PREVIOUS_CHANGE.id,
262
+ isVisible: widget => widget instanceof browser_2.EditorWidget && widget.editor instanceof monaco_diff_editor_1.MonacoDiffEditor,
263
+ });
264
+ registry.registerItem({
265
+ id: SCM_COMMANDS.GOTO_NEXT_CHANGE.id,
266
+ command: SCM_COMMANDS.GOTO_NEXT_CHANGE.id,
267
+ isVisible: widget => widget instanceof browser_2.EditorWidget && widget.editor instanceof monaco_diff_editor_1.MonacoDiffEditor,
268
+ });
230
269
  registry.registerItem({
231
270
  ...SCM_COMMANDS.COLLAPSE_ALL,
232
271
  command: SCM_COMMANDS.COLLAPSE_ALL.id
package/lib/browser/scm-contribution.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"scm-contribution.js","sourceRoot":"","sources":["../../src/browser/scm-contribution.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"scm-contribution.js","sourceRoot":"","sources":["../../src/browser/scm-contribution.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@theia/scm",
3
- "version": "1.58.3",
3
+ "version": "1.59.0-next.62+9e43c93ad",
4
4
  "description": "Theia - Source control Extension",
5
5
  "dependencies": {
6
- "@theia/core": "1.58.3",
7
- "@theia/editor": "1.58.3",
8
- "@theia/filesystem": "1.58.3",
9
- "@theia/monaco": "1.58.3",
6
+ "@theia/core": "1.59.0-next.62+9e43c93ad",
7
+ "@theia/editor": "1.59.0-next.62+9e43c93ad",
8
+ "@theia/filesystem": "1.59.0-next.62+9e43c93ad",
9
+ "@theia/monaco": "1.59.0-next.62+9e43c93ad",
10
10
  "@theia/monaco-editor-core": "1.96.302",
11
11
  "@types/diff": "^5.2.1",
12
12
  "diff": "^5.2.0",
@@ -49,10 +49,10 @@
49
49
  "watch": "theiaext watch"
50
50
  },
51
51
  "devDependencies": {
52
- "@theia/ext-scripts": "1.58.3"
52
+ "@theia/ext-scripts": "1.58.0"
53
53
  },
54
54
  "nyc": {
55
55
  "extends": "../../configs/nyc.json"
56
56
  },
57
- "gitHead": "ca70c15332f91e0f61b12cd147b5ff8326e2e6d2"
57
+ "gitHead": "9e43c93ad61ea977db3974207bac5d7c1fd3ccd6"
58
58
  }
package/src/browser/scm-contribution.ts CHANGED
@@ -43,8 +43,9 @@ import { ScmCommand } from './scm-provider';
43
43
  import { ScmDecorationsService } from '../browser/decorations/scm-decorations-service';
44
44
  import { nls } from '@theia/core/lib/common/nls';
45
45
  import { isHighContrast } from '@theia/core/lib/common/theme';
46
- import { EditorMainMenu } from '@theia/editor/lib/browser';
46
+ import { EditorMainMenu, EditorWidget } from '@theia/editor/lib/browser';
47
47
  import { DirtyDiffNavigator } from './dirty-diff/dirty-diff-navigator';
48
+ import { MonacoDiffEditor } from '@theia/monaco/lib/browser/monaco-diff-editor';
48
49
 
49
50
  export const SCM_WIDGET_FACTORY_ID = ScmWidget.ID;
50
51
  export const SCM_VIEW_CONTAINER_ID = 'scm-view-container';
@@ -95,12 +96,14 @@ export namespace SCM_COMMANDS {
95
96
  export const GOTO_NEXT_CHANGE = Command.toDefaultLocalizedCommand({
96
97
  id: 'workbench.action.editor.nextChange',
97
98
  category: 'Source Control',
98
- label: 'Go to Next Change'
99
+ label: 'Go to Next Change',
100
+ iconClass: codicon('arrow-down')
99
101
  });
100
102
  export const GOTO_PREVIOUS_CHANGE = Command.toDefaultLocalizedCommand({
101
103
  id: 'workbench.action.editor.previousChange',
102
104
  category: 'Source Control',
103
- label: 'Go to Previous Change'
105
+ label: 'Go to Previous Change',
106
+ iconClass: codicon('arrow-up')
104
107
  });
105
108
  export const SHOW_NEXT_CHANGE = Command.toDefaultLocalizedCommand({
106
109
  id: 'editor.action.dirtydiff.next',
@@ -198,10 +201,34 @@ export class ScmContribution extends AbstractViewContribution<ScmWidget> impleme
198
201
  // This is consistent with behavior in VS Code, and also with other similar commands (such as `Next Problem/Previous Problem`) in Theia.
199
202
  // See https://github.com/eclipse-theia/theia/pull/13104#discussion_r1497316614 for a detailed discussion.
200
203
  commandRegistry.registerCommand(SCM_COMMANDS.GOTO_NEXT_CHANGE, {
201
- execute: () => this.dirtyDiffNavigator.gotoNextChange()
204
+ execute: widget => {
205
+ if (widget instanceof EditorWidget && widget.editor instanceof MonacoDiffEditor) {
206
+ widget.editor.diffNavigator.next();
207
+ } else {
208
+ this.dirtyDiffNavigator.gotoNextChange();
209
+ }
210
+ },
211
+ isEnabled: widget => {
212
+ if (widget instanceof EditorWidget && widget.editor instanceof MonacoDiffEditor) {
213
+ return widget.editor.diffNavigator.hasNext();
214
+ }
215
+ return true;
216
+ }
202
217
  });
203
218
  commandRegistry.registerCommand(SCM_COMMANDS.GOTO_PREVIOUS_CHANGE, {
204
- execute: () => this.dirtyDiffNavigator.gotoPreviousChange()
219
+ execute: widget => {
220
+ if (widget instanceof EditorWidget && widget.editor instanceof MonacoDiffEditor) {
221
+ widget.editor.diffNavigator.previous();
222
+ } else {
223
+ this.dirtyDiffNavigator.gotoPreviousChange();
224
+ }
225
+ },
226
+ isEnabled: widget => {
227
+ if (widget instanceof EditorWidget && widget.editor instanceof MonacoDiffEditor) {
228
+ return widget.editor.diffNavigator.hasPrevious();
229
+ }
230
+ return true;
231
+ }
205
232
  });
206
233
  commandRegistry.registerCommand(SCM_COMMANDS.SHOW_NEXT_CHANGE, {
207
234
  execute: () => this.dirtyDiffNavigator.showNextChange()
@@ -272,6 +299,18 @@ export class ScmContribution extends AbstractViewContribution<ScmWidget> impleme
272
299
  }
273
300
  });
274
301
 
302
+ registry.registerItem({
303
+ id: SCM_COMMANDS.GOTO_PREVIOUS_CHANGE.id,
304
+ command: SCM_COMMANDS.GOTO_PREVIOUS_CHANGE.id,
305
+ isVisible: widget => widget instanceof EditorWidget && widget.editor instanceof MonacoDiffEditor,
306
+ });
307
+
308
+ registry.registerItem({
309
+ id: SCM_COMMANDS.GOTO_NEXT_CHANGE.id,
310
+ command: SCM_COMMANDS.GOTO_NEXT_CHANGE.id,
311
+ isVisible: widget => widget instanceof EditorWidget && widget.editor instanceof MonacoDiffEditor,
312
+ });
313
+
275
314
  registry.registerItem({
276
315
  ...SCM_COMMANDS.COLLAPSE_ALL,
277
316
  command: SCM_COMMANDS.COLLAPSE_ALL.id