@codingame/monaco-vscode-api 9.0.3 → 10.0.0

package/vscode/src/vs/workbench/services/themes/common/themeCompatibility.js

@@ -0,0 +1,76 @@
+import { Color } from '../../../../base/common/color.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorBackground, editorForeground, editorSelectionBackground, editorInactiveSelection, editorSelectionHighlight, editorFindMatchHighlight, editorFindMatch, editorHoverHighlight, editorFindRangeHighlight } from '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
+import { editorLineHighlight, editorRangeHighlight, editorCursorForeground, editorWhitespaces, editorIndentGuide1, editorActiveIndentGuide1 } from '../../../../editor/common/core/editorColorRegistry.js';
+const settingToColorIdMapping = {};
+function addSettingMapping(settingId, colorId) {
+    let colorIds = settingToColorIdMapping[settingId];
+    if (!colorIds) {
+        settingToColorIdMapping[settingId] = colorIds = [];
+    }
+    colorIds.push(colorId);
+}
+function convertSettings(oldSettings, result) {
+    for (const rule of oldSettings) {
+        result.textMateRules.push(rule);
+        if (!rule.scope) {
+            const settings = rule.settings;
+            if (!settings) {
+                rule.settings = {};
+            }
+            else {
+                for (const settingKey in settings) {
+                    const key = settingKey;
+                    const mappings = settingToColorIdMapping[key];
+                    if (mappings) {
+                        const colorHex = settings[key];
+                        if (typeof colorHex === 'string') {
+                            const color = ( Color.fromHex(colorHex));
+                            for (const colorId of mappings) {
+                                result.colors[colorId] = color;
+                            }
+                        }
+                    }
+                    if (key !== 'foreground' && key !== 'background' && key !== 'fontStyle') {
+                        delete settings[key];
+                    }
+                }
+            }
+        }
+    }
+}
+addSettingMapping('background', editorBackground);
+addSettingMapping('foreground', editorForeground);
+addSettingMapping('selection', editorSelectionBackground);
+addSettingMapping('inactiveSelection', editorInactiveSelection);
+addSettingMapping('selectionHighlightColor', editorSelectionHighlight);
+addSettingMapping('findMatchHighlight', editorFindMatchHighlight);
+addSettingMapping('currentFindMatchHighlight', editorFindMatch);
+addSettingMapping('hoverHighlight', editorHoverHighlight);
+addSettingMapping('wordHighlight', 'editor.wordHighlightBackground');
+addSettingMapping('wordHighlightStrong', 'editor.wordHighlightStrongBackground');
+addSettingMapping('findRangeHighlight', editorFindRangeHighlight);
+addSettingMapping('findMatchHighlight', 'peekViewResult.matchHighlightBackground');
+addSettingMapping('referenceHighlight', 'peekViewEditor.matchHighlightBackground');
+addSettingMapping('lineHighlight', editorLineHighlight);
+addSettingMapping('rangeHighlight', editorRangeHighlight);
+addSettingMapping('caret', editorCursorForeground);
+addSettingMapping('invisibles', editorWhitespaces);
+addSettingMapping('guide', editorIndentGuide1);
+addSettingMapping('activeGuide', editorActiveIndentGuide1);
+const ansiColorMap = ['ansiBlack', 'ansiRed', 'ansiGreen', 'ansiYellow', 'ansiBlue', 'ansiMagenta', 'ansiCyan', 'ansiWhite',
+    'ansiBrightBlack', 'ansiBrightRed', 'ansiBrightGreen', 'ansiBrightYellow', 'ansiBrightBlue', 'ansiBrightMagenta', 'ansiBrightCyan', 'ansiBrightWhite'
+];
+for (const color of ansiColorMap) {
+    addSettingMapping(color, 'terminal.' + color);
+}
+export { convertSettings };

package/vscode/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+const ITreeSitterTokenizationFeature = ( createDecorator('treeSitterTokenizationFeature'));
+export { ITreeSitterTokenizationFeature };

package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorInput.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { DEFAULT_EDITOR_ASSOCIATION, Verbosity, findViewStateForEditor, isUntitledResourceEditorInput } from '../../../common/editor.js';
+import { DEFAULT_EDITOR_ASSOCIATION, findViewStateForEditor, isUntitledResourceEditorInput } from '../../../common/editor.js';
 import { AbstractTextResourceEditorInput } from '../../../common/editor/textResourceEditorInput.js';
 import { ITextFileService } from '../../textfile/common/textfiles.service.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
@@ -50,7 +50,7 @@ let UntitledTextEditorInput = class UntitledTextEditorInput extends AbstractText
     getName() {
         return this.model.name;
     }
-    getDescription(verbosity = Verbosity.MEDIUM) {
+    getDescription(verbosity = 1 ) {
         if (!this.model.hasAssociatedFilePath) {
             const descriptionCandidate = this.resource.path;
             if (descriptionCandidate !== this.getName()) {

package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorModel.js

@@ -7,7 +7,7 @@ import { IWorkingCopyBackupService } from '../../workingCopy/common/workingCopyB
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
 import { createTextBufferFactory, createTextBufferFactoryFromStream } from '../../../../editor/common/model/textModel.js';
 import { IWorkingCopyService } from '../../workingCopy/common/workingCopyService.service.js';
-import { NO_TYPE_ID, WorkingCopyCapabilities } from '../../workingCopy/common/workingCopy.js';
+import { NO_TYPE_ID } from '../../workingCopy/common/workingCopy.js';
 import { ITextFileService } from '../../textfile/common/textfiles.service.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
@@ -56,7 +56,7 @@ let UntitledTextEditorModel = class UntitledTextEditorModel extends BaseTextEdit
         this._onDidRevert = this._register(( new Emitter()));
         this.onDidRevert = this._onDidRevert.event;
         this.typeId = NO_TYPE_ID;
-        this.capabilities = WorkingCopyCapabilities.Untitled;
+        this.capabilities = 2 ;
         this.configuredLabelFormat = 'content';
         this.cachedModelFirstLineWords = undefined;
         this.dirty = this.hasAssociatedFilePath || !!this.initialValue;

package/vscode/src/vs/workbench/services/userDataProfile/browser/iconSelectBox.js

@@ -1,10 +1,9 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { IconSelectBox } from '../../../../base/browser/ui/icons/iconSelectBox.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { trackFocus } from '../../../../base/browser/dom.js';
 import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
-import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 var WorkbenchIconSelectBox_1;
 const WorkbenchIconSelectBoxFocusContextKey = ( new RawContextKey('iconSelectBoxFocus', true));
 const WorkbenchIconSelectBoxInputFocusContextKey = ( new RawContextKey('iconSelectBoxInputFocus', true));
@@ -37,9 +36,9 @@ WorkbenchIconSelectBox = WorkbenchIconSelectBox_1 = ( __decorate([
 ], WorkbenchIconSelectBox));
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'iconSelectBox.focusUp',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: WorkbenchIconSelectBoxFocusContextKey,
-    primary: KeyCode.UpArrow,
+    primary: 16 ,
     handler: () => {
         const selectBox = WorkbenchIconSelectBox.getFocusedWidget();
         if (selectBox) {
@@ -49,9 +48,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'iconSelectBox.focusDown',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: WorkbenchIconSelectBoxFocusContextKey,
-    primary: KeyCode.DownArrow,
+    primary: 18 ,
     handler: () => {
         const selectBox = WorkbenchIconSelectBox.getFocusedWidget();
         if (selectBox) {
@@ -61,9 +60,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'iconSelectBox.focusNext',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: ( ContextKeyExpr.and(WorkbenchIconSelectBoxFocusContextKey, ( ContextKeyExpr.or(WorkbenchIconSelectBoxInputEmptyContextKey, ( WorkbenchIconSelectBoxInputFocusContextKey.toNegated()))))),
-    primary: KeyCode.RightArrow,
+    primary: 17 ,
     handler: () => {
         const selectBox = WorkbenchIconSelectBox.getFocusedWidget();
         if (selectBox) {
@@ -73,9 +72,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'iconSelectBox.focusPrevious',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: ( ContextKeyExpr.and(WorkbenchIconSelectBoxFocusContextKey, ( ContextKeyExpr.or(WorkbenchIconSelectBoxInputEmptyContextKey, ( WorkbenchIconSelectBoxInputFocusContextKey.toNegated()))))),
-    primary: KeyCode.LeftArrow,
+    primary: 15 ,
     handler: () => {
         const selectBox = WorkbenchIconSelectBox.getFocusedWidget();
         if (selectBox) {
@@ -85,9 +84,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'iconSelectBox.selectFocused',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: WorkbenchIconSelectBoxFocusContextKey,
-    primary: KeyCode.Enter,
+    primary: 3 ,
     handler: () => {
         const selectBox = WorkbenchIconSelectBox.getFocusedWidget();
         if (selectBox) {

package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js

@@ -17,11 +17,11 @@ const PROFILE_URL_AUTHORITY_PREFIX = 'profile-';
 function isProfileURL(uri) {
     return uri.authority === PROFILE_URL_AUTHORITY || ( (new RegExp(`^${PROFILE_URL_AUTHORITY_PREFIX}`))).test(uri.authority);
 }
-const defaultUserDataProfileIcon = registerIcon('defaultProfile-icon', Codicon.settings, ( localize(3752, 'Icon for Default Profile.')));
-const PROFILES_TITLE = ( localize2(3753, 'Profiles'));
+const defaultUserDataProfileIcon = registerIcon('defaultProfile-icon', Codicon.settings, ( localize(2703, 'Icon for Default Profile.')));
+const PROFILES_TITLE = ( localize2(2704, 'Profiles'));
 const PROFILES_CATEGORY = { ...PROFILES_TITLE };
 const PROFILE_EXTENSION = 'code-profile';
-const PROFILE_FILTER = [{ name: ( localize(3754, "Profile")), extensions: [PROFILE_EXTENSION] }];
+const PROFILE_FILTER = [{ name: ( localize(2705, "Profile")), extensions: [PROFILE_EXTENSION] }];
 const PROFILES_ENABLEMENT_CONTEXT = ( (new RawContextKey('profiles.enabled', true)));
 const CURRENT_PROFILE_CONTEXT = ( (new RawContextKey('currentProfile', '')));
 const IS_CURRENT_PROFILE_TRANSIENT_CONTEXT = ( (new RawContextKey('isCurrentProfileTransient', false)));

package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.js

@@ -1,7 +1,7 @@
 import { Codicon } from '../../../../base/common/codicons.js';
 import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-const DEFAULT_ICON = registerIcon('settings-view-bar-icon', Codicon.settingsGear, ( localize(10601, "Settings icon in the view bar.")));
+const DEFAULT_ICON = registerIcon('settings-view-bar-icon', Codicon.settingsGear, ( localize(10668, "Settings icon in the view bar.")));
 const ICONS = [
     DEFAULT_ICON,
     Codicon.vm,

package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js

@@ -1,4 +1,3 @@
-import { SyncStatus, SyncResource } from '../../../../platform/userDataSync/common/userDataSync.js';
 import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { localize2, localize } from '../../../../nls.js';
 import { Codicon } from '../../../../base/common/codicons.js';
@@ -6,26 +5,21 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 function getSyncAreaLabel(source) {
     switch (source) {
-        case SyncResource.Settings: return ( localize(8492, "Settings"));
-        case SyncResource.Keybindings: return ( localize(8493, "Keyboard Shortcuts"));
-        case SyncResource.Snippets: return ( localize(8494, "Snippets"));
-        case SyncResource.Tasks: return ( localize(8495, "Tasks"));
-        case SyncResource.Extensions: return ( localize(8496, "Extensions"));
-        case SyncResource.GlobalState: return ( localize(8497, "UI State"));
-        case SyncResource.Profiles: return ( localize(8498, "Profiles"));
-        case SyncResource.WorkspaceState: return ( localize(8499, "Workspace State"));
+        case "settings" : return ( localize(8566, "Settings"));
+        case "keybindings" : return ( localize(8567, "Keyboard Shortcuts"));
+        case "snippets" : return ( localize(8568, "Snippets"));
+        case "tasks" : return ( localize(8569, "Tasks"));
+        case "extensions" : return ( localize(8570, "Extensions"));
+        case "globalState" : return ( localize(8571, "UI State"));
+        case "profiles" : return ( localize(8572, "Profiles"));
+        case "workspaceState" : return ( localize(8573, "Workspace State"));
     }
 }
-var AccountStatus;
-( ((function(AccountStatus) {
-    AccountStatus["Unavailable"] = "unavailable";
-    AccountStatus["Available"] = "available";
-})(AccountStatus || (AccountStatus = {}))));
-const SYNC_TITLE = ( localize2(8500, "Settings Sync"));
-const SYNC_VIEW_ICON = registerIcon('settings-sync-view-icon', Codicon.sync, ( localize(8501, 'View icon of the Settings Sync view.')));
-const CONTEXT_SYNC_STATE = ( (new RawContextKey('syncStatus', SyncStatus.Uninitialized)));
+const SYNC_TITLE = ( localize2(8574, "Settings Sync"));
+const SYNC_VIEW_ICON = registerIcon('settings-sync-view-icon', Codicon.sync, ( localize(8575, 'View icon of the Settings Sync view.')));
+const CONTEXT_SYNC_STATE = ( (new RawContextKey('syncStatus', "uninitialized" )));
 const CONTEXT_SYNC_ENABLEMENT = ( (new RawContextKey('syncEnabled', false)));
-const CONTEXT_ACCOUNT_STATE = ( (new RawContextKey('userDataSyncAccountStatus', AccountStatus.Unavailable)));
+const CONTEXT_ACCOUNT_STATE = ( (new RawContextKey('userDataSyncAccountStatus', "unavailable" )));
 const CONTEXT_ENABLE_ACTIVITY_VIEWS = ( (new RawContextKey(`enableSyncActivityViews`, false)));
 const CONTEXT_ENABLE_SYNC_CONFLICTS_VIEW = ( (new RawContextKey(`enableSyncConflictsView`, false)));
 const CONTEXT_HAS_CONFLICTS = ( (new RawContextKey('hasConflicts', false)));
@@ -35,12 +29,12 @@ const SYNC_VIEW_CONTAINER_ID = 'workbench.view.sync';
 const SYNC_CONFLICTS_VIEW_ID = 'workbench.views.sync.conflicts';
 const DOWNLOAD_ACTIVITY_ACTION_DESCRIPTOR = {
     id: 'workbench.userDataSync.actions.downloadSyncActivity',
-    title: ( localize2(8502, "Download Settings Sync Activity")),
+    title: ( localize2(8576, "Download Settings Sync Activity")),
     category: Categories.Developer,
     f1: true,
     precondition: ( (ContextKeyExpr.and(
-         (CONTEXT_ACCOUNT_STATE.isEqualTo(AccountStatus.Available)),
-         (CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized))
+         (CONTEXT_ACCOUNT_STATE.isEqualTo("available" )),
+         (CONTEXT_SYNC_STATE.notEqualsTo("uninitialized" ))
     )))
 };
-export { AccountStatus, CONFIGURE_SYNC_COMMAND_ID, CONTEXT_ACCOUNT_STATE, CONTEXT_ENABLE_ACTIVITY_VIEWS, CONTEXT_ENABLE_SYNC_CONFLICTS_VIEW, CONTEXT_HAS_CONFLICTS, CONTEXT_SYNC_ENABLEMENT, CONTEXT_SYNC_STATE, DOWNLOAD_ACTIVITY_ACTION_DESCRIPTOR, SHOW_SYNC_LOG_COMMAND_ID, SYNC_CONFLICTS_VIEW_ID, SYNC_TITLE, SYNC_VIEW_CONTAINER_ID, SYNC_VIEW_ICON, getSyncAreaLabel };
+export { CONFIGURE_SYNC_COMMAND_ID, CONTEXT_ACCOUNT_STATE, CONTEXT_ENABLE_ACTIVITY_VIEWS, CONTEXT_ENABLE_SYNC_CONFLICTS_VIEW, CONTEXT_HAS_CONFLICTS, CONTEXT_SYNC_ENABLEMENT, CONTEXT_SYNC_STATE, DOWNLOAD_ACTIVITY_ACTION_DESCRIPTOR, SHOW_SYNC_LOG_COMMAND_ID, SYNC_CONFLICTS_VIEW_ID, SYNC_TITLE, SYNC_VIEW_CONTAINER_ID, SYNC_VIEW_ICON, getSyncAreaLabel };

package/vscode/src/vs/workbench/services/views/browser/viewsService.js

@@ -1,6 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable, DisposableMap, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { ViewContainerLocation } from '../../../common/views.js';
 import { IViewDescriptorService } from '../../../common/views.service.js';
 import { FocusedViewContext, getVisbileViewContextKey } from '../../../common/contextkeys.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
@@ -11,8 +10,6 @@ import { Emitter, Event } from '../../../../base/common/event.js';
 import { isString } from '../../../../base/common/types.js';
 import { registerAction2, Action2, MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 import { localize, localize2 } from '../../../../nls.js';
-import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import '../../../../platform/instantiation/common/extensions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
@@ -20,7 +17,6 @@ import { IContextMenuService } from '../../../../platform/contextview/browser/co
 import { IExtensionService } from '../../extensions/common/extensions.service.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { PaneCompositeDescriptor, Extensions, PaneComposite } from '../../../browser/panecomposite.js';
-import { Parts } from '../../layout/browser/layoutService.js';
 import { IWorkbenchLayoutService } from '../../layout/browser/layoutService.service.js';
 import { URI } from '../../../../base/common/uri.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
@@ -111,7 +107,8 @@ let ViewsService = class ViewsService extends Disposable {
     onDidChangeContainerLocation(viewContainer, from, to) {
         this.deregisterPaneComposite(viewContainer, from);
         this.registerPaneComposite(viewContainer, to);
-        if (this.layoutService.isVisible(getPartByLocation(to)) && this.viewDescriptorService.getViewContainersByLocation(to).length === 1) {
+        if (this.layoutService.isVisible(getPartByLocation(to)) &&
+            this.viewDescriptorService.getViewContainersByLocation(to).filter(vc => this.isViewContainerActive(vc.id)).length === 1) {
             this.openViewContainer(viewContainer.id);
         }
     }
@@ -153,13 +150,24 @@ let ViewsService = class ViewsService extends Disposable {
     }
     isViewContainerVisible(id) {
         const viewContainer = this.viewDescriptorService.getViewContainerById(id);
-        if (viewContainer) {
-            const viewContainerLocation = this.viewDescriptorService.getViewContainerLocation(viewContainer);
-            if (viewContainerLocation !== null) {
-                return this.paneCompositeService.getActivePaneComposite(viewContainerLocation)?.getId() === id;
-            }
+        if (!viewContainer) {
+            return false;
+        }
+        const viewContainerLocation = this.viewDescriptorService.getViewContainerLocation(viewContainer);
+        if (viewContainerLocation === null) {
+            return false;
+        }
+        return this.paneCompositeService.getActivePaneComposite(viewContainerLocation)?.getId() === id;
+    }
+    isViewContainerActive(id) {
+        const viewContainer = this.viewDescriptorService.getViewContainerById(id);
+        if (!viewContainer) {
+            return false;
+        }
+        if (!viewContainer.hideIfEmpty) {
+            return true;
         }
-        return false;
+        return this.viewDescriptorService.getViewContainerModel(viewContainer).activeViewDescriptors.length > 0;
     }
     getVisibleViewContainer(location) {
         const viewContainerId = this.paneCompositeService.getActivePaneComposite(location)?.getId();
@@ -216,7 +224,7 @@ let ViewsService = class ViewsService extends Disposable {
     }
     getFocusedViewName() {
         const viewId = this.contextKeyService.getContextKeyValue(FocusedViewContext.key) ?? '';
-        const textEditorFocused = this.editorService.activeTextEditorControl?.hasTextFocus() ? ( localize(4112, "Text Editor")) : undefined;
+        const textEditorFocused = this.editorService.activeTextEditorControl?.hasTextFocus() ? ( localize(4221, "Text Editor")) : undefined;
         return this.viewDescriptorService.getViewDescriptorById(( (viewId.toString())))?.name?.value ?? textEditorFocused ?? '';
     }
     async openView(id, focus) {
@@ -249,10 +257,10 @@ let ViewsService = class ViewsService extends Disposable {
                 if (view) {
                     if (activeViewPaneContainer.views.length === 1) {
                         const location = this.viewDescriptorService.getViewContainerLocation(viewContainer);
-                        if (location === ViewContainerLocation.Sidebar) {
-                            this.layoutService.setPartHidden(true, Parts.SIDEBAR_PART);
+                        if (location === 0 ) {
+                            this.layoutService.setPartHidden(true, "workbench.parts.sidebar" );
                         }
-                        else if (location === ViewContainerLocation.Panel || location === ViewContainerLocation.AuxiliaryBar) {
+                        else if (location === 1  || location === 2 ) {
                             this.paneCompositeService.hideActivePaneComposite(location);
                         }
                         if (this.focusedViewContextKey.get() === id) {
@@ -316,16 +324,16 @@ let ViewsService = class ViewsService extends Disposable {
                             const viewContainerLocation = that.viewDescriptorService.getViewContainerLocation(viewContainer);
                             const localizedTitle = typeof title === 'string' ? title : title.value;
                             const originalTitle = typeof title === 'string' ? title : title.original;
-                            if (viewContainerLocation === ViewContainerLocation.Sidebar) {
-                                return { value: ( localize(4113, "Show {0}", localizedTitle)), original: `Show ${originalTitle}` };
+                            if (viewContainerLocation === 0 ) {
+                                return { value: ( localize(4222, "Show {0}", localizedTitle)), original: `Show ${originalTitle}` };
                             }
                             else {
-                                return { value: ( localize(4114, "Toggle {0}", localizedTitle)), original: `Toggle ${originalTitle}` };
+                                return { value: ( localize(4223, "Toggle {0}", localizedTitle)), original: `Toggle ${originalTitle}` };
                             }
                         },
                         category: Categories.View,
                         precondition: ( (ContextKeyExpr.has(getEnabledViewContainerContextKey(viewContainer.id)))),
-                        keybinding: keybindings ? { ...keybindings, weight: KeybindingWeight.WorkbenchContrib } : undefined,
+                        keybinding: keybindings ? { ...keybindings, weight: 200  } : undefined,
                         f1: true
                     });
                 }
@@ -336,9 +344,9 @@ let ViewsService = class ViewsService extends Disposable {
                     const viewsService = serviceAccessor.get(IViewsService);
                     const viewContainerLocation = viewDescriptorService.getViewContainerLocation(viewContainer);
                     switch (viewContainerLocation) {
-                        case ViewContainerLocation.AuxiliaryBar:
-                        case ViewContainerLocation.Sidebar: {
-                            const part = viewContainerLocation === ViewContainerLocation.Sidebar ? Parts.SIDEBAR_PART : Parts.AUXILIARYBAR_PART;
+                        case 2 :
+                        case 0 : {
+                            const part = viewContainerLocation === 0  ? "workbench.parts.sidebar"  : "workbench.parts.auxiliarybar" ;
                             if (!viewsService.isViewContainerVisible(viewContainer.id) || !layoutService.hasFocus(part)) {
                                 await viewsService.openViewContainer(viewContainer.id, true);
                             }
@@ -347,8 +355,8 @@ let ViewsService = class ViewsService extends Disposable {
                             }
                             break;
                         }
-                        case ViewContainerLocation.Panel:
-                            if (!viewsService.isViewContainerVisible(viewContainer.id) || !layoutService.hasFocus(Parts.PANEL_PART)) {
+                        case 1 :
+                            if (!viewsService.isViewContainerVisible(viewContainer.id) || !layoutService.hasFocus("workbench.parts.panel" )) {
                                 await viewsService.openViewContainer(viewContainer.id, true);
                             }
                             else {
@@ -365,7 +373,7 @@ let ViewsService = class ViewsService extends Disposable {
                         id,
                         title: mnemonicTitle,
                     },
-                    group: defaultLocation === ViewContainerLocation.Sidebar ? '3_views' : '4_panels',
+                    group: defaultLocation === 0  ? '3_views' : '4_panels',
                     when: ( (ContextKeyExpr.has(getEnabledViewContainerContextKey(viewContainer.id)))),
                     order: order ?? Number.MAX_VALUE
                 }));
@@ -387,16 +395,16 @@ let ViewsService = class ViewsService extends Disposable {
                             const viewContainerLocation = that.viewDescriptorService.getViewLocationById(viewDescriptor.id);
                             const localizedTitle = typeof title === 'string' ? title : title.value;
                             const originalTitle = typeof title === 'string' ? title : title.original;
-                            if (viewContainerLocation === ViewContainerLocation.Sidebar) {
-                                return { value: ( localize(4113, "Show {0}", localizedTitle)), original: `Show ${originalTitle}` };
+                            if (viewContainerLocation === 0 ) {
+                                return { value: ( localize(4222, "Show {0}", localizedTitle)), original: `Show ${originalTitle}` };
                             }
                             else {
-                                return { value: ( localize(4114, "Toggle {0}", localizedTitle)), original: `Toggle ${originalTitle}` };
+                                return { value: ( localize(4223, "Toggle {0}", localizedTitle)), original: `Toggle ${originalTitle}` };
                             }
                         },
                         category: Categories.View,
                         precondition: ( (ContextKeyExpr.has(`${viewDescriptor.id}.active`))),
-                        keybinding: viewDescriptor.openCommandActionDescriptor.keybindings ? { ...viewDescriptor.openCommandActionDescriptor.keybindings, weight: KeybindingWeight.WorkbenchContrib } : undefined,
+                        keybinding: viewDescriptor.openCommandActionDescriptor.keybindings ? { ...viewDescriptor.openCommandActionDescriptor.keybindings, weight: 200  } : undefined,
                         f1: true
                     });
                 }
@@ -409,7 +417,7 @@ let ViewsService = class ViewsService extends Disposable {
                     const focusedViewId = FocusedViewContext.getValue(contextKeyService);
                     if (focusedViewId === viewDescriptor.id) {
                         const viewLocation = viewDescriptorService.getViewLocationById(viewDescriptor.id);
-                        if (viewDescriptorService.getViewLocationById(viewDescriptor.id) === ViewContainerLocation.Sidebar) {
+                        if (viewDescriptorService.getViewLocationById(viewDescriptor.id) === 0 ) {
                             editorGroupService.activeGroup.focus();
                         }
                         else if (viewLocation !== null) {
@@ -430,7 +438,7 @@ let ViewsService = class ViewsService extends Disposable {
                             id: commandId,
                             title: viewDescriptor.openCommandActionDescriptor.mnemonicTitle,
                         },
-                        group: defaultLocation === ViewContainerLocation.Sidebar ? '3_views' : '4_panels',
+                        group: defaultLocation === 0  ? '3_views' : '4_panels',
                         when: ( (ContextKeyExpr.has(`${viewDescriptor.id}.active`))),
                         order: viewDescriptor.openCommandActionDescriptor.order ?? Number.MAX_VALUE
                     }));
@@ -442,7 +450,7 @@ let ViewsService = class ViewsService extends Disposable {
     registerFocusViewAction(viewDescriptor, category) {
         return registerAction2(class FocusViewAction extends Action2 {
             constructor() {
-                const title = ( localize2(4115, "Focus on {0} View", viewDescriptor.name.value));
+                const title = ( localize2(4224, "Focus on {0} View", viewDescriptor.name.value));
                 super({
                     id: viewDescriptor.focusCommand ? viewDescriptor.focusCommand.id : `${viewDescriptor.id}.focus`,
                     title,
@@ -453,7 +461,7 @@ let ViewsService = class ViewsService extends Disposable {
                         }],
                     keybinding: {
                         when: ( (ContextKeyExpr.has(`${viewDescriptor.id}.active`))),
-                        weight: KeybindingWeight.WorkbenchContrib,
+                        weight: 200 ,
                         primary: viewDescriptor.focusCommand?.keybindings?.primary,
                         secondary: viewDescriptor.focusCommand?.keybindings?.secondary,
                         linux: viewDescriptor.focusCommand?.keybindings?.linux,
@@ -490,7 +498,7 @@ let ViewsService = class ViewsService extends Disposable {
             constructor() {
                 super({
                     id: `${viewDescriptor.id}.resetViewLocation`,
-                    title: ( localize2(4116, "Reset Location")),
+                    title: ( localize2(4225, "Reset Location")),
                     menu: [{
                             id: MenuId.ViewTitleContext,
                             when: ( (ContextKeyExpr.or( (ContextKeyExpr.and(
@@ -578,24 +586,24 @@ ViewsService = ( (__decorate([
 function getEnabledViewContainerContextKey(viewContainerId) { return `viewContainer.${viewContainerId}.enabled`; }
 function getPaneCompositeExtension(viewContainerLocation) {
     switch (viewContainerLocation) {
-        case ViewContainerLocation.AuxiliaryBar:
+        case 2 :
             return Extensions.Auxiliary;
-        case ViewContainerLocation.Panel:
+        case 1 :
             return Extensions.Panels;
-        case ViewContainerLocation.Sidebar:
+        case 0 :
         default:
             return Extensions.Viewlets;
     }
 }
 function getPartByLocation(viewContainerLocation) {
     switch (viewContainerLocation) {
-        case ViewContainerLocation.AuxiliaryBar:
-            return Parts.AUXILIARYBAR_PART;
-        case ViewContainerLocation.Panel:
-            return Parts.PANEL_PART;
-        case ViewContainerLocation.Sidebar:
+        case 2 :
+            return "workbench.parts.auxiliarybar" ;
+        case 1 :
+            return "workbench.parts.panel" ;
+        case 0 :
         default:
-            return Parts.SIDEBAR_PART;
+            return "workbench.parts.sidebar" ;
     }
 }
 export { ViewsService, getPartByLocation };

package/vscode/src/vs/workbench/services/views/common/viewsService.service.d.ts

@@ -13,6 +13,7 @@ interface IViewsService {
         location: ViewContainerLocation;
     }>;
     isViewContainerVisible(id: string): boolean;
+    isViewContainerActive(id: string): boolean;
     openViewContainer(id: string, focus?: boolean): Promise<IPaneComposite | null>;
     closeViewContainer(id: string): void;
     getVisibleViewContainer(location: ViewContainerLocation): ViewContainer | null;

package/vscode/src/vs/workbench/services/workingCopy/common/resourceWorkingCopy.js

@@ -3,7 +3,6 @@ import { timeout } from '../../../../base/common/async.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { FileChangeType } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 let ResourceWorkingCopy = class ResourceWorkingCopy extends Disposable {
     constructor(resource, fileService) {
@@ -24,14 +23,14 @@ let ResourceWorkingCopy = class ResourceWorkingCopy extends Disposable {
         let fileEventImpactsUs = false;
         let newInOrphanModeGuess;
         if (this.orphaned) {
-            const fileWorkingCopyResourceAdded = e.contains(this.resource, FileChangeType.ADDED);
+            const fileWorkingCopyResourceAdded = e.contains(this.resource, 1 );
             if (fileWorkingCopyResourceAdded) {
                 newInOrphanModeGuess = false;
                 fileEventImpactsUs = true;
             }
         }
         else {
-            const fileWorkingCopyResourceDeleted = e.contains(this.resource, FileChangeType.DELETED);
+            const fileWorkingCopyResourceDeleted = e.contains(this.resource, 2 );
             if (fileWorkingCopyResourceDeleted) {
                 newInOrphanModeGuess = true;
                 fileEventImpactsUs = true;