@codingame/monaco-vscode-scm-service-override 4.4.1 → 4.5.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 (12) hide show
  1. package/package.json +10 -2
  2. package/scm.js +2 -2
  3. package/vscode/src/vs/workbench/contrib/scm/browser/activity.js +11 -8
  4. package/vscode/src/vs/workbench/contrib/scm/browser/menus.js +4 -3
  5. package/vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js +6 -3
  6. package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js +9 -9
  7. package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.js +9 -8
  8. package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js +26 -23
  9. package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.js +11 -10
  10. package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js +6 -5
  11. package/vscode/src/vs/workbench/contrib/scm/common/quickDiffService.js +1 -1
  12. package/vscode/src/vs/workbench/contrib/scm/common/scmService.js +4 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-scm-service-override",
3
- "version": "4.4.1",
3
+ "version": "4.5.0",
4
4
  "keywords": [],
5
5
  "author": {
6
6
  "name": "CodinGame",
@@ -17,7 +17,15 @@
17
17
  "main": "index.js",
18
18
  "module": "index.js",
19
19
  "types": "index.d.ts",
20
+ "exports": {
21
+ ".": {
22
+ "default": "./index.js"
23
+ },
24
+ "./vscode/*": {
25
+ "default": "./vscode/src/*.js"
26
+ }
27
+ },
20
28
  "dependencies": {
21
- "vscode": "npm:@codingame/monaco-vscode-api@4.4.1"
29
+ "vscode": "npm:@codingame/monaco-vscode-api@4.5.0"
22
30
  }
23
31
  }
package/scm.js CHANGED
@@ -1,7 +1,7 @@
1
- import { ISCMService, ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
1
+ import { ISCMService, ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
2
2
  import { SCMService } from './vscode/src/vs/workbench/contrib/scm/common/scmService.js';
3
3
  import { SCMViewService } from './vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js';
4
- import { IQuickDiffService } from 'vscode/vscode/vs/workbench/contrib/scm/common/quickDiff';
4
+ import { IQuickDiffService } from 'vscode/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
5
5
  import { QuickDiffService } from './vscode/src/vs/workbench/contrib/scm/common/quickDiffService.js';
6
6
  import './vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js';
7
7
  import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
package/vscode/src/vs/workbench/contrib/scm/browser/activity.js CHANGED
@@ -3,17 +3,20 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
3
3
  import { basename } from 'vscode/vscode/vs/base/common/resources';
4
4
  import { Disposable, MutableDisposable, DisposableStore, combinedDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
5
5
  import { Event } from 'vscode/vscode/vs/base/common/event';
6
- import { ISCMService, ISCMViewService, VIEW_PANE_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
7
- import { IActivityService, NumberBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
8
- import { RawContextKey, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
9
- import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
10
- import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
11
- import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
6
+ import { VIEW_PANE_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
7
+ import { ISCMService, ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
8
+ import { NumberBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
9
+ import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
10
+ import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
11
+ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
12
+ import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
13
+ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
14
+ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
12
15
  import { EditorResourceAccessor } from 'vscode/vscode/vs/workbench/common/editor';
13
- import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
16
+ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
14
17
  import { Schemas } from 'vscode/vscode/vs/base/common/network';
15
18
  import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
16
- import { ITitleService } from 'vscode/vscode/vs/workbench/services/title/browser/titleService';
19
+ import { ITitleService } from 'vscode/vscode/vs/workbench/services/title/browser/titleService.service';
17
20
 
18
21
  function getCount(repository) {
19
22
  if (typeof repository.provider.count === 'number') {
package/vscode/src/vs/workbench/contrib/scm/browser/menus.js CHANGED
@@ -5,11 +5,12 @@ import { DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle
5
5
  import './media/scm.css.js';
6
6
  import { localizeWithPath } from 'vscode/vscode/vs/nls';
7
7
  import { createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
8
- import { MenuRegistry, MenuId, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
9
- import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
8
+ import { MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
9
+ import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
10
+ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
10
11
  import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
11
12
  import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
12
- import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
13
+ import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
13
14
 
14
15
  function actionEquals(a, b) {
15
16
  return a.id === b.id;
package/vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js CHANGED
@@ -2,12 +2,15 @@ import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
2
2
  import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
3
3
  import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
4
4
  import { DirtyDiffWorkbenchController } from 'vscode/vscode/vs/workbench/contrib/scm/browser/dirtydiffDecorator';
5
- import { VIEWLET_ID, VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID, ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
5
+ import { VIEWLET_ID, VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
6
+ import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
6
7
  import { MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
7
8
  import { SCMActiveResourceContextKeyController, SCMActiveRepositoryContextKeyController, SCMStatusController } from './activity.js';
8
9
  import { Extensions as Extensions$2 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
9
- import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
10
- import { ICommandService, CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
10
+ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
11
+ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
12
+ import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
13
+ import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
11
14
  import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
12
15
  import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
13
16
  import '../common/scmService.js';
package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js CHANGED
@@ -4,18 +4,18 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
4
4
  import { Event } from 'vscode/vscode/vs/base/common/event';
5
5
  import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
6
6
  import { append, $ } from 'vscode/vscode/vs/base/browser/dom';
7
- import { ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
7
+ import { ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
8
8
  import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
9
- import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
10
- import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
11
- import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
12
- import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
9
+ import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
10
+ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
11
+ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
12
+ import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
13
13
  import { WorkbenchList } from 'vscode/vscode/vs/platform/list/browser/listService';
14
- import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
15
- import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
14
+ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
15
+ import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
16
16
  import { SIDE_BAR_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
17
- import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
18
- import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
17
+ import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
18
+ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
19
19
  import { RepositoryRenderer, RepositoryActionRunner } from './scmRepositoryRenderer.js';
20
20
  import { getActionViewItemProvider, collectContextMenuActions } from './util.js';
21
21
  import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.js CHANGED
@@ -2,18 +2,19 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
2
  import './media/scm.css.js';
3
3
  import { combinedDisposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
4
4
  import { append, $ } from 'vscode/vscode/vs/base/browser/dom';
5
- import { ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
5
+ import { ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
6
6
  import { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBadge';
7
- import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
8
- import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
7
+ import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
8
+ import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
9
9
  import { ActionRunner } from 'vscode/vscode/vs/base/common/actions';
10
- import { isSCMRepository, connectPrimaryMenu, StatusBarAction } from './util.js';
10
+ import { isSCMRepository, StatusBarAction, connectPrimaryMenu } from './util.js';
11
11
  import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
12
12
  import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
13
- import { MenuId, IMenuService, MenuItemAction } from 'vscode/vscode/vs/platform/actions/common/actions';
14
- import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
15
- import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
16
- import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
13
+ import { MenuItemAction, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
14
+ import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
15
+ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
16
+ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
17
+ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
17
18
 
18
19
  var RepositoryRenderer_1;
19
20
  class RepositoryActionRunner extends ActionRunner {
package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js CHANGED
@@ -1,26 +1,29 @@
1
1
  import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
2
  import './media/scm.css.js';
3
- import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
3
+ import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
4
4
  import { basename, dirname } from 'vscode/vscode/vs/base/common/resources';
5
5
  import { Disposable, DisposableStore, toDisposable, combinedDisposable, MutableDisposable, dispose, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
6
6
  import { ViewAction, ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
7
- import { append, $, prepend, Dimension, trackFocus, clearNode, asCSSUrl } from 'vscode/vscode/vs/base/browser/dom';
8
- import { ISCMViewService, VIEW_PANE_ID, ISCMService, SCMInputChangeReason } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
7
+ import { append, $, asCSSUrl, prepend, Dimension, trackFocus, clearNode } from 'vscode/vscode/vs/base/browser/dom';
8
+ import { VIEW_PANE_ID, SCMInputChangeReason } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
9
+ import { ISCMViewService, ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
9
10
  import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
10
11
  import { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBadge';
11
- import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
12
+ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
12
13
  import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
13
- import { IContextMenuService, IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
14
- import { IContextKeyService, RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
15
- import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
16
- import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
17
- import { MenuId, IMenuService, MenuRegistry, registerAction2, Action2, MenuItemAction } from 'vscode/vscode/vs/platform/actions/common/actions';
18
- import { Action, Separator, ActionRunner } from 'vscode/vscode/vs/base/common/actions';
14
+ import { IContextMenuService, IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
15
+ import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
16
+ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
17
+ import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
18
+ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
19
+ import { MenuItemAction, MenuId, MenuRegistry, Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
20
+ import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
21
+ import { ActionRunner, Action, Separator } from 'vscode/vscode/vs/base/common/actions';
19
22
  import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
20
- import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
21
- import { connectPrimaryMenuToInlineActionBar, connectPrimaryMenu, isSCMRepository, isSCMInput, isSCMActionButton, isSCMResourceGroup, isSCMHistoryItemGroupTreeElement, isSCMHistoryItemTreeElement, isSCMViewSeparator, isSCMResource, isSCMHistoryItemChangeTreeElement, getActionViewItemProvider, isSCMResourceNode, isSCMHistoryItemChangeNode, toDiffEditorArguments, collectContextMenuActions, isSCMViewService } from './util.js';
23
+ import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
24
+ import { isSCMResource, connectPrimaryMenuToInlineActionBar, connectPrimaryMenu, isSCMInput, isSCMActionButton, isSCMRepository, isSCMResourceGroup, isSCMResourceNode, isSCMHistoryItemGroupTreeElement, isSCMHistoryItemTreeElement, isSCMHistoryItemChangeTreeElement, isSCMHistoryItemChangeNode, isSCMViewSeparator, getActionViewItemProvider, toDiffEditorArguments, collectContextMenuActions, isSCMViewService } from './util.js';
22
25
  import { WorkbenchCompressibleAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
23
- import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
26
+ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
24
27
  import { disposableTimeout, ThrottledDelayer, Sequencer, Throttler } from 'vscode/vscode/vs/base/common/async';
25
28
  import { ResourceTree } from 'vscode/vscode/vs/base/common/resourceTree';
26
29
  import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
@@ -28,10 +31,10 @@ import { URI } from 'vscode/vscode/vs/base/common/uri';
28
31
  import { FileKind } from 'vscode/vscode/vs/platform/files/common/files';
29
32
  import { comparePaths, compareFileNames } from 'vscode/vscode/vs/base/common/comparers';
30
33
  import { createMatches } from 'vscode/vscode/vs/base/common/filters';
31
- import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
34
+ import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
32
35
  import { localizeWithPath } from 'vscode/vscode/vs/nls';
33
36
  import { flatten } from 'vscode/vscode/vs/base/common/arrays';
34
- import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
37
+ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
35
38
  import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
36
39
  import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
37
40
  import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
@@ -43,27 +46,27 @@ import { SelectionClipboardContributionID } from 'vscode/vscode/vs/workbench/con
43
46
  import { EditorDictation } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation';
44
47
  import { ContextMenuController } from 'vscode/vscode/vs/editor/contrib/contextmenu/browser/contextmenu';
45
48
  import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
46
- import { format, compare } from 'vscode/vscode/vs/base/common/strings';
49
+ import { compare, format } from 'vscode/vscode/vs/base/common/strings';
47
50
  import { SuggestController } from 'vscode/vscode/vs/editor/contrib/suggest/browser/suggestController';
48
51
  import { SnippetController2 } from 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetController2';
49
52
  import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
50
53
  import { HoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/hover';
51
54
  import { ColorDetector } from 'vscode/vscode/vs/editor/contrib/colorPicker/browser/colorDetector';
52
55
  import { LinkDetector } from 'vscode/vscode/vs/editor/contrib/links/browser/links';
53
- import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
54
- import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
56
+ import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
57
+ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
55
58
  import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
56
- import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
59
+ import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
57
60
  import { DEFAULT_FONT_FAMILY } from 'vscode/vscode/vs/base/browser/fonts';
58
61
  import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
59
62
  import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
60
63
  import { RepositoryRenderer, RepositoryActionRunner } from './scmRepositoryRenderer.js';
61
64
  import { ColorScheme } from 'vscode/vscode/vs/platform/theme/common/theme';
62
65
  import { API_OPEN_EDITOR_COMMAND_ID, API_OPEN_DIFF_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
63
- import { createActionViewItem, createAndFillInContextMenuActions, createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
66
+ import { createAndFillInActionBarActions, createActionViewItem, createAndFillInContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
64
67
  import { MarkdownRenderer, openLinkFromMarkdown } from 'vscode/vscode/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
65
68
  import { ButtonWithDropdown, Button } from 'vscode/vscode/vs/base/browser/ui/button/button';
66
- import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
69
+ import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
67
70
  import { RepositoryContextKeys } from './scmViewService.js';
68
71
  import { DragAndDropController } from 'vscode/vscode/vs/editor/contrib/dnd/browser/dnd';
69
72
  import { DropIntoEditorController } from 'vscode/vscode/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController';
@@ -77,7 +80,7 @@ import { fillEditorsDragData } from 'vscode/vscode/vs/workbench/browser/dnd';
77
80
  import { CodeDataTransfers } from 'vscode/vscode/vs/platform/dnd/browser/dnd';
78
81
  import { FormatOnType } from 'vscode/vscode/vs/editor/contrib/format/browser/formatActions';
79
82
  import { EditorOptions } from 'vscode/vscode/vs/editor/common/config/editorOptions';
80
- import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
83
+ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
81
84
  import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation';
82
85
  import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
83
86
  import { IconLabel } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabel';
@@ -96,7 +99,7 @@ import { WorkbenchToolBar, MenuWorkbenchToolBar } from 'vscode/vscode/vs/platfor
96
99
  import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
97
100
  import { DropdownWithPrimaryActionViewItem } from 'vscode/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
98
101
  import { clamp } from 'vscode/vscode/vs/base/common/numbers';
99
- import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
102
+ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
100
103
 
101
104
  var ActionButtonRenderer_1, InputRenderer_1, ResourceGroupRenderer_1, ResourceRenderer_1, HistoryItemGroupRenderer_1, HistoryItemRenderer_1, HistoryItemChangeRenderer_1, SeparatorRenderer_1, SCMInputWidget_1;
102
105
  registerColor('scm.historyItemAdditionsForeground', {
package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.js CHANGED
@@ -1,17 +1,18 @@
1
1
  import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
2
  import './media/scm.css.js';
3
3
  import { localizeWithPath } from 'vscode/vscode/vs/nls';
4
- import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
5
- import { ISCMViewService, VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
4
+ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
5
+ import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
6
+ import { ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
6
7
  import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
7
- import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
8
- import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
9
- import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
10
- import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
11
- import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
12
- import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
13
- import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
14
- import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
8
+ import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
9
+ import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
10
+ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
11
+ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
12
+ import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
13
+ import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
14
+ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
15
+ import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
15
16
  import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
16
17
 
17
18
  let SCMViewPaneContainer = class SCMViewPaneContainer extends ViewPaneContainer {
package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js CHANGED
@@ -1,18 +1,19 @@
1
1
  import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
2
  import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
3
3
  import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
4
- import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
4
+ import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
5
5
  import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
6
6
  import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
7
7
  import { SCMMenus } from './menus.js';
8
- import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
8
+ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
9
9
  import { debounce } from 'vscode/vscode/vs/base/common/decorators';
10
- import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
10
+ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
11
11
  import { comparePaths, compareFileNames } from 'vscode/vscode/vs/base/common/comparers';
12
12
  import { basename } from 'vscode/vscode/vs/base/common/resources';
13
13
  import { binarySearch } from 'vscode/vscode/vs/base/common/arrays';
14
- import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
15
- import { RawContextKey, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
14
+ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
15
+ import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
16
+ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
16
17
 
17
18
  function getProviderStorageKey(provider) {
18
19
  return `${provider.contextValue}:${provider.label}${provider.rootUri ? `:${( provider.rootUri.toString())}` : ''}`;
package/vscode/src/vs/workbench/contrib/scm/common/quickDiffService.js CHANGED
@@ -3,7 +3,7 @@ import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
3
3
  import { isEqualOrParent } from 'vscode/vscode/vs/base/common/resources';
4
4
  import { score } from 'vscode/vscode/vs/editor/common/languageSelector';
5
5
  import { Emitter } from 'vscode/vscode/vs/base/common/event';
6
- import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
6
+ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
7
7
 
8
8
  function createProviderComparer(uri) {
9
9
  return (a, b) => {
package/vscode/src/vs/workbench/contrib/scm/common/scmService.js CHANGED
@@ -2,14 +2,14 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
2
  import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
3
3
  import { Emitter } from 'vscode/vscode/vs/base/common/event';
4
4
  import { SCMInputChangeReason } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
5
- import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
6
- import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
7
- import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
5
+ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
6
+ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
7
+ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
8
8
  import { HistoryNavigator2 } from 'vscode/vscode/vs/base/common/history';
9
9
  import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
10
10
  import { URI } from 'vscode/vscode/vs/base/common/uri';
11
11
  import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
12
- import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
12
+ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
13
13
 
14
14
  class SCMInput {
15
15
  get value() {