@codingame/monaco-vscode-view-common-service-override 5.3.0 → 6.0.0

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/scrollSynchronizer.js

@@ -4,6 +4,7 @@ import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import { autorunWithStore } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
+import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
 import { DocumentLineRangeMap } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/mapping';
 import { ReentrancyBarrier } from 'vscode/vscode/vs/base/common/controlFlow';
 
@@ -24,9 +25,9 @@ class ScrollSynchronizer extends Disposable {
             if (!this.model) {
                 return;
             }
-            this.input2View.editor.setScrollTop(this.input1View.editor.getScrollTop(), 1 );
+            this.input2View.editor.setScrollTop(this.input1View.editor.getScrollTop(), ScrollType.Immediate);
             if (this.shouldAlignResult) {
-                this.inputResultView.editor.setScrollTop(this.input1View.editor.getScrollTop(), 1 );
+                this.inputResultView.editor.setScrollTop(this.input1View.editor.getScrollTop(), ScrollType.Immediate);
             }
             else {
                 const mappingInput1Result = this.model.input1ResultMapping.get();
@@ -35,7 +36,7 @@ class ScrollSynchronizer extends Disposable {
             const baseView = this.baseView.get();
             if (baseView) {
                 if (this.shouldAlignBase) {
-                    this.baseView.get()?.editor.setScrollTop(this.input1View.editor.getScrollTop(), 1 );
+                    this.baseView.get()?.editor.setScrollTop(this.input1View.editor.getScrollTop(), ScrollType.Immediate);
                 }
                 else {
                     const mapping = ( new DocumentLineRangeMap(this.model.baseInput1Diffs.get(), -1)).reverse();
@@ -48,9 +49,9 @@ class ScrollSynchronizer extends Disposable {
                 handleInput1OnScroll();
             }
             if (c.scrollLeftChanged) {
-                this.baseView.get()?.editor.setScrollLeft(c.scrollLeft, 1 );
-                this.input2View.editor.setScrollLeft(c.scrollLeft, 1 );
-                this.inputResultView.editor.setScrollLeft(c.scrollLeft, 1 );
+                this.baseView.get()?.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
+                this.input2View.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
+                this.inputResultView.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
             }
         })));
         this._store.add(this.input2View.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusiveOrSkip((c) => {
@@ -58,9 +59,9 @@ class ScrollSynchronizer extends Disposable {
                 return;
             }
             if (c.scrollTopChanged) {
-                this.input1View.editor.setScrollTop(c.scrollTop, 1 );
+                this.input1View.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
                 if (this.shouldAlignResult) {
-                    this.inputResultView.editor.setScrollTop(this.input2View.editor.getScrollTop(), 1 );
+                    this.inputResultView.editor.setScrollTop(this.input2View.editor.getScrollTop(), ScrollType.Immediate);
                 }
                 else {
                     const mappingInput2Result = this.model.input2ResultMapping.get();
@@ -69,7 +70,7 @@ class ScrollSynchronizer extends Disposable {
                 const baseView = this.baseView.get();
                 if (baseView && this.model) {
                     if (this.shouldAlignBase) {
-                        this.baseView.get()?.editor.setScrollTop(c.scrollTop, 1 );
+                        this.baseView.get()?.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
                     }
                     else {
                         const mapping = ( new DocumentLineRangeMap(this.model.baseInput2Diffs.get(), -1)).reverse();
@@ -78,16 +79,16 @@ class ScrollSynchronizer extends Disposable {
                 }
             }
             if (c.scrollLeftChanged) {
-                this.baseView.get()?.editor.setScrollLeft(c.scrollLeft, 1 );
-                this.input1View.editor.setScrollLeft(c.scrollLeft, 1 );
-                this.inputResultView.editor.setScrollLeft(c.scrollLeft, 1 );
+                this.baseView.get()?.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
+                this.input1View.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
+                this.inputResultView.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
             }
         })));
         this._store.add(this.inputResultView.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusiveOrSkip((c) => {
             if (c.scrollTopChanged) {
                 if (this.shouldAlignResult) {
-                    this.input1View.editor.setScrollTop(c.scrollTop, 1 );
-                    this.input2View.editor.setScrollTop(c.scrollTop, 1 );
+                    this.input1View.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
+                    this.input2View.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
                 }
                 else {
                     const mapping1 = this.model?.resultInput1Mapping.get();
@@ -102,9 +103,9 @@ class ScrollSynchronizer extends Disposable {
                 }
             }
             if (c.scrollLeftChanged) {
-                this.baseView.get()?.editor?.setScrollLeft(c.scrollLeft, 1 );
-                this.input1View.editor.setScrollLeft(c.scrollLeft, 1 );
-                this.input2View.editor.setScrollLeft(c.scrollLeft, 1 );
+                this.baseView.get()?.editor?.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
+                this.input1View.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
+                this.input2View.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
             }
         })));
         this._store.add(autorunWithStore((reader, store) => {
@@ -116,8 +117,8 @@ class ScrollSynchronizer extends Disposable {
                             return;
                         }
                         if (this.shouldAlignBase) {
-                            this.input1View.editor.setScrollTop(c.scrollTop, 1 );
-                            this.input2View.editor.setScrollTop(c.scrollTop, 1 );
+                            this.input1View.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
+                            this.input2View.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
                         }
                         else {
                             const baseInput1Mapping = ( new DocumentLineRangeMap(this.model.baseInput1Diffs.get(), -1));
@@ -129,9 +130,9 @@ class ScrollSynchronizer extends Disposable {
                         this.synchronizeScrolling(baseView.editor, this.inputResultView.editor, baseMapping);
                     }
                     if (c.scrollLeftChanged) {
-                        this.inputResultView.editor.setScrollLeft(c.scrollLeft, 1 );
-                        this.input1View.editor.setScrollLeft(c.scrollLeft, 1 );
-                        this.input2View.editor.setScrollLeft(c.scrollLeft, 1 );
+                        this.inputResultView.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
+                        this.input1View.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
+                        this.input2View.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
                     }
                 })));
             }
@@ -155,7 +156,7 @@ class ScrollSynchronizer extends Disposable {
         const sourceEndPx = scrollingEditor.getTopForLineNumber(sourceRange.endLineNumberExclusive);
         const factor = Math.min((scrollingEditor.getScrollTop() - sourceStartTopPx) / (sourceEndPx - sourceStartTopPx), 1);
         const resultScrollPosition = resultStartTopPx + (resultEndPx - resultStartTopPx) * factor;
-        targetEditor.setScrollTop(resultScrollPosition, 1 );
+        targetEditor.setScrollTop(resultScrollPosition, ScrollType.Immediate);
     }
 }
 

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js

@@ -8,11 +8,12 @@ import { derivedObservableWithWritableCache } from 'vscode/vscode/vs/base/common
 import 'vscode/vscode/vs/base/common/cancellation';
 import 'vscode/vscode/vs/base/common/arrays';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { LineRange } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
-import { observableConfigValue } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
+import { observableConfigValue } from 'vscode/vscode/vs/platform/observable/common/platformObservableUtils';
 
 const _moduleId = "vs/workbench/contrib/mergeEditor/browser/view/viewModel";
 let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
@@ -185,7 +186,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
                 lineNumber: startLineNumber,
                 column: editor.editor.getModel().getLineFirstNonWhitespaceColumn(startLineNumber),
             });
-            editor.editor.revealLinesNearTop(startLineNumber, endLineNumberExclusive, 0 );
+            editor.editor.revealLinesNearTop(startLineNumber, endLineNumberExclusive, ScrollType.Smooth);
         }
     }
     goToNextModifiedBaseRange(predicate) {

package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js

@@ -1,10 +1,11 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { parseKeyboardLayoutDescription, areKeyboardLayoutsEqual, getKeyboardLayoutId } from 'vscode/vscode/vs/platform/keyboardLayout/common/keyboardLayout';
 import { IKeyboardLayoutService } from 'vscode/vscode/vs/platform/keyboardLayout/common/keyboardLayout.service';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { KEYBOARD_LAYOUT_OPEN_PICKER } from 'vscode/vscode/vs/workbench/contrib/preferences/common/preferences';
 import { isMacintosh, isWindows } from 'vscode/vscode/vs/base/common/platform';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
@@ -33,7 +34,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                 text,
                 ariaLabel: text,
                 command: KEYBOARD_LAYOUT_OPEN_PICKER
-            }, 'status.workbench.keyboardLayout', 1 );
+            }, 'status.workbench.keyboardLayout', StatusbarAlignment.RIGHT);
         }
         this._register(this.keyboardLayoutService.onDidChangeKeyboardLayout(() => {
             const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
@@ -54,7 +55,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                     text,
                     ariaLabel: text,
                     command: KEYBOARD_LAYOUT_OPEN_PICKER
-                }, 'status.workbench.keyboardLayout', 1 );
+                }, 'status.workbench.keyboardLayout', StatusbarAlignment.RIGHT);
             }
         }));
     }
@@ -63,7 +64,7 @@ KeyboardLayoutPickerContribution = ( (__decorate([
     ( (__param(0, IKeyboardLayoutService))),
     ( (__param(1, IStatusbarService)))
 ], KeyboardLayoutPickerContribution)));
-registerWorkbenchContribution2(KeyboardLayoutPickerContribution.ID, KeyboardLayoutPickerContribution, 1 );
+registerWorkbenchContribution2(KeyboardLayoutPickerContribution.ID, KeyboardLayoutPickerContribution, WorkbenchPhase.BlockStartup);
 const DEFAULT_CONTENT = [
     `// ${( localizeWithPath(
         _moduleId,

package/vscode/src/vs/workbench/contrib/sash/browser/sash.contribution.js

@@ -1,5 +1,6 @@
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { workbenchConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
@@ -8,7 +9,7 @@ import { isIOS } from 'vscode/vscode/vs/base/common/platform';
 
 const _moduleId = "vs/workbench/contrib/sash/browser/sash.contribution";
 ( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(SashSettingsController, 3 );
+    .registerWorkbenchContribution(SashSettingsController, LifecyclePhase.Restored);
 ( (Registry.as(Extensions$1.Configuration)))
     .registerConfiguration({
     ...workbenchConfigurationNodeBase,

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.js

@@ -3,8 +3,9 @@ import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellati
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { Event } from 'vscode/vscode/vs/base/common/event';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { registerEditorContribution, EditorAction2 } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { registerEditorContribution, EditorContributionInstantiation, EditorAction2 } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { PeekContext } from 'vscode/vscode/vs/editor/contrib/peekView/browser/peekView';
@@ -13,9 +14,11 @@ import { registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/commo
 import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
-import { TypeHierarchyProviderRegistry, TypeHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
+import { TypeHierarchyDirection, TypeHierarchyProviderRegistry, TypeHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 
 var TypeHierarchyController_1;
 const _moduleId = "vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution";
@@ -27,9 +30,9 @@ const _ctxTypeHierarchyDirection = ( (new RawContextKey(
     { type: 'string', description: ( localizeWithPath(_moduleId, 2, 'whether type hierarchy shows super types or subtypes')) }
 )));
 function sanitizedDirection(candidate) {
-    return candidate === "subtypes"  || candidate === "supertypes"
+    return candidate === TypeHierarchyDirection.Subtypes || candidate === TypeHierarchyDirection.Supertypes
         ? candidate
-        : "subtypes" ;
+        : TypeHierarchyDirection.Subtypes;
 }
 let TypeHierarchyController = class TypeHierarchyController {
     static { TypeHierarchyController_1 = this; }
@@ -69,7 +72,7 @@ let TypeHierarchyController = class TypeHierarchyController {
         }
         const cts = ( (new CancellationTokenSource()));
         const model = TypeHierarchyModel.create(document, position, cts.token);
-        const direction = sanitizedDirection(this._storageService.get(TypeHierarchyController_1._storageDirectionKey, 0 , "subtypes" ));
+        const direction = sanitizedDirection(this._storageService.get(TypeHierarchyController_1._storageDirectionKey, StorageScope.PROFILE, TypeHierarchyDirection.Subtypes));
         this._showTypeHierarchyWidget(position, direction, model, cts);
     }
     _showTypeHierarchyWidget(position, direction, model, cts) {
@@ -80,7 +83,7 @@ let TypeHierarchyController = class TypeHierarchyController {
         this._widget.showLoading();
         this._sessionDisposables.add(this._widget.onDidClose(() => {
             this.endTypeHierarchy();
-            this._storageService.store(TypeHierarchyController_1._storageDirectionKey, this._widget.direction, 0 , 0 );
+            this._storageService.store(TypeHierarchyController_1._storageDirectionKey, this._widget.direction, StorageScope.PROFILE, StorageTarget.USER);
         }));
         this._sessionDisposables.add({ dispose() { cts.dispose(true); } });
         this._sessionDisposables.add(this._widget);
@@ -121,12 +124,12 @@ let TypeHierarchyController = class TypeHierarchyController {
         TypeHierarchyController_1.get(newEditor)?._showTypeHierarchyWidget(Range.lift(newModel.root.selectionRange).getStartPosition(), this._widget.direction, Promise.resolve(newModel), ( (new CancellationTokenSource())));
     }
     showSupertypes() {
-        this._widget?.updateDirection("supertypes" );
-        this._ctxDirection.set("supertypes" );
+        this._widget?.updateDirection(TypeHierarchyDirection.Supertypes);
+        this._ctxDirection.set(TypeHierarchyDirection.Supertypes);
     }
     showSubtypes() {
-        this._widget?.updateDirection("subtypes" );
-        this._ctxDirection.set("subtypes" );
+        this._widget?.updateDirection(TypeHierarchyDirection.Subtypes);
+        this._ctxDirection.set(TypeHierarchyDirection.Subtypes);
     }
     endTypeHierarchy() {
         this._sessionDisposables.clear();
@@ -140,7 +143,7 @@ TypeHierarchyController = TypeHierarchyController_1 = ( (__decorate([
     ( (__param(3, ICodeEditorService))),
     ( (__param(4, IInstantiationService)))
 ], TypeHierarchyController)));
-registerEditorContribution(TypeHierarchyController.Id, TypeHierarchyController, 0 );
+registerEditorContribution(TypeHierarchyController.Id, TypeHierarchyController, EditorContributionInstantiation.Eager);
 registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
@@ -168,15 +171,15 @@ registerAction2(class extends EditorAction2 {
             icon: Codicon.typeHierarchySuper,
             precondition: ( (ContextKeyExpr.and(
                 _ctxTypeHierarchyVisible,
-                 (_ctxTypeHierarchyDirection.isEqualTo("subtypes" ))
+                 (_ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Subtypes))
             ))),
             keybinding: {
-                weight: 200 ,
-                primary: 1024  + 512  + 38 ,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.Shift + KeyMod.Alt + KeyCode.KeyH,
             },
             menu: {
                 id: TypeHierarchyTreePeekWidget.TitleMenu,
-                when: ( (_ctxTypeHierarchyDirection.isEqualTo("subtypes" ))),
+                when: ( (_ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Subtypes))),
                 order: 1,
             }
         });
@@ -193,15 +196,15 @@ registerAction2(class extends EditorAction2 {
             icon: Codicon.typeHierarchySub,
             precondition: ( (ContextKeyExpr.and(
                 _ctxTypeHierarchyVisible,
-                 (_ctxTypeHierarchyDirection.isEqualTo("supertypes" ))
+                 (_ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Supertypes))
             ))),
             keybinding: {
-                weight: 200 ,
-                primary: 1024  + 512  + 38 ,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.Shift + KeyMod.Alt + KeyCode.KeyH,
             },
             menu: {
                 id: TypeHierarchyTreePeekWidget.TitleMenu,
-                when: ( (_ctxTypeHierarchyDirection.isEqualTo("supertypes" ))),
+                when: ( (_ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Supertypes))),
                 order: 1,
             }
         });
@@ -217,8 +220,8 @@ registerAction2(class extends EditorAction2 {
             title: ( localize2WithPath(_moduleId, 8, 'Refocus Type Hierarchy')),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
-                weight: 200 ,
-                primary: 1024  + 3
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.Shift + KeyCode.Enter
             }
         });
     }
@@ -234,8 +237,8 @@ registerAction2(class extends EditorAction2 {
             icon: Codicon.close,
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
-                weight: 200  + 10,
-                primary: 9 ,
+                weight: KeybindingWeight.WorkbenchContrib + 10,
+                primary: KeyCode.Escape,
                 when: ContextKeyExpr.not('config.editor.stablePeek')
             },
             menu: {

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js

@@ -8,7 +8,8 @@ import { Event } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { EmbeddedCodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
-import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
+import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
+import { TrackedRangeStickiness, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { PeekViewWidget, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground, peekViewResultsBackground, peekViewEditorMatchHighlight, IPeekViewService } from 'vscode/vscode/vs/editor/contrib/peekView/browser/peekView';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
@@ -18,20 +19,29 @@ import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.s
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { themeColorFromId } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { Sorter, AccessibilityProvider, IdentityProvider, VirtualDelegate, TypeRenderer, DataSource } from './typeHierarchyTree.js';
+import { TypeHierarchyDirection } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
 
 var TypeHierarchyTreePeekWidget_1;
 const _moduleId = "vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek";
+var State;
+( ((function(State) {
+    State["Loading"] = "loading";
+    State["Message"] = "message";
+    State["Data"] = "data";
+})(State || (State = {}))));
 class LayoutInfo {
     static store(info, storageService) {
-        storageService.store('typeHierarchyPeekLayout', JSON.stringify(info), 0 , 1 );
+        storageService.store('typeHierarchyPeekLayout', JSON.stringify(info), StorageScope.PROFILE, StorageTarget.MACHINE);
     }
     static retrieve(storageService) {
-        const value = storageService.get('typeHierarchyPeekLayout', 0 , '{}');
+        const value = storageService.get('typeHierarchyPeekLayout', StorageScope.PROFILE, '{}');
         const defaultInfo = { ratio: 0.7, height: 17 };
         try {
             return { ...defaultInfo, ...JSON.parse(value) };
@@ -115,7 +125,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         const container = document.createElement('div');
         container.classList.add('results');
         parent.appendChild(container);
-        this._splitView = ( (new SplitView(container, { orientation: 1  })));
+        this._splitView = ( (new SplitView(container, { orientation: Orientation.HORIZONTAL })));
         const editorContainer = document.createElement('div');
         editorContainer.classList.add('editor');
         container.appendChild(editorContainer);
@@ -223,7 +233,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         this._previewDisposable.clear();
         const options = {
             description: 'type-hierarchy-decoration',
-            stickiness: 1 ,
+            stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
             className: 'type-decoration',
             overviewRuler: {
                 color: themeColorFromId(peekViewEditorMatchHighlight),
@@ -231,7 +241,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
             },
         };
         let previewUri;
-        if (this._direction === "supertypes" ) {
+        if (this._direction === TypeHierarchyDirection.Supertypes) {
             previewUri = element.parent ? element.parent.item.uri : element.model.root.uri;
         }
         else {
@@ -247,23 +257,23 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
             fullRange = !fullRange ? loc.range : Range.plusRange(loc.range, fullRange);
         }
         if (fullRange) {
-            this._editor.revealRangeInCenter(fullRange, 1 );
+            this._editor.revealRangeInCenter(fullRange, ScrollType.Immediate);
             const decorationsCollection = this._editor.createDecorationsCollection(decorations);
             this._previewDisposable.add(toDisposable(() => decorationsCollection.clear()));
         }
         this._previewDisposable.add(value);
-        const title = this._direction === "supertypes"
+        const title = this._direction === TypeHierarchyDirection.Supertypes
             ? ( localizeWithPath(_moduleId, 0, "Supertypes of '{0}'", element.model.root.name))
             : ( localizeWithPath(_moduleId, 1, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
-        this._parent.dataset['state'] = "loading" ;
+        this._parent.dataset['state'] = State.Loading;
         this.setTitle(( localizeWithPath(_moduleId, 2, "Loading...")));
         this._show();
     }
     showMessage(message) {
-        this._parent.dataset['state'] = "message" ;
+        this._parent.dataset['state'] = State.Message;
         this.setTitle('');
         this.setMetaTitle('');
         this._message.innerText = message;
@@ -277,12 +287,12 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         const root = this._tree.getNode(model).children[0];
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
-            this.showMessage(this._direction === "supertypes"
+            this.showMessage(this._direction === TypeHierarchyDirection.Supertypes
                 ? ( localizeWithPath(_moduleId, 3, "No supertypes of '{0}'", model.root.name))
                 : ( localizeWithPath(_moduleId, 4, "No subtypes of '{0}'", model.root.name)));
         }
         else {
-            this._parent.dataset['state'] = "data" ;
+            this._parent.dataset['state'] = State.Data;
             if (!viewState || this._tree.getFocus().length === 0) {
                 this._tree.setFocus([root.children[0].element]);
             }
@@ -306,7 +316,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
     }
     _show() {
         if (!this._isShowing) {
-            this.editor.revealLineInCenterIfOutsideViewport(this._where.lineNumber, 0 );
+            this.editor.revealLineInCenterIfOutsideViewport(this._where.lineNumber, ScrollType.Smooth);
             super.show(Range.fromPositions(this._where), this._layoutInfo.height);
         }
     }

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js

@@ -1,8 +1,8 @@
-import { TypeHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
+import { TypeHierarchyModel, TypeHierarchyDirection } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { createMatches } from 'vscode/vscode/vs/base/common/filters';
 import { IconLabel } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabel';
-import { SymbolKinds } from 'vscode/vscode/vs/editor/common/languages';
+import { SymbolTag, SymbolKinds } from 'vscode/vscode/vs/editor/common/languages';
 import { compare } from 'vscode/vscode/vs/base/common/strings';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
@@ -37,7 +37,7 @@ class DataSource {
             );
         }
         const { model, item } = element;
-        if (this.getDirection() === "supertypes" ) {
+        if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
             return (
                  ((await model.provideSupertypes(item, CancellationToken.None)).map(item => {
                     return (
@@ -96,7 +96,7 @@ class TypeRenderer {
     }
     renderElement(node, _index, template) {
         const { element, filterData } = node;
-        const deprecated = element.item.tags?.includes(1 );
+        const deprecated = element.item.tags?.includes(SymbolTag.Deprecated);
         template.icon.classList.add('inline', ...ThemeIcon.asClassNameArray(SymbolKinds.toIcon(element.item.kind)));
         template.label.setLabel(element.item.name, element.item.detail, { labelEscapeNewLines: true, matches: createMatches(filterData), strikethrough: deprecated });
     }
@@ -120,7 +120,7 @@ class AccessibilityProvider {
         return ( localizeWithPath(_moduleId, 0, "Type Hierarchy"));
     }
     getAriaLabel(element) {
-        if (this.getDirection() === "supertypes" ) {
+        if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
             return ( localizeWithPath(_moduleId, 1, "supertypes of {0}", element.item.name));
         }
         else {

package/vscode/src/vs/workbench/contrib/webview/browser/resourceLoading.js

@@ -2,7 +2,7 @@ import { isUNC } from 'vscode/vscode/vs/base/common/extpath';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { normalize, sep } from 'vscode/vscode/vs/base/common/path';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { FileOperationError } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileOperationError, FileOperationResult } from 'vscode/vscode/vs/platform/files/common/files';
 import { getWebviewContentMimeType } from '../../../../platform/webview/common/mimeTypes.js';
 
 var WebviewResourceResponse;
@@ -50,7 +50,7 @@ async function loadLocalResource(requestUri, options, fileService, logService, t
     catch (err) {
         if (err instanceof FileOperationError) {
             const result = err.fileOperationResult;
-            if (result === 2 ) {
+            if (result === FileOperationResult.FILE_NOT_MODIFIED_SINCE) {
                 return new WebviewResourceResponse.NotModified(mime, err.options?.mtime);
             }
         }

package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js

@@ -32,18 +32,19 @@ import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/service
 const _moduleId = "vs/workbench/contrib/webview/browser/webviewElement";
 var WebviewState;
 ( ((function(WebviewState) {
+    let Type;
     ( ((function(Type) {
         Type[Type["Initializing"] = 0] = "Initializing";
         Type[Type["Ready"] = 1] = "Ready";
-    })(WebviewState.Type || (WebviewState.Type = {}))));
+    })(Type = WebviewState.Type || (WebviewState.Type = {}))));
     class Initializing {
         constructor(pendingMessages) {
             this.pendingMessages = pendingMessages;
-            this.type = 0 ;
+            this.type = Type.Initializing;
         }
     }
     WebviewState.Initializing = Initializing;
-    WebviewState.Ready = { type: 1  };
+    WebviewState.Ready = { type: Type.Ready };
 })(WebviewState || (WebviewState = {}))));
 const webviewIdContext = 'webviewId';
 let WebviewElement = class WebviewElement extends Disposable {
@@ -236,7 +237,7 @@ let WebviewElement = class WebviewElement extends Disposable {
         this.element?.remove();
         this._element = undefined;
         this._messagePort = undefined;
-        if (this._state.type === 0 ) {
+        if (this._state.type === WebviewState.Type.Initializing) {
             for (const message of this._state.pendingMessages) {
                 message.resolve(false);
             }
@@ -253,7 +254,7 @@ let WebviewElement = class WebviewElement extends Disposable {
         return this._send('message', { message, transfer });
     }
     async _send(channel, data, _createElement = []) {
-        if (this._state.type === 0 ) {
+        if (this._state.type === WebviewState.Type.Initializing) {
             const { promise, resolve } = promiseWithResolvers();
             this._state.pendingMessages.push({ channel, data, transferable: _createElement, resolve });
             return promise;
@@ -355,7 +356,7 @@ let WebviewElement = class WebviewElement extends Disposable {
                     handlers?.forEach(handler => handler(e.data.data, e));
                 };
                 this.element?.classList.add('ready');
-                if (this._state.type === 0 ) {
+                if (this._state.type === WebviewState.Type.Initializing) {
                     this._state.pendingMessages.forEach(({ channel, data, resolve }) => resolve(this.doPostMessage(channel, data)));
                 }
                 this._state = WebviewState.Ready;

package/vscode/src/vs/workbench/contrib/webview/browser/webviewService.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { WebviewThemeDataProvider } from './themeing.js';
 import { WebviewElement } from './webviewElement.js';
@@ -37,19 +37,21 @@ let WebviewService = class WebviewService extends Disposable {
     }
     registerNewWebview(webview) {
         this._webviews.add(webview);
-        webview.onDidFocus(() => {
+        const store = ( new DisposableStore());
+        store.add(webview.onDidFocus(() => {
             this._updateActiveWebview(webview);
-        });
+        }));
         const onBlur = () => {
             if (this._activeWebview === webview) {
                 this._updateActiveWebview(undefined);
             }
         };
-        webview.onDidBlur(onBlur);
-        webview.onDidDispose(() => {
+        store.add(webview.onDidBlur(onBlur));
+        store.add(webview.onDidDispose(() => {
             onBlur();
+            store.dispose();
             this._webviews.delete(webview);
-        });
+        }));
     }
 };
 WebviewService = ( __decorate([