@codingame/monaco-vscode-scm-service-override 21.6.0 → 22.0.0

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js

@@ -5,12 +5,12 @@ import * as scm from './media/scm.css';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { basename, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { Disposable, DisposableStore, toDisposable, combinedDisposable, MutableDisposable, dispose, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { ViewAction, ViewPane } from '@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common/vscode/vs/workbench/browser/parts/views/viewPane';
+import { ViewAction, ViewPane } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane';
 import { append, $, Dimension, trackFocus, isPointerEvent, isActiveElement, clearNode } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { asCSSUrl } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/cssValue';
 import { ViewMode, VIEW_PANE_ID, ISCMRepositorySortKey, InputValidationType, SCMInputChangeReason } from '@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMViewService, ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
-import { ResourceLabels } from '@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/workbench/browser/labels';
+import { ResourceLabels } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/workbench/browser/labels';
 import { CountBadge } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/countBadge/countBadge';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -24,12 +24,12 @@ import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/ac
 import { ActionRunner, Action, toAction, Separator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { ActionBar } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { isSCMResource, connectPrimaryMenu, isSCMResourceGroup, isSCMInput, isSCMActionButton, isSCMRepository, isSCMResourceNode, getActionViewItemProvider, collectContextMenuActions, isSCMViewService } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { isSCMResource, connectPrimaryMenu, isSCMResourceGroup, isSCMInput, isSCMActionButton, isSCMRepository, isSCMResourceNode, getActionViewItemProvider, collectContextMenuActions, isSCMViewService } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/scm/browser/util';
 import { WorkbenchCompressibleAsyncDataTree } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { disposableTimeout, ThrottledDelayer, Sequencer, Throttler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { ResourceTree } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/base/common/resourceTree';
+import { ResourceTree } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/base/common/resourceTree';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { FileKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { compareFileNames, comparePaths } from '@codingame/monaco-vscode-api/vscode/vs/base/common/comparers';
@@ -78,7 +78,7 @@ import { defaultCountBadgeStyles, defaultButtonStyles } from '@codingame/monaco-
 import { InlineCompletionsController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
 import { CodeActionController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/codeAction/browser/codeActionController';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import { fillEditorsDragData } from '@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/workbench/browser/dnd';
+import { fillEditorsDragData } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/dnd';
 import { CodeDataTransfers } from '@codingame/monaco-vscode-api/vscode/vs/platform/dnd/browser/dnd';
 import { FormatOnType } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/format/browser/formatActions';
 import { EditorOptions, EditorOption } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
@@ -89,7 +89,7 @@ import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/
 import { DropdownWithPrimaryActionViewItem } from '@codingame/monaco-vscode-09e9b2e8-42a8-5a68-864f-bfcdad0ca1df-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
 import { clamp, rot } from '@codingame/monaco-vscode-api/vscode/vs/base/common/numbers';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
-import { OpenScmGroupAction } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
+import { OpenScmGroupAction } from '@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
 import { ContentHoverController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/hover/browser/contentHoverController';
 import { GlyphHoverController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/hover/browser/glyphHoverController';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
@@ -100,7 +100,7 @@ import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { AccessibilityCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/common/accessibilityCommands';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
-import { CHAT_SETUP_ACTION_ID } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/runOnChange';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
@@ -760,7 +760,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         this.labelService = labelService;
     }
     getWidgetAriaLabel() {
-        return localize(10057, "Source Control Management");
+        return localize(10148, "Source Control Management");
     }
     getAriaLabel(element) {
         if (ResourceTree.isResourceNode(element)) {
@@ -772,17 +772,17 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         else if (isSCMInput(element)) {
             const verbosity = this.configurationService.getValue(AccessibilityVerbositySettingId.SourceControl) === true;
             if (!verbosity || !this.accessibilityService.isScreenReaderOptimized()) {
-                return localize(10058, "Source Control Input");
+                return localize(10149, "Source Control Input");
             }
             const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
             return kbLabel
                 ? ( localize(
-                10059,
+                10150,
                 "Source Control Input, Use {0} to open Source Control Accessibility Help.",
                 kbLabel
             ))
                 : ( localize(
-                10060,
+                10151,
                 "Source Control Input, Run the Open Accessibility Help command for more information."
             ));
         }
@@ -840,14 +840,14 @@ const ContextKeys = {
     }
 };
 MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
-    title: ( localize(10061, "View & Sort")),
+    title: ( localize(10152, "View & Sort")),
     submenu: Menus.ViewSort,
     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_PANE_ID)), ( ContextKeys.RepositoryCount.notEqualsTo(0)))),
     group: '0_view&sort',
     order: 1
 });
 MenuRegistry.appendMenuItem(Menus.ViewSort, {
-    title: ( localize(10062, "Repositories")),
+    title: ( localize(10153, "Repositories")),
     submenu: Menus.Repositories,
     when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
     group: '0_repositories'
@@ -937,7 +937,7 @@ class SetListViewModeAction extends ViewAction {
     constructor(id = 'workbench.scm.action.setListViewMode', menu = {}) {
         super({
             id,
-            title: ( localize(10063, "View as List")),
+            title: ( localize(10154, "View as List")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listTree,
@@ -963,7 +963,7 @@ class SetTreeViewModeAction extends ViewAction {
     constructor(id = 'workbench.scm.action.setTreeViewMode', menu = {}) {
         super({
             id,
-            title: ( localize(10064, "View as Tree")),
+            title: ( localize(10155, "View as Tree")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listFlat,
@@ -1016,17 +1016,17 @@ class RepositorySortAction extends ViewAction {
 }
 class RepositorySortByDiscoveryTimeAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.DiscoveryTime, ( localize(10065, "Sort by Discovery Time")));
+        super(ISCMRepositorySortKey.DiscoveryTime, ( localize(10156, "Sort by Discovery Time")));
     }
 }
 class RepositorySortByNameAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Name, ( localize(10066, "Sort by Name")));
+        super(ISCMRepositorySortKey.Name, ( localize(10157, "Sort by Name")));
     }
 }
 class RepositorySortByPathAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Path, ( localize(10067, "Sort by Path")));
+        super(ISCMRepositorySortKey.Path, ( localize(10158, "Sort by Path")));
     }
 }
 registerAction2(RepositorySortByDiscoveryTimeAction);
@@ -1051,17 +1051,17 @@ class SetSortKeyAction extends ViewAction {
 }
 class SetSortByNameAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Name, ( localize(10068, "Sort Changes by Name")));
+        super(ViewSortKey.Name, ( localize(10159, "Sort Changes by Name")));
     }
 }
 class SetSortByPathAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Path, ( localize(10069, "Sort Changes by Path")));
+        super(ViewSortKey.Path, ( localize(10160, "Sort Changes by Path")));
     }
 }
 class SetSortByStatusAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Status, ( localize(10070, "Sort Changes by Status")));
+        super(ViewSortKey.Status, ( localize(10161, "Sort Changes by Status")));
     }
 }
 registerAction2(SetSortByNameAction);
@@ -1071,7 +1071,7 @@ class CollapseAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.collapseAllRepositories`,
-            title: ( localize(10071, "Collapse All Repositories")),
+            title: ( localize(10162, "Collapse All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.collapseAll,
@@ -1090,7 +1090,7 @@ class ExpandAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.expandAllRepositories`,
-            title: ( localize(10072, "Expand All Repositories")),
+            title: ( localize(10163, "Expand All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.expandAll,
@@ -1120,7 +1120,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SCMInputWidgetCommandId.SetupAction,
-            title: ( localize(10073, "Generate Commit Message")),
+            title: ( localize(10164, "Generate Commit Message")),
             icon: Codicon.sparkle,
             f1: false,
             menu: {
@@ -1131,9 +1131,7 @@ registerAction2(class extends Action2 {
     }
     async run(accessor, ...args) {
         const commandService = accessor.get(ICommandService);
-        const telemetryService = accessor.get(ITelemetryService);
-        telemetryService.publicLog2('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'scmInput' });
-        const result = await commandService.executeCommand(CHAT_SETUP_ACTION_ID);
+        const result = await commandService.executeCommand(CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID);
         if (!result) {
             return;
         }
@@ -1197,10 +1195,10 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
         this._onDidChange = ( new Emitter());
         this.onDidChange = this._onDidChange.event;
         this._disposables = this._register(( new MutableDisposable()));
-        this._dropdownAction = ( new Action('scmInputMoreActions', ( localize(10074, "More Actions...")), 'codicon-chevron-down'));
+        this._dropdownAction = ( new Action('scmInputMoreActions', ( localize(10165, "More Actions...")), 'codicon-chevron-down'));
         this._cancelAction = ( new MenuItemAction({
             id: SCMInputWidgetCommandId.CancelAction,
-            title: ( localize(10075, "Cancel")),
+            title: ( localize(10166, "Cancel")),
             icon: Codicon.stopCircle,
         }, undefined, undefined, undefined, undefined, contextKeyService, commandService));
     }
@@ -1416,13 +1414,13 @@ let SCMInputWidget = class SCMInputWidget {
             const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
             return kbLabel
                 ? ( localize(
-                10076,
+                10167,
                 "{0}, Use {1} to open Source Control Accessibility Help.",
                 placeholder,
                 kbLabel
             ))
                 : ( localize(
-                10077,
+                10168,
                 "{0}, Run the Open Accessibility Help command for more information.",
                 placeholder
             ));
@@ -1679,7 +1677,7 @@ let SCMInputWidget = class SCMInputWidget {
                 }
                 const actionsContainer = append(validationContainer, $('.scm-editor-validation-actions'));
                 const actionbar = ( new ActionBar(actionsContainer));
-                const action = ( new Action('scmInputWidget.validationMessage.close', ( localize(10078, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
+                const action = ( new Action('scmInputWidget.validationMessage.close', ( localize(10169, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
                     this.contextViewService.hideContextView();
                     this.element.style.borderBottomLeftRadius = '2px';
                     this.element.style.borderBottomRightRadius = '2px';

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.d.ts

@@ -8,7 +8,7 @@ import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
-import { ViewPaneContainer } from "@codingame/monaco-vscode-71c8dbff-4c98-552f-aef0-e72b00fdcfc0-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
+import { ViewPaneContainer } from "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 export declare class SCMViewPaneContainer extends ViewPaneContainer {
     constructor(layoutService: IWorkbenchLayoutService, telemetryService: ITelemetryService, instantiationService: IInstantiationService, contextMenuService: IContextMenuService, themeService: IThemeService, storageService: IStorageService, configurationService: IConfigurationService, extensionService: IExtensionService, contextService: IWorkspaceContextService, viewDescriptorService: IViewDescriptorService, logService: ILogService);

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.js

@@ -13,7 +13,7 @@ import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
-import { ViewPaneContainer } from '@codingame/monaco-vscode-71c8dbff-4c98-552f-aef0-e72b00fdcfc0-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer } from '@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 
 registerCss(scm);

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js

@@ -51,7 +51,7 @@ let RepositoryPicker = class RepositoryPicker {
         this._quickInputService = _quickInputService;
         this._scmViewService = _scmViewService;
         this._autoQuickPickItem = {
-            label: ( localize(10079, "Auto")),
+            label: ( localize(10170, "Auto")),
             description: this._autoQuickItemDescription,
             repository: 'auto'
         };

package/vscode/src/vs/workbench/contrib/scm/browser/workingSet.js

@@ -6,7 +6,7 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { getProviderKey } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { getProviderKey } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/scm/browser/util';
 import { ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { Parts } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';