@codingame/monaco-vscode-api 5.3.0 → 6.0.0

package/vscode/src/vs/workbench/services/layout/browser/layoutService.js

@@ -1,6 +1,6 @@
 import { isWeb, isMacintosh, isNative } from '../../../../base/common/platform.js';
 import { isAuxiliaryWindow } from '../../../../base/browser/window.js';
-import { hasNativeTitlebar, getMenuBarVisibility } from '../../../../platform/window/common/window.js';
+import { hasNativeTitlebar, TitleBarSetting, CustomTitleBarVisibility, getMenuBarVisibility } from '../../../../platform/window/common/window.js';
 import { isFullscreen, isWCOEnabled } from '../../../../base/browser/browser.js';
 var Parts;
 ( (function(Parts) {
@@ -13,50 +13,97 @@ var Parts;
     Parts["EDITOR_PART"] = "workbench.parts.editor";
     Parts["STATUSBAR_PART"] = "workbench.parts.statusbar";
 })(Parts || (Parts = {})));
+var ZenModeSettings;
+( (function(ZenModeSettings) {
+    ZenModeSettings["SHOW_TABS"] = "zenMode.showTabs";
+    ZenModeSettings["HIDE_LINENUMBERS"] = "zenMode.hideLineNumbers";
+    ZenModeSettings["HIDE_STATUSBAR"] = "zenMode.hideStatusBar";
+    ZenModeSettings["HIDE_ACTIVITYBAR"] = "zenMode.hideActivityBar";
+    ZenModeSettings["CENTER_LAYOUT"] = "zenMode.centerLayout";
+    ZenModeSettings["FULLSCREEN"] = "zenMode.fullScreen";
+    ZenModeSettings["RESTORE"] = "zenMode.restore";
+    ZenModeSettings["SILENT_NOTIFICATIONS"] = "zenMode.silentNotifications";
+})(ZenModeSettings || (ZenModeSettings = {})));
+var LayoutSettings;
+( (function(LayoutSettings) {
+    LayoutSettings["ACTIVITY_BAR_LOCATION"] = "workbench.activityBar.location";
+    LayoutSettings["EDITOR_TABS_MODE"] = "workbench.editor.showTabs";
+    LayoutSettings["EDITOR_ACTIONS_LOCATION"] = "workbench.editor.editorActionsLocation";
+    LayoutSettings["COMMAND_CENTER"] = "window.commandCenter";
+    LayoutSettings["LAYOUT_ACTIONS"] = "workbench.layoutControl.enabled";
+})(LayoutSettings || (LayoutSettings = {})));
+var ActivityBarPosition;
+( (function(ActivityBarPosition) {
+    ActivityBarPosition["DEFAULT"] = "default";
+    ActivityBarPosition["TOP"] = "top";
+    ActivityBarPosition["BOTTOM"] = "bottom";
+    ActivityBarPosition["HIDDEN"] = "hidden";
+})(ActivityBarPosition || (ActivityBarPosition = {})));
+var EditorTabsMode;
+( (function(EditorTabsMode) {
+    EditorTabsMode["MULTIPLE"] = "multiple";
+    EditorTabsMode["SINGLE"] = "single";
+    EditorTabsMode["NONE"] = "none";
+})(EditorTabsMode || (EditorTabsMode = {})));
+var EditorActionsLocation;
+( (function(EditorActionsLocation) {
+    EditorActionsLocation["DEFAULT"] = "default";
+    EditorActionsLocation["TITLEBAR"] = "titleBar";
+    EditorActionsLocation["HIDDEN"] = "hidden";
+})(EditorActionsLocation || (EditorActionsLocation = {})));
 var Position;
 ( (function(Position) {
     Position[Position["LEFT"] = 0] = "LEFT";
     Position[Position["RIGHT"] = 1] = "RIGHT";
     Position[Position["BOTTOM"] = 2] = "BOTTOM";
 })(Position || (Position = {})));
+var PanelOpensMaximizedOptions;
+( (function(PanelOpensMaximizedOptions) {
+    PanelOpensMaximizedOptions[PanelOpensMaximizedOptions["ALWAYS"] = 0] = "ALWAYS";
+    PanelOpensMaximizedOptions[PanelOpensMaximizedOptions["NEVER"] = 1] = "NEVER";
+    PanelOpensMaximizedOptions[PanelOpensMaximizedOptions["REMEMBER_LAST"] = 2] = "REMEMBER_LAST";
+})(PanelOpensMaximizedOptions || (PanelOpensMaximizedOptions = {})));
 function positionToString(position) {
     switch (position) {
-        case 0 : return 'left';
-        case 1 : return 'right';
-        case 2 : return 'bottom';
+        case Position.LEFT: return 'left';
+        case Position.RIGHT: return 'right';
+        case Position.BOTTOM: return 'bottom';
         default: return 'bottom';
     }
 }
 const positionsByString = {
-    [positionToString(0 )]: 0 ,
-    [positionToString(1 )]: 1 ,
-    [positionToString(2 )]: 2
+    [positionToString(Position.LEFT)]: Position.LEFT,
+    [positionToString(Position.RIGHT)]: Position.RIGHT,
+    [positionToString(Position.BOTTOM)]: Position.BOTTOM
 };
 function positionFromString(str) {
     return positionsByString[str];
 }
 function panelOpensMaximizedSettingToString(setting) {
     switch (setting) {
-        case 0 : return 'always';
-        case 1 : return 'never';
-        case 2 : return 'preserve';
+        case PanelOpensMaximizedOptions.ALWAYS: return 'always';
+        case PanelOpensMaximizedOptions.NEVER: return 'never';
+        case PanelOpensMaximizedOptions.REMEMBER_LAST: return 'preserve';
         default: return 'preserve';
     }
 }
 const panelOpensMaximizedByString = {
-    [panelOpensMaximizedSettingToString(0 )]: 0 ,
-    [panelOpensMaximizedSettingToString(1 )]: 1 ,
-    [panelOpensMaximizedSettingToString(2 )]: 2
+    [panelOpensMaximizedSettingToString(PanelOpensMaximizedOptions.ALWAYS)]: PanelOpensMaximizedOptions.ALWAYS,
+    [panelOpensMaximizedSettingToString(PanelOpensMaximizedOptions.NEVER)]: PanelOpensMaximizedOptions.NEVER,
+    [panelOpensMaximizedSettingToString(PanelOpensMaximizedOptions.REMEMBER_LAST)]: PanelOpensMaximizedOptions.REMEMBER_LAST
 };
 function panelOpensMaximizedFromString(str) {
     return panelOpensMaximizedByString[str];
 }
-function shouldShowCustomTitleBar(configurationService, window, menuBarToggled) {
+function shouldShowCustomTitleBar(configurationService, window, menuBarToggled, zenModeActive) {
+    if (zenModeActive) {
+        return false;
+    }
     const inFullscreen = isFullscreen(window);
     const nativeTitleBarEnabled = hasNativeTitlebar(configurationService);
     if (!isWeb) {
-        const showCustomTitleBar = configurationService.getValue("window.customTitleBarVisibility" );
-        if (showCustomTitleBar === "never"  && nativeTitleBarEnabled || showCustomTitleBar === "windowed"  && inFullscreen) {
+        const showCustomTitleBar = configurationService.getValue(TitleBarSetting.CUSTOM_TITLE_BAR_VISIBILITY);
+        if (showCustomTitleBar === CustomTitleBarVisibility.NEVER && nativeTitleBarEnabled || showCustomTitleBar === CustomTitleBarVisibility.WINDOWED && inFullscreen) {
             return false;
         }
     }
@@ -91,21 +138,21 @@ function shouldShowCustomTitleBar(configurationService, window, menuBarToggled)
     }
 }
 function isTitleBarEmpty(configurationService) {
-    if (configurationService.getValue("window.commandCenter" )) {
+    if (configurationService.getValue(LayoutSettings.COMMAND_CENTER)) {
         return false;
     }
-    const activityBarPosition = configurationService.getValue("workbench.activityBar.location" );
-    if (activityBarPosition === "top"  || activityBarPosition === "bottom" ) {
+    const activityBarPosition = configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION);
+    if (activityBarPosition === ActivityBarPosition.TOP || activityBarPosition === ActivityBarPosition.BOTTOM) {
         return false;
     }
-    const editorActionsLocation = configurationService.getValue("workbench.editor.editorActionsLocation" );
-    const editorTabsMode = configurationService.getValue("workbench.editor.showTabs" );
-    if (editorActionsLocation === "titleBar"  || editorActionsLocation === "default"  && editorTabsMode === "none" ) {
+    const editorActionsLocation = configurationService.getValue(LayoutSettings.EDITOR_ACTIONS_LOCATION);
+    const editorTabsMode = configurationService.getValue(LayoutSettings.EDITOR_TABS_MODE);
+    if (editorActionsLocation === EditorActionsLocation.TITLEBAR || editorActionsLocation === EditorActionsLocation.DEFAULT && editorTabsMode === EditorTabsMode.NONE) {
         return false;
     }
-    if (configurationService.getValue("workbench.layoutControl.enabled" )) {
+    if (configurationService.getValue(LayoutSettings.LAYOUT_ACTIONS)) {
         return false;
     }
     return true;
 }
-export { Parts, Position, panelOpensMaximizedFromString, positionFromString, positionToString, shouldShowCustomTitleBar };
+export { ActivityBarPosition, EditorActionsLocation, EditorTabsMode, LayoutSettings, PanelOpensMaximizedOptions, Parts, Position, ZenModeSettings, panelOpensMaximizedFromString, positionFromString, positionToString, shouldShowCustomTitleBar };

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

@@ -1,16 +1,36 @@
+var ShutdownReason;
+( (function(ShutdownReason) {
+    ShutdownReason[ShutdownReason["CLOSE"] = 1] = "CLOSE";
+    ShutdownReason[ShutdownReason["QUIT"] = 2] = "QUIT";
+    ShutdownReason[ShutdownReason["RELOAD"] = 3] = "RELOAD";
+    ShutdownReason[ShutdownReason["LOAD"] = 4] = "LOAD";
+})(ShutdownReason || (ShutdownReason = {})));
+var StartupKind;
+( (function(StartupKind) {
+    StartupKind[StartupKind["NewWindow"] = 1] = "NewWindow";
+    StartupKind[StartupKind["ReloadedWindow"] = 3] = "ReloadedWindow";
+    StartupKind[StartupKind["ReopenedWindow"] = 4] = "ReopenedWindow";
+})(StartupKind || (StartupKind = {})));
 function StartupKindToString(startupKind) {
     switch (startupKind) {
-        case 1 : return 'NewWindow';
-        case 3 : return 'ReloadedWindow';
-        case 4 : return 'ReopenedWindow';
+        case StartupKind.NewWindow: return 'NewWindow';
+        case StartupKind.ReloadedWindow: return 'ReloadedWindow';
+        case StartupKind.ReopenedWindow: return 'ReopenedWindow';
     }
 }
+var LifecyclePhase;
+( (function(LifecyclePhase) {
+    LifecyclePhase[LifecyclePhase["Starting"] = 1] = "Starting";
+    LifecyclePhase[LifecyclePhase["Ready"] = 2] = "Ready";
+    LifecyclePhase[LifecyclePhase["Restored"] = 3] = "Restored";
+    LifecyclePhase[LifecyclePhase["Eventually"] = 4] = "Eventually";
+})(LifecyclePhase || (LifecyclePhase = {})));
 function LifecyclePhaseToString(phase) {
     switch (phase) {
-        case 1 : return 'Starting';
-        case 2 : return 'Ready';
-        case 3 : return 'Restored';
-        case 4 : return 'Eventually';
+        case LifecyclePhase.Starting: return 'Starting';
+        case LifecyclePhase.Ready: return 'Ready';
+        case LifecyclePhase.Restored: return 'Restored';
+        case LifecyclePhase.Eventually: return 'Eventually';
     }
 }
-export { LifecyclePhaseToString, StartupKindToString };
+export { LifecyclePhase, LifecyclePhaseToString, ShutdownReason, StartupKind, StartupKindToString };

package/vscode/src/vs/workbench/services/lifecycle/common/lifecycleService.js

@@ -2,10 +2,10 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { Emitter } from '../../../../base/common/event.js';
 import { Barrier } from '../../../../base/common/async.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { LifecyclePhaseToString } from './lifecycle.js';
+import { LifecyclePhase, StartupKind, ShutdownReason, LifecyclePhaseToString } from './lifecycle.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { mark } from '../../../../base/common/performance.js';
-import { WillSaveStateReason } from '../../../../platform/storage/common/storage.js';
+import { WillSaveStateReason, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 var AbstractLifecycleService_1;
 let AbstractLifecycleService = class AbstractLifecycleService extends Disposable {
@@ -27,30 +27,30 @@ let AbstractLifecycleService = class AbstractLifecycleService extends Disposable
         this.onBeforeShutdownError = this._onBeforeShutdownError.event;
         this._onShutdownVeto = this._register(( new Emitter()));
         this.onShutdownVeto = this._onShutdownVeto.event;
-        this._phase = 1 ;
+        this._phase = LifecyclePhase.Starting;
         this.phaseWhen = ( new Map());
         this._startupKind = this.resolveStartupKind();
         this._register(this.storageService.onWillSaveState(e => {
             if (e.reason === WillSaveStateReason.SHUTDOWN) {
-                this.storageService.store(AbstractLifecycleService_1.LAST_SHUTDOWN_REASON_KEY, this.shutdownReason, 1 , 1 );
+                this.storageService.store(AbstractLifecycleService_1.LAST_SHUTDOWN_REASON_KEY, this.shutdownReason, StorageScope.WORKSPACE, StorageTarget.MACHINE);
             }
         }));
     }
     resolveStartupKind() {
-        const startupKind = this.doResolveStartupKind() ?? 1 ;
+        const startupKind = this.doResolveStartupKind() ?? StartupKind.NewWindow;
         this.logService.trace(`[lifecycle] starting up (startup kind: ${startupKind})`);
         return startupKind;
     }
     doResolveStartupKind() {
-        const lastShutdownReason = this.storageService.getNumber(AbstractLifecycleService_1.LAST_SHUTDOWN_REASON_KEY, 1 );
-        this.storageService.remove(AbstractLifecycleService_1.LAST_SHUTDOWN_REASON_KEY, 1 );
+        const lastShutdownReason = this.storageService.getNumber(AbstractLifecycleService_1.LAST_SHUTDOWN_REASON_KEY, StorageScope.WORKSPACE);
+        this.storageService.remove(AbstractLifecycleService_1.LAST_SHUTDOWN_REASON_KEY, StorageScope.WORKSPACE);
         let startupKind = undefined;
         switch (lastShutdownReason) {
-            case 3 :
-                startupKind = 3 ;
+            case ShutdownReason.RELOAD:
+                startupKind = StartupKind.ReloadedWindow;
                 break;
-            case 4 :
-                startupKind = 4 ;
+            case ShutdownReason.LOAD:
+                startupKind = StartupKind.ReopenedWindow;
                 break;
         }
         return startupKind;

package/vscode/src/vs/workbench/services/notebook/common/notebookDocumentService.js

@@ -1,6 +1,7 @@
 import { encodeBase64, VSBuffer, decodeBase64 } from '../../../../base/common/buffer.js';
 import { ResourceMap } from '../../../../base/common/map.js';
 import { Schemas } from '../../../../base/common/network.js';
+import '../../../../platform/instantiation/common/extensions.js';
 import '../../../../platform/instantiation/common/instantiation.js';
 const _lengths = ['W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f'];
 const _padRegexp = ( new RegExp(`^[${_lengths.join('')}]+`));

package/vscode/src/vs/workbench/services/outline/browser/outline.js

@@ -0,0 +1,22 @@
+var OutlineTarget;
+( (function(OutlineTarget) {
+    OutlineTarget[OutlineTarget["OutlinePane"] = 1] = "OutlinePane";
+    OutlineTarget[OutlineTarget["Breadcrumbs"] = 2] = "Breadcrumbs";
+    OutlineTarget[OutlineTarget["QuickPick"] = 4] = "QuickPick";
+})(OutlineTarget || (OutlineTarget = {})));
+var OutlineConfigKeys;
+( (function(OutlineConfigKeys) {
+    OutlineConfigKeys["icons"] = "outline.icons";
+    OutlineConfigKeys["collapseItems"] = "outline.collapseItems";
+    OutlineConfigKeys["problemsEnabled"] = "outline.problems.enabled";
+    OutlineConfigKeys["problemsColors"] = "outline.problems.colors";
+    OutlineConfigKeys["problemsBadges"] = "outline.problems.badges";
+})(OutlineConfigKeys || (OutlineConfigKeys = {})));
+var OutlineConfigCollapseItemsValues;
+( (function(OutlineConfigCollapseItemsValues) {
+    OutlineConfigCollapseItemsValues["Collapsed"] = "alwaysCollapse";
+    OutlineConfigCollapseItemsValues["Expanded"] = "alwaysExpand";
+})(
+    OutlineConfigCollapseItemsValues || (OutlineConfigCollapseItemsValues = {})
+));
+export { OutlineConfigCollapseItemsValues, OutlineConfigKeys, OutlineTarget };

package/vscode/src/vs/workbench/services/preferences/common/preferencesModels.js

@@ -1,13 +1,14 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { coalesce, tail, flatten } from '../../../../base/common/arrays.js';
+import { coalesce, tail } from '../../../../base/common/arrays.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { visit } from '../../../../base/common/json.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { Selection } from '../../../../editor/common/core/selection.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
-import { Extensions, OVERRIDE_PROPERTY_REGEX } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { Extensions, ConfigurationScope, OVERRIDE_PROPERTY_REGEX } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { EditorModel } from '../../../common/editor/editorModel.js';
@@ -176,7 +177,7 @@ let Settings2EditorModel = class Settings2EditorModel extends AbstractSettingsMo
         this.onDidChangeGroups = this._onDidChangeGroups.event;
         this.dirty = false;
         this._register(configurationService.onDidChangeConfiguration(e => {
-            if (e.source === 7 ) {
+            if (e.source === ConfigurationTarget.DEFAULT) {
                 this.dirty = true;
                 this._onDidChangeGroups.fire();
             }
@@ -462,7 +463,7 @@ class DefaultSettings extends Disposable {
                     range: nullRange,
                     valueRange: nullRange,
                     overrides: [],
-                    scope: 4 ,
+                    scope: ConfigurationScope.RESOURCE,
                     type: setting.type,
                     enum: setting.enum,
                     enumDescriptions: setting.enumDescriptions,
@@ -646,10 +647,10 @@ class DefaultSettings extends Disposable {
         if (!property.scope) {
             return true;
         }
-        if (this.target === 6 ) {
+        if (this.target === ConfigurationTarget.WORKSPACE_FOLDER) {
             return FOLDER_SCOPES.indexOf(property.scope) !== -1;
         }
-        if (this.target === 5 ) {
+        if (this.target === ConfigurationTarget.WORKSPACE) {
             return WORKSPACE_SCOPES.indexOf(property.scope) !== -1;
         }
         return true;
@@ -763,9 +764,9 @@ class DefaultSettingsEditorModel extends AbstractSettingsModel {
             };
         })));
         builder.pushGroup(settingsGroup);
-        const fixedMatches = flatten(( (( (filterMatches
+        const fixedMatches = ( (filterMatches
             .map(m => m.matches || [])))
-            .map((settingMatches, i) => {
+            .flatMap((settingMatches, i) => {
             const setting = settingsGroup.sections[0].settings[i];
             return (
                  (settingMatches.map(range => {
@@ -779,7 +780,7 @@ class DefaultSettingsEditorModel extends AbstractSettingsModel {
                     );
                 }))
             );
-        }))));
+        });
         return fixedMatches;
     }
     copySetting(setting) {

package/vscode/src/vs/workbench/services/progress/browser/progressIndicator.js

@@ -1,6 +1,7 @@
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { emptyProgressRunner } from '../../../../platform/progress/common/progress.js';
+import { GroupModelChangeKind } from '../../../common/editor.js';
 class EditorProgressIndicator extends Disposable {
     constructor(progressBar, group) {
         super();
@@ -10,8 +11,8 @@ class EditorProgressIndicator extends Disposable {
     }
     registerListeners() {
         this._register(this.group.onDidModelChange(e => {
-            if (e.kind === 7  ||
-                (e.kind === 5  && this.group.isEmpty)) {
+            if (e.kind === GroupModelChangeKind.EDITOR_ACTIVE ||
+                (e.kind === GroupModelChangeKind.EDITOR_CLOSE && this.group.isEmpty)) {
                 this.progressBar.stop().hide();
             }
         }));
@@ -73,22 +74,23 @@ class EditorProgressIndicator extends Disposable {
 }
 var ProgressIndicatorState;
 ( (function(ProgressIndicatorState) {
+    let Type;
     ( (function(Type) {
         Type[Type["None"] = 0] = "None";
         Type[Type["Done"] = 1] = "Done";
         Type[Type["Infinite"] = 2] = "Infinite";
         Type[Type["While"] = 3] = "While";
         Type[Type["Work"] = 4] = "Work";
-    })(ProgressIndicatorState.Type || (ProgressIndicatorState.Type = {})));
-    ProgressIndicatorState.None = { type: 0  };
-    ProgressIndicatorState.Done = { type: 1  };
-    ProgressIndicatorState.Infinite = { type: 2  };
+    })(Type = ProgressIndicatorState.Type || (ProgressIndicatorState.Type = {})));
+    ProgressIndicatorState.None = { type: Type.None };
+    ProgressIndicatorState.Done = { type: Type.Done };
+    ProgressIndicatorState.Infinite = { type: Type.Infinite };
     class While {
         constructor(whilePromise, whileStart, whileDelay) {
             this.whilePromise = whilePromise;
             this.whileStart = whileStart;
             this.whileDelay = whileDelay;
-            this.type = 3 ;
+            this.type = Type.While;
         }
     }
     ProgressIndicatorState.While = While;
@@ -96,7 +98,7 @@ var ProgressIndicatorState;
         constructor(total, worked) {
             this.total = total;
             this.worked = worked;
-            this.type = 4 ;
+            this.type = Type.Work;
         }
     }
     ProgressIndicatorState.Work = Work;
@@ -123,7 +125,7 @@ class ScopedProgressIndicator extends Disposable {
         if (this.progressState.type === ProgressIndicatorState.Done.type) {
             return;
         }
-        if (this.progressState.type === 3 ) {
+        if (this.progressState.type === ProgressIndicatorState.Type.While) {
             let delay;
             if (this.progressState.whileDelay > 0) {
                 const remainingDelay = this.progressState.whileDelay - (Date.now() - this.progressState.whileStart);
@@ -133,10 +135,10 @@ class ScopedProgressIndicator extends Disposable {
             }
             this.doShowWhile(delay);
         }
-        else if (this.progressState.type === 2 ) {
+        else if (this.progressState.type === ProgressIndicatorState.Type.Infinite) {
             this.progressBar.infinite().show();
         }
-        else if (this.progressState.type === 4 ) {
+        else if (this.progressState.type === ProgressIndicatorState.Type.Work) {
             if (this.progressState.total) {
                 this.progressBar.total(this.progressState.total).show();
             }
@@ -156,23 +158,23 @@ class ScopedProgressIndicator extends Disposable {
             this.progressState = new ProgressIndicatorState.Work(infiniteOrTotal, undefined);
         }
         if (this.scope.isActive) {
-            if (this.progressState.type === 2 ) {
+            if (this.progressState.type === ProgressIndicatorState.Type.Infinite) {
                 this.progressBar.infinite().show(delay);
             }
-            else if (this.progressState.type === 4  && typeof this.progressState.total === 'number') {
+            else if (this.progressState.type === ProgressIndicatorState.Type.Work && typeof this.progressState.total === 'number') {
                 this.progressBar.total(this.progressState.total).show(delay);
             }
         }
         return {
             total: (total) => {
-                this.progressState = new ProgressIndicatorState.Work(total, this.progressState.type === 4  ? this.progressState.worked : undefined);
+                this.progressState = new ProgressIndicatorState.Work(total, this.progressState.type === ProgressIndicatorState.Type.Work ? this.progressState.worked : undefined);
                 if (this.scope.isActive) {
                     this.progressBar.total(total);
                 }
             },
             worked: (worked) => {
                 if (!this.scope.isActive || this.progressBar.hasTotal()) {
-                    this.progressState = new ProgressIndicatorState.Work(this.progressState.type === 4  ? this.progressState.total : undefined, this.progressState.type === 4  && typeof this.progressState.worked === 'number' ? this.progressState.worked + worked : worked);
+                    this.progressState = new ProgressIndicatorState.Work(this.progressState.type === ProgressIndicatorState.Type.Work ? this.progressState.total : undefined, this.progressState.type === ProgressIndicatorState.Type.Work && typeof this.progressState.worked === 'number' ? this.progressState.worked + worked : worked);
                     if (this.scope.isActive) {
                         this.progressBar.worked(worked);
                     }
@@ -191,7 +193,7 @@ class ScopedProgressIndicator extends Disposable {
         };
     }
     async showWhile(promise, delay) {
-        if (this.progressState.type === 3 ) {
+        if (this.progressState.type === ProgressIndicatorState.Type.While) {
             promise = Promise.all([promise, this.progressState.whilePromise]);
         }
         this.progressState = new ProgressIndicatorState.While(promise, delay || 0, Date.now());
@@ -202,7 +204,7 @@ class ScopedProgressIndicator extends Disposable {
         catch (error) {
         }
         finally {
-            if (this.progressState.type !== 3  || this.progressState.whilePromise === promise) {
+            if (this.progressState.type !== ProgressIndicatorState.Type.While || this.progressState.whilePromise === promise) {
                 this.progressState = ProgressIndicatorState.None;
                 if (this.scope.isActive) {
                     this.progressBar.stop().hide();

package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.js

@@ -2,6 +2,8 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { localizeWithPath } from '../../../../nls.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import '../../../../platform/instantiation/common/extensions.js';
+import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { ITunnelService } from '../../../../platform/tunnel/common/tunnel.service.js';
 import { TunnelModel } from './tunnelModel.js';
@@ -123,8 +125,8 @@ let RemoteExplorerService = class RemoteExplorerService {
         const newName = name.length > 0 ? name[0] : '';
         if (current !== newName) {
             this._targetType = name;
-            this.storageService.store(REMOTE_EXPLORER_TYPE_KEY, ( (this._targetType.toString())), 1 , 1 );
-            this.storageService.store(REMOTE_EXPLORER_TYPE_KEY, ( (this._targetType.toString())), 0 , 0 );
+            this.storageService.store(REMOTE_EXPLORER_TYPE_KEY, ( (this._targetType.toString())), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+            this.storageService.store(REMOTE_EXPLORER_TYPE_KEY, ( (this._targetType.toString())), StorageScope.PROFILE, StorageTarget.USER);
             this._onDidChangeTargetType.fire(this._targetType);
         }
     }

package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js

@@ -1,6 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { flatten } from '../../../../base/common/arrays.js';
 import { debounce } from '../../../../base/common/decorators.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { hash } from '../../../../base/common/hash.js';
@@ -10,6 +9,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.service.js';
+import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { ProvidedOnAutoForward, isLocalhost, isAllInterfaces, TunnelProtocol, TunnelPrivacyId, LOCALHOST_ADDRESSES, ALL_INTERFACES_ADDRESSES } from '../../../../platform/tunnel/common/tunnel.js';
 import { ITunnelService } from '../../../../platform/tunnel/common/tunnel.service.js';
@@ -451,9 +451,9 @@ let TunnelModel = class TunnelModel extends Disposable {
         return this.addStorageKeyPostfix(TUNNELS_TO_RESTORE_EXPIRATION);
     }
     async getTunnelRestoreValue() {
-        const deprecatedValue = this.storageService.get(TUNNELS_TO_RESTORE, 1 );
+        const deprecatedValue = this.storageService.get(TUNNELS_TO_RESTORE, StorageScope.WORKSPACE);
         if (deprecatedValue) {
-            this.storageService.remove(TUNNELS_TO_RESTORE, 1 );
+            this.storageService.remove(TUNNELS_TO_RESTORE, StorageScope.WORKSPACE);
             await this.storeForwarded();
             return deprecatedValue;
         }
@@ -461,7 +461,7 @@ let TunnelModel = class TunnelModel extends Disposable {
         if (!storageKey) {
             return undefined;
         }
-        return this.storageService.get(storageKey, 0 );
+        return this.storageService.get(storageKey, StorageScope.PROFILE);
     }
     async restoreForwarded() {
         this.cleanupExpiredTunnelsForRestore();
@@ -492,23 +492,23 @@ let TunnelModel = class TunnelModel extends Disposable {
         if (!this.restoreListener) {
             const key = await this.getTunnelRestoreStorageKey();
             this.restoreListener = this._register(( (new DisposableStore())));
-            this.restoreListener.add(this.storageService.onDidChangeValue(0 , undefined, this.restoreListener)(async (e) => {
+            this.restoreListener.add(this.storageService.onDidChangeValue(StorageScope.PROFILE, undefined, this.restoreListener)(async (e) => {
                 if (e.key === key) {
-                    this.tunnelRestoreValue = Promise.resolve(this.storageService.get(key, 0 ));
+                    this.tunnelRestoreValue = Promise.resolve(this.storageService.get(key, StorageScope.PROFILE));
                     await this.restoreForwarded();
                 }
             }));
         }
     }
     cleanupExpiredTunnelsForRestore() {
-        const keys = ( (this.storageService.keys(0, 0 ))).filter(key => key.startsWith(TUNNELS_TO_RESTORE_EXPIRATION));
+        const keys = ( (this.storageService.keys(StorageScope.PROFILE, StorageTarget.USER))).filter(key => key.startsWith(TUNNELS_TO_RESTORE_EXPIRATION));
         for (const key of keys) {
-            const expiration = this.storageService.getNumber(key, 0 );
+            const expiration = this.storageService.getNumber(key, StorageScope.PROFILE);
             if (expiration && expiration < Date.now()) {
                 this.tunnelRestoreValue = Promise.resolve(undefined);
                 const storageKey = key.replace(TUNNELS_TO_RESTORE_EXPIRATION, TUNNELS_TO_RESTORE);
-                this.storageService.remove(key, 0 );
-                this.storageService.remove(storageKey, 0 );
+                this.storageService.remove(key, StorageScope.PROFILE);
+                this.storageService.remove(storageKey, StorageScope.PROFILE);
             }
         }
     }
@@ -534,12 +534,12 @@ let TunnelModel = class TunnelModel extends Disposable {
             const key = await this.getTunnelRestoreStorageKey();
             const expirationKey = await this.getRestoreExpirationStorageKey();
             if (!valueToStore && key && expirationKey) {
-                this.storageService.remove(key, 0 );
-                this.storageService.remove(expirationKey, 0 );
+                this.storageService.remove(key, StorageScope.PROFILE);
+                this.storageService.remove(expirationKey, StorageScope.PROFILE);
             }
             else if ((valueToStore !== this.knownPortsRestoreValue) && key && expirationKey) {
-                this.storageService.store(key, valueToStore, 0 , 0 );
-                this.storageService.store(expirationKey, Date.now() + RESTORE_EXPIRATION_TIME, 0 , 0 );
+                this.storageService.store(key, valueToStore, StorageScope.PROFILE, StorageTarget.USER);
+                this.storageService.store(expirationKey, Date.now() + RESTORE_EXPIRATION_TIME, StorageScope.PROFILE, StorageTarget.USER);
             }
             this.knownPortsRestoreValue = valueToStore;
         }
@@ -845,7 +845,7 @@ let TunnelModel = class TunnelModel extends Disposable {
         if ((this.portAttributesProviders.length === 0) || !checkProviders) {
             return (configAttributes.size > 0) ? configAttributes : undefined;
         }
-        const allProviderResults = await Promise.all(flatten(( (this.portAttributesProviders.map(provider => {
+        const allProviderResults = await Promise.all(this.portAttributesProviders.flatMap(provider => {
             return (
                  (Array.from(pidToPortsMapping.entries()).map(entry => {
                     const portGroup = entry[1];
@@ -853,7 +853,7 @@ let TunnelModel = class TunnelModel extends Disposable {
                     return provider.providePortAttributes(portGroup, matchingCandidate?.pid, matchingCandidate?.detail, CancellationToken.None);
                 }))
             );
-        })))));
+        }));
         const providedAttributes = ( (new Map()));
         allProviderResults.forEach(attributes => attributes.forEach(attribute => {
             if (attribute) {

package/vscode/src/vs/workbench/services/search/common/fileSearchManager.js

@@ -201,12 +201,13 @@ class FileSearchManager {
         return this.doSearch(engine, FileSearchManager.BATCH_SIZE, onInternalResult, token).then(result => {
             return {
                 limitHit: result.limitHit,
-                stats: {
+                stats: result.stats ? {
                     fromCache: false,
                     type: 'fileSearchProvider',
                     resultCount,
                     detailStats: result.stats
-                }
+                } : undefined,
+                messages: []
             };
         });
     }