@codingame/monaco-vscode-scm-service-override 23.2.2 → 24.1.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 (23) hide show
  1. package/package.json +2 -14
  2. package/vscode/src/vs/workbench/contrib/scm/browser/activity.js +7 -7
  3. package/vscode/src/vs/workbench/contrib/scm/browser/media/scm.css +44 -23
  4. package/vscode/src/vs/workbench/contrib/scm/browser/menus.js +1 -1
  5. package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.js +4 -4
  6. package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.d.ts +1 -1
  7. package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.js +2 -2
  8. package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.d.ts +1 -1
  9. package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.js +14 -14
  10. package/vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js +94 -94
  11. package/vscode/src/vs/workbench/contrib/scm/browser/scmAccessibilityHelp.js +23 -23
  12. package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.d.ts +1 -1
  13. package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.js +151 -110
  14. package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.d.ts +9 -2
  15. package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js +139 -50
  16. package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.js +2 -5
  17. package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.d.ts +2 -2
  18. package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js +71 -47
  19. package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.d.ts +1 -1
  20. package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.js +1 -1
  21. package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.d.ts +2 -2
  22. package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js +13 -19
  23. package/vscode/src/vs/workbench/contrib/scm/browser/workingSet.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-scm-service-override",
3
- "version": "23.2.2",
3
+ "version": "24.1.0",
4
4
  "private": false,
5
5
  "description": "VSCode public API plugged on the monaco editor - scm service-override",
6
6
  "keywords": [],
@@ -15,19 +15,7 @@
15
15
  },
16
16
  "type": "module",
17
17
  "dependencies": {
18
- "@codingame/monaco-vscode-05c09f77-cd1d-5960-b387-e7023df3160b-common": "23.2.2",
19
- "@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common": "23.2.2",
20
- "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common": "23.2.2",
21
- "@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "23.2.2",
22
- "@codingame/monaco-vscode-2c64d2c2-fdf7-5675-a2fe-f6f65fbdedbf-common": "23.2.2",
23
- "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common": "23.2.2",
24
- "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "23.2.2",
25
- "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "23.2.2",
26
- "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "23.2.2",
27
- "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common": "23.2.2",
28
- "@codingame/monaco-vscode-api": "23.2.2",
29
- "@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common": "23.2.2",
30
- "@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common": "23.2.2"
18
+ "@codingame/monaco-vscode-api": "24.1.0"
31
19
  },
32
20
  "main": "index.js",
33
21
  "module": "index.js",
@@ -6,7 +6,7 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
6
6
  import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
7
7
  import { VIEW_PANE_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm';
8
8
  import { ISCMService, ISCMViewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
9
- import { NumberBadge } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/services/activity/common/activity';
9
+ import { NumberBadge } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity';
10
10
  import { IActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service';
11
11
  import { RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
12
12
  import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -18,7 +18,7 @@ import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/plat
18
18
  import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
19
19
  import { ITitleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/title/browser/titleService.service';
20
20
  import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
21
- import { getRepositoryResourceCount, getStatusBarCommandGenericName, getSCMRepositoryIcon } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/browser/util';
21
+ import { getRepositoryResourceCount, getStatusBarCommandGenericName, getSCMRepositoryIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/util';
22
22
  import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
23
23
  import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
24
24
  import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
@@ -103,7 +103,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
103
103
  if (count === 0) {
104
104
  return;
105
105
  }
106
- const badge = ( new NumberBadge(count, num => ( localize(10271, '{0} pending changes', num))));
106
+ const badge = ( new NumberBadge(count, num => ( localize(10406, '{0} pending changes', num))));
107
107
  store.add(this.activityService.showViewActivity(VIEW_PANE_ID, { badge }));
108
108
  }
109
109
  _updateStatusBar(activeRepository, commands, store) {
@@ -118,7 +118,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
118
118
  const tooltip = `${label}${command.tooltip ? ` - ${command.tooltip}` : ''}`;
119
119
  const genericCommandName = getStatusBarCommandGenericName(command);
120
120
  const statusbarEntry = {
121
- name: ( localize(10272, "Source Control")) + (genericCommandName ? ` ${genericCommandName}` : ''),
121
+ name: ( localize(10407, "Source Control")) + (genericCommandName ? ` ${genericCommandName}` : ''),
122
122
  text: command.title,
123
123
  ariaLabel: tooltip,
124
124
  tooltip,
@@ -131,7 +131,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
131
131
  if (this.scmService.repositoryCount > 1) {
132
132
  const icon = getSCMRepositoryIcon(activeRepository, activeRepository.repository);
133
133
  const repositoryStatusbarEntry = {
134
- name: ( localize(10273, "Source Control Provider")),
134
+ name: ( localize(10408, "Source Control Provider")),
135
135
  text: `$(${icon.id}) ${activeRepository.repository.provider.name}`,
136
136
  ariaLabel: label,
137
137
  tooltip: label,
@@ -160,8 +160,8 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
160
160
  this.scmService = scmService;
161
161
  this.uriIdentityService = uriIdentityService;
162
162
  this._onDidRepositoryChange = ( new Emitter());
163
- const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(10274, "Whether the active resource has changes"))));
164
- const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(10275, "The active resource's repository"))));
163
+ const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(10409, "Whether the active resource has changes"))));
164
+ const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(10410, "The active resource's repository"))));
165
165
  this._repositories = observableFromEvent(this, Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository), () => this.scmService.repositories);
166
166
  this._register(autorun((reader) => {
167
167
  for (const repository of this._repositories.read(reader)) {
@@ -136,15 +136,12 @@
136
136
  height: 22px;
137
137
  }
138
138
 
139
- .scm-view .monaco-list-row .history,
140
- .scm-view .monaco-list-row .history-item-group,
141
139
  .scm-view .monaco-list-row .resource-group {
142
140
  display: flex;
143
141
  height: 100%;
144
142
  align-items: center;
145
143
  }
146
144
 
147
- .scm-view .monaco-list-row .history-item-group .monaco-icon-label,
148
145
  .scm-view .monaco-list-row .history-item .monaco-icon-label {
149
146
  flex-grow: 1;
150
147
  align-items: center;
@@ -272,7 +269,6 @@
272
269
  margin-left: 4px;
273
270
  }
274
271
 
275
- .scm-view .monaco-list-row .history > .name,
276
272
  .scm-view .monaco-list-row .resource-group > .name {
277
273
  flex: 1;
278
274
  overflow: hidden;
@@ -589,58 +585,82 @@
589
585
  white-space: nowrap;
590
586
  }
591
587
 
588
+ .scm-repositories-view .scm-artifact .timestamp-container {
589
+ flex-shrink: 0;
590
+ margin-left: 2px;
591
+ margin-right: 4px;
592
+ opacity: 0.5;
593
+ }
594
+
595
+ .scm-repositories-view .scm-artifact .timestamp-container.duplicate {
596
+ height: 22px;
597
+ min-width: 6px;
598
+ border-left: 1px solid currentColor;
599
+ opacity: 0.25;
600
+
601
+ .timestamp {
602
+ display: none;
603
+ }
604
+ }
605
+
606
+ .scm-repositories-view .monaco-list .monaco-list-row:hover .scm-artifact .timestamp-container.duplicate {
607
+ border-left: 0;
608
+ opacity: 0.5;
609
+
610
+ .timestamp {
611
+ display: block;
612
+ }
613
+ }
614
+
592
615
  /* History item hover */
593
616
 
594
- .monaco-hover.history-item-hover p:first-child {
617
+ .monaco-hover.history-item-hover .history-item-hover-container > .rendered-markdown:first-child > p {
595
618
  margin-top: 4px;
596
619
  }
597
620
 
598
- .monaco-hover.history-item-hover p:last-child {
621
+ .monaco-hover.history-item-hover .history-item-hover-container > .rendered-markdown:last-child p {
599
622
  margin-bottom: 2px !important;
600
623
  }
601
624
 
602
- .monaco-hover.history-item-hover p:last-child span:not(.codicon) {
625
+ .monaco-hover.history-item-hover .history-item-hover-container > .rendered-markdown:last-child p span:not(.codicon) {
603
626
  padding: 2px 0;
604
627
  }
605
628
 
606
- .monaco-hover.history-item-hover hr {
629
+ .monaco-hover.history-item-hover .history-item-hover-container > .rendered-markdown hr {
607
630
  margin-top: 4px;
608
631
  margin-bottom: 4px;
609
632
  }
610
633
 
611
- .monaco-hover.history-item-hover hr + p {
634
+ .monaco-hover.history-item-hover .history-item-hover-container > .rendered-markdown > p {
612
635
  margin: 4px 0;
613
636
  }
614
637
 
615
- .monaco-hover.history-item-hover span:not(.codicon) {
638
+ .monaco-hover.history-item-hover .history-item-hover-container div:nth-of-type(3):nth-last-of-type(2) > p {
639
+ display: flex;
640
+ flex-wrap: wrap;
641
+ gap: 4px;
642
+ }
643
+
644
+ .monaco-hover.history-item-hover .history-item-hover-container span:not(.codicon) {
616
645
  margin-bottom: 0 !important;
617
646
  }
618
647
 
619
- .monaco-hover.history-item-hover p > span > span.codicon.codicon-git-branch {
648
+ .monaco-hover.history-item-hover .history-item-hover-container p > span > span.codicon.codicon-git-branch {
620
649
  font-size: 12px;
621
650
  margin-bottom: 2px !important;
622
651
  }
623
652
 
624
- .monaco-hover.history-item-hover p > span > span.codicon.codicon-tag,
625
- .monaco-hover.history-item-hover p > span > span.codicon.codicon-target {
653
+ .monaco-hover.history-item-hover .history-item-hover-container p > span > span.codicon.codicon-tag,
654
+ .monaco-hover.history-item-hover .history-item-hover-container p > span > span.codicon.codicon-target {
626
655
  font-size: 14px;
627
656
  margin-bottom: 2px !important;
628
657
  }
629
658
 
630
- .monaco-hover.history-item-hover p > span > span.codicon.codicon-cloud {
659
+ .monaco-hover.history-item-hover .history-item-hover-container p > span > span.codicon.codicon-cloud {
631
660
  font-size: 14px;
632
661
  margin-bottom: 1px !important;
633
662
  }
634
663
 
635
- .monaco-hover.history-item-hover .hover-row.status-bar .action {
636
- display: flex;
637
- align-items: center;
638
- }
639
-
640
- .monaco-hover.history-item-hover .hover-row.status-bar .action .codicon {
641
- color: inherit;
642
- }
643
-
644
664
  /* Graph */
645
665
 
646
666
  .pane-header .scm-graph-view-badge-container {
@@ -689,6 +709,7 @@
689
709
  max-width: 100px;
690
710
  overflow: hidden;
691
711
  text-overflow: ellipsis;
712
+ padding-right: 2px;
692
713
  }
693
714
 
694
715
  .scm-history-view .monaco-list-row > .monaco-tl-row > .monaco-tl-twistie.force-no-twistie {
@@ -305,7 +305,7 @@ SCMMenus = ( __decorate([
305
305
  ( __param(1, IInstantiationService))
306
306
  ], SCMMenus));
307
307
  MenuRegistry.appendMenuItem(MenuId.SCMResourceContext, {
308
- title: ( localize(10276, "Share")),
308
+ title: ( localize(10411, "Share")),
309
309
  submenu: MenuId.SCMResourceContextShare,
310
310
  group: '45_share',
311
311
  order: 3,
@@ -12,7 +12,7 @@ import { isCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/brow
12
12
  import { OverviewRulerLane, MinimapPosition } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
13
13
  import { createStyleSheet } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
14
14
  import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
15
- import { minimapGutterAddedBackground, overviewRulerAddedForeground, minimapGutterModifiedBackground, overviewRulerModifiedForeground, minimapGutterDeletedBackground, overviewRulerDeletedForeground, getChangeType, ChangeType } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
15
+ import { minimapGutterAddedBackground, overviewRulerAddedForeground, minimapGutterModifiedBackground, overviewRulerModifiedForeground, minimapGutterDeletedBackground, overviewRulerDeletedForeground, getChangeType, ChangeType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff';
16
16
  import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
17
17
  import { IQuickDiffModelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/quickDiffModel.service';
18
18
  import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
@@ -61,7 +61,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
61
61
  const gutter = decorations === 'all' || decorations === 'gutter';
62
62
  const overview = decorations === 'all' || decorations === 'overview';
63
63
  const minimap = decorations === 'all' || decorations === 'minimap';
64
- const diffAdded = ( localize(10277, 'Added lines'));
64
+ const diffAdded = ( localize(10412, 'Added lines'));
65
65
  const diffAddedOptions = {
66
66
  gutter,
67
67
  overview: { active: overview, color: overviewRulerAddedForeground },
@@ -72,7 +72,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
72
72
  this.addedPatternOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-added primary pattern', diffAdded, diffAddedOptions);
73
73
  this.addedSecondaryOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-added secondary', diffAdded, diffAddedOptions);
74
74
  this.addedSecondaryPatternOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-added secondary pattern', diffAdded, diffAddedOptions);
75
- const diffModified = ( localize(10278, 'Changed lines'));
75
+ const diffModified = ( localize(10413, 'Changed lines'));
76
76
  const diffModifiedOptions = {
77
77
  gutter,
78
78
  overview: { active: overview, color: overviewRulerModifiedForeground },
@@ -83,7 +83,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
83
83
  this.modifiedPatternOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-modified primary pattern', diffModified, diffModifiedOptions);
84
84
  this.modifiedSecondaryOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-modified secondary', diffModified, diffModifiedOptions);
85
85
  this.modifiedSecondaryPatternOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-modified secondary pattern', diffModified, diffModifiedOptions);
86
- const diffDeleted = ( localize(10279, 'Removed lines'));
86
+ const diffDeleted = ( localize(10414, 'Removed lines'));
87
87
  const diffDeletedOptions = {
88
88
  gutter,
89
89
  overview: { active: overview, color: overviewRulerDeletedForeground },
@@ -8,7 +8,7 @@ import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/plat
8
8
  import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
9
9
  import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
10
10
  import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
11
- import { QuickDiff, QuickDiffChange, QuickDiffResult } from "@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
11
+ import { QuickDiff, QuickDiffChange, QuickDiffResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff";
12
12
  import { IQuickDiffService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service";
13
13
  import { ISCMService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
14
14
  import { ISplice } from "@codingame/monaco-vscode-api/vscode/vs/base/common/sequence";
@@ -9,7 +9,7 @@ import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/edi
9
9
  import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
10
10
  import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
11
11
  import { shouldSynchronizeModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
12
- import { compareChanges, getModifiedEndLineNumber } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
12
+ import { compareChanges, getModifiedEndLineNumber } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff';
13
13
  import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
14
14
  import { ThrottledDelayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
15
15
  import { ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
@@ -89,7 +89,7 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
89
89
  this._disposed = false;
90
90
  this._quickDiffs = [];
91
91
  this._diffDelayer = this._register(( new ThrottledDelayer(200)));
92
- this._onDidChange = ( new Emitter());
92
+ this._onDidChange = this._register(( new Emitter()));
93
93
  this.onDidChange = this._onDidChange.event;
94
94
  this._allChanges = [];
95
95
  this._changes = [];
@@ -12,7 +12,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
12
12
  import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
13
13
  import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
14
14
  import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
15
- import { QuickDiff } from "@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
15
+ import { QuickDiff } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff";
16
16
  export declare const isQuickDiffVisible: RawContextKey<boolean>;
17
17
  export interface IQuickDiffSelectItem extends ISelectOptionItem {
18
18
  providerId: string;
@@ -35,7 +35,7 @@ import { RawContextKey, ContextKeyExpr } from '@codingame/monaco-vscode-api/vsco
35
35
  import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
36
36
  import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
37
37
  import { rot } from '@codingame/monaco-vscode-api/vscode/vs/base/common/numbers';
38
- import { getModifiedEndLineNumber, getChangeHeight, getChangeType, getChangeTypeColor, lineIntersectsChange, ChangeType } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
38
+ import { getModifiedEndLineNumber, getChangeHeight, getChangeType, getChangeTypeColor, lineIntersectsChange, ChangeType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff';
39
39
  import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
40
40
  import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
41
41
  import { TextCompareEditorActiveContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
@@ -68,7 +68,7 @@ let QuickDiffPickerViewItem = class QuickDiffPickerViewItem extends SelectAction
68
68
  const peekTitleColor = theme.getColor(peekViewTitleBackground);
69
69
  const opaqueTitleColor = peekTitleColor?.makeOpaque(editorBackgroundColor) ?? editorBackgroundColor;
70
70
  styles.selectBackground = ( ( opaqueTitleColor.lighten(.6)).toString());
71
- super(null, action, [], 0, contextViewService, styles, { ariaLabel: ( localize(10280, 'Switch quick diff base')), useCustomDrawn: !hasNativeContextMenu(configurationService) });
71
+ super(null, action, [], 0, contextViewService, styles, { ariaLabel: ( localize(10415, 'Switch quick diff base')), useCustomDrawn: !hasNativeContextMenu(configurationService) });
72
72
  this.optionsItems = [];
73
73
  }
74
74
  setSelection(quickDiffs, providerId) {
@@ -91,7 +91,7 @@ QuickDiffPickerViewItem = ( __decorate([
91
91
  ], QuickDiffPickerViewItem));
92
92
  class QuickDiffPickerBaseAction extends Action {
93
93
  static { this.ID = 'quickDiff.base.switch'; }
94
- static { this.LABEL = ( localize(10281, "Switch Quick Diff Base")); }
94
+ static { this.LABEL = ( localize(10416, "Switch Quick Diff Base")); }
95
95
  constructor(callback) {
96
96
  super(QuickDiffPickerBaseAction.ID, QuickDiffPickerBaseAction.LABEL, undefined, undefined);
97
97
  this.callback = callback;
@@ -218,14 +218,14 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
218
218
  .find(quickDiff => quickDiff.id === this._providerId)?.label ?? '';
219
219
  detail = this.model.changes.length > 1
220
220
  ? ( localize(
221
- 10282,
221
+ 10417,
222
222
  "{0} - {1} of {2} changes",
223
223
  label,
224
224
  providerIndex + 1,
225
225
  providerChanges.length
226
226
  ))
227
227
  : ( localize(
228
- 10283,
228
+ 10418,
229
229
  "{0} - {1} of {2} change",
230
230
  label,
231
231
  providerIndex + 1,
@@ -235,8 +235,8 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
235
235
  }
236
236
  else {
237
237
  detail = this.model.changes.length > 1
238
- ? ( localize(10284, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
239
- : ( localize(10285, "{0} of {1} change", providerIndex + 1, providerChanges.length));
238
+ ? ( localize(10419, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
239
+ : ( localize(10420, "{0} of {1} change", providerIndex + 1, providerChanges.length));
240
240
  this.dropdownContainer.style.display = 'inherit';
241
241
  }
242
242
  this.setTitle(this.title, detail);
@@ -285,7 +285,7 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
285
285
  this._actionbarWidget.clear();
286
286
  this._actionbarWidget.push(actions.reverse(), { label: false, icon: true });
287
287
  this._actionbarWidget.push([next, previous], { label: false, icon: true });
288
- this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(10286, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
288
+ this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(10421, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
289
289
  }
290
290
  updateDropdown() {
291
291
  const quickDiffs = this.getQuickDiffsContainingChange();
@@ -636,7 +636,7 @@ class ShowPreviousChangeAction extends EditorAction {
636
636
  constructor(outerEditor) {
637
637
  super({
638
638
  id: 'editor.action.dirtydiff.previous',
639
- label: ( localize2(10287, "Show Previous Change")),
639
+ label: ( localize2(10422, "Show Previous Change")),
640
640
  precondition: ( TextCompareEditorActiveContext.toNegated()),
641
641
  kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
642
642
  });
@@ -662,7 +662,7 @@ class ShowNextChangeAction extends EditorAction {
662
662
  constructor(outerEditor) {
663
663
  super({
664
664
  id: 'editor.action.dirtydiff.next',
665
- label: ( localize2(10288, "Show Next Change")),
665
+ label: ( localize2(10423, "Show Next Change")),
666
666
  precondition: ( TextCompareEditorActiveContext.toNegated()),
667
667
  kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
668
668
  });
@@ -688,7 +688,7 @@ class GotoPreviousChangeAction extends EditorAction {
688
688
  constructor() {
689
689
  super({
690
690
  id: 'workbench.action.editor.previousChange',
691
- label: ( localize2(10289, "Go to Previous Change")),
691
+ label: ( localize2(10424, "Go to Previous Change")),
692
692
  precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
693
693
  kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
694
694
  });
@@ -723,7 +723,7 @@ class GotoNextChangeAction extends EditorAction {
723
723
  constructor() {
724
724
  super({
725
725
  id: 'workbench.action.editor.nextChange',
726
- label: ( localize2(10290, "Go to Next Change")),
726
+ label: ( localize2(10425, "Go to Next Change")),
727
727
  precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
728
728
  kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
729
729
  });
@@ -758,7 +758,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
758
758
  group: '7_change_nav',
759
759
  command: {
760
760
  id: 'editor.action.dirtydiff.next',
761
- title: ( localize(10291, "Next &&Change"))
761
+ title: ( localize(10426, "Next &&Change"))
762
762
  },
763
763
  order: 1
764
764
  });
@@ -766,7 +766,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
766
766
  group: '7_change_nav',
767
767
  command: {
768
768
  id: 'editor.action.dirtydiff.previous',
769
- title: ( localize(10292, "Previous &&Change"))
769
+ title: ( localize(10427, "Previous &&Change"))
770
770
  },
771
771
  order: 2
772
772
  });