@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.js

@@ -1,15 +1,17 @@
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
 import { raceCancellation, createCancelablePromise } from '../../../../base/common/async.js';
-import { KeyChord } from '../../../../base/common/keyCodes.js';
+import { KeyCode, KeyMod as KeyMod$1, KeyChord } from '../../../../base/common/keyCodes.js';
 import { assertType } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
-import { EditorStateCancellationTokenSource } from '../../editorState/browser/editorState.js';
+import { EditorStateCancellationTokenSource, CodeEditorStateFlag } from '../../editorState/browser/editorState.js';
 import { isCodeEditor } from '../../../browser/editorBrowser.js';
 import { EditorAction2 } from '../../../browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
 import { EmbeddedCodeEditorWidget } from '../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
+import { ScrollType } from '../../../common/editorCommon.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { isLocationLink } from '../../../common/languages.js';
 import { ReferencesController } from './peek/referencesController.js';
@@ -22,7 +24,9 @@ import { MenuRegistry, MenuId, registerAction2 } from '../../../../platform/acti
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { TextEditorSelectionRevealType, TextEditorSelectionSource } from '../../../../platform/editor/common/editor.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import { IEditorProgressService } from '../../../../platform/progress/common/progress.service.js';
 import { getDefinitionsAtPosition, getDeclarationsAtPosition, getTypeDefinitionsAtPosition, getImplementationsAtPosition, getReferencesAtPosition } from './goToSymbol.js';
@@ -91,10 +95,7 @@ class SymbolNavigationAction extends EditorAction2 {
         const model = editor.getModel();
         const position = editor.getPosition();
         const anchor = SymbolNavigationAnchor.is(arg) ? arg : ( (new SymbolNavigationAnchor(model, position)));
-        const cts = ( (new EditorStateCancellationTokenSource(
-            editor,
-            1  | 4
-        )));
+        const cts = ( (new EditorStateCancellationTokenSource(editor, CodeEditorStateFlag.Value | CodeEditorStateFlag.Position)));
         const promise = raceCancellation(this._getLocationModel(languageFeaturesService, anchor.model, anchor.position, cts.token), cts.token).then(async (references) => {
             if (!references || cts.token.isCancellationRequested) {
                 return;
@@ -166,8 +167,8 @@ class SymbolNavigationAction extends EditorAction2 {
             resource: reference.uri,
             options: {
                 selection: Range.collapseToStart(range),
-                selectionRevealType: 3 ,
-                selectionSource: "code.jump"
+                selectionRevealType: TextEditorSelectionRevealType.NearTopIfOutsideViewport,
+                selectionSource: TextEditorSelectionSource.JUMP
             }
         }, editor, sideBySide);
         if (!targetEditor) {
@@ -209,10 +210,10 @@ class DefinitionAction extends SymbolNavigationAction {
             : ( localizeWithPath(_moduleId, 3, "No definition found"));
     }
     _getAlternativeCommand(editor) {
-        return editor.getOption(58 ).alternativeDefinitionCommand;
+        return editor.getOption(EditorOption.gotoLocation).alternativeDefinitionCommand;
     }
     _getGoToPreference(editor) {
-        return editor.getOption(58 ).multipleDefinitions;
+        return editor.getOption(EditorOption.gotoLocation).multipleDefinitions;
     }
 }
 registerAction2(class GoToDefinitionAction extends DefinitionAction {
@@ -231,12 +232,12 @@ registerAction2(class GoToDefinitionAction extends DefinitionAction {
             precondition: EditorContextKeys.hasDefinitionProvider,
             keybinding: [{
                     when: EditorContextKeys.editorTextFocus,
-                    primary: 70 ,
-                    weight: 100
+                    primary: KeyCode.F12,
+                    weight: KeybindingWeight.EditorContrib
                 }, {
                     when: ( (ContextKeyExpr.and(EditorContextKeys.editorTextFocus, IsWebContext))),
-                    primary: 2048  | 70 ,
-                    weight: 100
+                    primary: KeyMod$1.CtrlCmd | KeyCode.F12,
+                    weight: KeybindingWeight.EditorContrib
                 }],
             menu: [{
                     id: MenuId.EditorContext,
@@ -268,12 +269,12 @@ registerAction2(class OpenDefinitionToSideAction extends DefinitionAction {
             ))),
             keybinding: [{
                     when: EditorContextKeys.editorTextFocus,
-                    primary: KeyChord(2048  | 41 , 70 ),
-                    weight: 100
+                    primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyCode.F12),
+                    weight: KeybindingWeight.EditorContrib
                 }, {
                     when: ( (ContextKeyExpr.and(EditorContextKeys.editorTextFocus, IsWebContext))),
-                    primary: KeyChord(2048  | 41 , 2048  | 70 ),
-                    weight: 100
+                    primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.CtrlCmd | KeyCode.F12),
+                    weight: KeybindingWeight.EditorContrib
                 }]
         });
         CommandsRegistry.registerCommandAlias('editor.action.openDeclarationToTheSide', OpenDefinitionToSideAction.id);
@@ -296,9 +297,9 @@ registerAction2(class PeekDefinitionAction extends DefinitionAction {
             ))),
             keybinding: {
                 when: EditorContextKeys.editorTextFocus,
-                primary: 512  | 70 ,
-                linux: { primary: 2048  | 1024  | 68  },
-                weight: 100
+                primary: KeyMod$1.Alt | KeyCode.F12,
+                linux: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.F10 },
+                weight: KeybindingWeight.EditorContrib
             },
             menu: {
                 id: MenuId.EditorContextPeek,
@@ -324,10 +325,10 @@ class DeclarationAction extends SymbolNavigationAction {
             : ( localizeWithPath(_moduleId, 10, "No declaration found"));
     }
     _getAlternativeCommand(editor) {
-        return editor.getOption(58 ).alternativeDeclarationCommand;
+        return editor.getOption(EditorOption.gotoLocation).alternativeDeclarationCommand;
     }
     _getGoToPreference(editor) {
-        return editor.getOption(58 ).multipleDeclarations;
+        return editor.getOption(EditorOption.gotoLocation).multipleDeclarations;
     }
 }
 registerAction2(class GoToDeclarationAction extends DeclarationAction {
@@ -402,10 +403,10 @@ class TypeDefinitionAction extends SymbolNavigationAction {
             : ( localizeWithPath(_moduleId, 16, "No type definition found"));
     }
     _getAlternativeCommand(editor) {
-        return editor.getOption(58 ).alternativeTypeDefinitionCommand;
+        return editor.getOption(EditorOption.gotoLocation).alternativeTypeDefinitionCommand;
     }
     _getGoToPreference(editor) {
-        return editor.getOption(58 ).multipleTypeDefinitions;
+        return editor.getOption(EditorOption.gotoLocation).multipleTypeDefinitions;
     }
 }
 registerAction2(class GoToTypeDefinitionAction extends TypeDefinitionAction {
@@ -425,7 +426,7 @@ registerAction2(class GoToTypeDefinitionAction extends TypeDefinitionAction {
             keybinding: {
                 when: EditorContextKeys.editorTextFocus,
                 primary: 0,
-                weight: 100
+                weight: KeybindingWeight.EditorContrib
             },
             menu: [{
                     id: MenuId.EditorContext,
@@ -478,10 +479,10 @@ class ImplementationAction extends SymbolNavigationAction {
             : ( localizeWithPath(_moduleId, 22, "No implementation found"));
     }
     _getAlternativeCommand(editor) {
-        return editor.getOption(58 ).alternativeImplementationCommand;
+        return editor.getOption(EditorOption.gotoLocation).alternativeImplementationCommand;
     }
     _getGoToPreference(editor) {
-        return editor.getOption(58 ).multipleImplementations;
+        return editor.getOption(EditorOption.gotoLocation).multipleImplementations;
     }
 }
 registerAction2(class GoToImplementationAction extends ImplementationAction {
@@ -500,8 +501,8 @@ registerAction2(class GoToImplementationAction extends ImplementationAction {
             precondition: EditorContextKeys.hasImplementationProvider,
             keybinding: {
                 when: EditorContextKeys.editorTextFocus,
-                primary: 2048  | 70 ,
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyCode.F12,
+                weight: KeybindingWeight.EditorContrib
             },
             menu: [{
                     id: MenuId.EditorContext,
@@ -533,8 +534,8 @@ registerAction2(class PeekImplementationAction extends ImplementationAction {
             ))),
             keybinding: {
                 when: EditorContextKeys.editorTextFocus,
-                primary: 2048  | 1024  | 70 ,
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.F12,
+                weight: KeybindingWeight.EditorContrib
             },
             menu: {
                 id: MenuId.EditorContextPeek,
@@ -551,10 +552,10 @@ class ReferencesAction extends SymbolNavigationAction {
             : ( localizeWithPath(_moduleId, 27, "No references found"));
     }
     _getAlternativeCommand(editor) {
-        return editor.getOption(58 ).alternativeReferenceCommand;
+        return editor.getOption(EditorOption.gotoLocation).alternativeReferenceCommand;
     }
     _getGoToPreference(editor) {
-        return editor.getOption(58 ).multipleReferences;
+        return editor.getOption(EditorOption.gotoLocation).multipleReferences;
     }
 }
 registerAction2(class GoToReferencesAction extends ReferencesAction {
@@ -576,8 +577,8 @@ registerAction2(class GoToReferencesAction extends ReferencesAction {
             ))),
             keybinding: {
                 when: EditorContextKeys.editorTextFocus,
-                primary: 1024  | 70 ,
-                weight: 100
+                primary: KeyMod$1.Shift | KeyCode.F12,
+                weight: KeybindingWeight.EditorContrib
             },
             menu: [{
                     id: MenuId.EditorContext,
@@ -652,7 +653,7 @@ class GenericGoToLocationAction extends SymbolNavigationAction {
         return info && ( localizeWithPath(_moduleId, 34, "No results for '{0}'", info.word)) || '';
     }
     _getGoToPreference(editor) {
-        return this._gotoMultipleBehaviour ?? editor.getOption(58 ).multipleReferences;
+        return this._gotoMultipleBehaviour ?? editor.getOption(EditorOption.gotoLocation).multipleReferences;
     }
     _getAlternativeCommand() { return ''; }
 }
@@ -678,7 +679,7 @@ CommandsRegistry.registerCommand({
         const editor = await editorService.openCodeEditor({ resource }, editorService.getFocusedCodeEditor());
         if (isCodeEditor(editor)) {
             editor.setPosition(position);
-            editor.revealPositionInCenterIfOutsideViewport(position, 0 );
+            editor.revealPositionInCenterIfOutsideViewport(position, ScrollType.Smooth);
             return editor.invokeWithinContext(accessor => {
                 const command = new (class extends GenericGoToLocationAction {
                     _getNoResultFoundMessage(info) {

package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.js

@@ -1,9 +1,19 @@
 import { coalesce } from '../../../../base/common/arrays.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { matchesSomeScheme, Schemas } from '../../../../base/common/network.js';
 import { registerModelAndPositionCommand } from '../../../browser/editorExtensions.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { ReferencesModel } from './referencesModel.js';
+function shouldIncludeLocationLink(sourceModel, loc) {
+    if (loc.uri.scheme === sourceModel.uri.scheme) {
+        return true;
+    }
+    if (matchesSomeScheme(loc.uri, Schemas.walkThroughSnippet, Schemas.vscodeChatCodeBlock, Schemas.vscodeChatCodeCompareBlock, Schemas.vscodeCopilotBackingChatCodeBlock)) {
+        return false;
+    }
+    return true;
+}
 async function getLocationLinks(model, position, registry, provide) {
     const provider = registry.ordered(model);
     const promises = ( provider.map((provider) => {
@@ -13,7 +23,7 @@ async function getLocationLinks(model, position, registry, provide) {
         });
     }));
     const values = await Promise.all(promises);
-    return coalesce(values.flat());
+    return coalesce(values.flat()).filter(loc => shouldIncludeLocationLink(model, loc));
 }
 function getDefinitionsAtPosition(registry, model, position, token) {
     return getLocationLinks(model, position, registry, (provider, model, position) => {
@@ -37,11 +47,11 @@ function getTypeDefinitionsAtPosition(registry, model, position, token) {
 }
 function getReferencesAtPosition(registry, model, position, compact, token) {
     return getLocationLinks(model, position, registry, async (provider, model, position) => {
-        const result = await provider.provideReferences(model, position, { includeDeclaration: true }, token);
+        const result = (await provider.provideReferences(model, position, { includeDeclaration: true }, token))?.filter(ref => shouldIncludeLocationLink(model, ref));
         if (!compact || !result || result.length !== 2) {
             return result;
         }
-        const resultWithoutDeclaration = await provider.provideReferences(model, position, { includeDeclaration: false }, token);
+        const resultWithoutDeclaration = (await provider.provideReferences(model, position, { includeDeclaration: false }, token))?.filter(ref => shouldIncludeLocationLink(model, ref));
         if (resultWithoutDeclaration && resultWithoutDeclaration.length === 1) {
             return resultWithoutDeclaration;
         }

package/vscode/src/vs/editor/contrib/gotoSymbol/browser/link/clickLinkGesture.js

@@ -1,6 +1,8 @@
 import { Emitter } from '../../../../../base/common/event.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { isMacintosh } from '../../../../../base/common/platform.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
 function hasModifier(e, modifier) {
     return !!e[modifier];
 }
@@ -39,14 +41,14 @@ class ClickLinkOptions {
 function createOptions(multiCursorModifier) {
     if (multiCursorModifier === 'altKey') {
         if (isMacintosh) {
-            return ( new ClickLinkOptions(57 , 'metaKey', 6 , 'altKey'));
+            return ( new ClickLinkOptions(KeyCode.Meta, 'metaKey', KeyCode.Alt, 'altKey'));
         }
-        return ( new ClickLinkOptions(5 , 'ctrlKey', 6 , 'altKey'));
+        return ( new ClickLinkOptions(KeyCode.Ctrl, 'ctrlKey', KeyCode.Alt, 'altKey'));
     }
     if (isMacintosh) {
-        return ( new ClickLinkOptions(6 , 'altKey', 57 , 'metaKey'));
+        return ( new ClickLinkOptions(KeyCode.Alt, 'altKey', KeyCode.Meta, 'metaKey'));
     }
-    return ( new ClickLinkOptions(6 , 'altKey', 5 , 'ctrlKey'));
+    return ( new ClickLinkOptions(KeyCode.Alt, 'altKey', KeyCode.Ctrl, 'ctrlKey'));
 }
 class ClickLinkGesture extends Disposable {
     constructor(editor, opts) {
@@ -59,13 +61,13 @@ class ClickLinkGesture extends Disposable {
         this.onCancel = this._onCancel.event;
         this._editor = editor;
         this._extractLineNumberFromMouseEvent = opts?.extractLineNumberFromMouseEvent ?? ((e) => e.target.position ? e.target.position.lineNumber : 0);
-        this._opts = createOptions(this._editor.getOption(78 ));
+        this._opts = createOptions(this._editor.getOption(EditorOption.multiCursorModifier));
         this._lastMouseMoveEvent = null;
         this._hasTriggerKeyOnMouseDown = false;
         this._lineNumberOnMouseDown = 0;
         this._register(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(78 )) {
-                const newOpts = createOptions(this._editor.getOption(78 ));
+            if (e.hasChanged(EditorOption.multiCursorModifier)) {
+                const newOpts = createOptions(this._editor.getOption(EditorOption.multiCursorModifier));
                 if (this._opts.equals(newOpts)) {
                     return;
                 }

package/vscode/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.js

@@ -4,8 +4,10 @@ import { onUnexpectedError } from '../../../../../base/common/errors.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import './goToDefinitionAtPosition.css.js';
-import { EditorState } from '../../../editorState/browser/editorState.js';
-import { registerEditorContribution } from '../../../../browser/editorExtensions.js';
+import { EditorState, CodeEditorStateFlag } from '../../../editorState/browser/editorState.js';
+import { MouseTargetType } from '../../../../browser/editorBrowser.js';
+import { registerEditorContribution, EditorContributionInstantiation } from '../../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { Range } from '../../../../common/core/range.js';
 import { ILanguageService } from '../../../../common/languages/language.js';
 import { ITextModelService } from '../../../../common/services/resolverService.js';
@@ -73,7 +75,7 @@ let GotoDefinitionAtPositionEditorContribution = class GotoDefinitionAtPositionE
         }));
     }
     startFindDefinitionFromMouse(mouseEvent, withKey) {
-        if (mouseEvent.target.type === 9  && this.linkDecorations.length > 0) {
+        if (mouseEvent.target.type === MouseTargetType.CONTENT_WIDGET && this.linkDecorations.length > 0) {
             return;
         }
         if (!this.editor.hasModel() || !this.isEnabled(mouseEvent, withKey)) {
@@ -98,7 +100,7 @@ let GotoDefinitionAtPositionEditorContribution = class GotoDefinitionAtPositionE
         this.currentWordAtPosition = word;
         const state = ( (new EditorState(
             this.editor,
-            4  | 1  | 2  | 8
+            CodeEditorStateFlag.Position | CodeEditorStateFlag.Value | CodeEditorStateFlag.Selection | CodeEditorStateFlag.Scroll
         )));
         if (this.previousPromise) {
             this.previousPromise.cancel();
@@ -203,7 +205,7 @@ let GotoDefinitionAtPositionEditorContribution = class GotoDefinitionAtPositionE
         return this.editor.hasModel()
             && mouseEvent.isLeftClick
             && mouseEvent.isNoneOrSingleMouseDown
-            && mouseEvent.target.type === 6
+            && mouseEvent.target.type === MouseTargetType.CONTENT_TEXT
             && !(mouseEvent.target.detail.injectedText?.options instanceof ModelDecorationInjectedTextOptions)
             && (mouseEvent.hasTriggerModifier || (withKey ? withKey.keyCodeIsTriggerKey : false))
             && ( (this.languageFeaturesService.definitionProvider.has(this.editor.getModel())));
@@ -218,7 +220,7 @@ let GotoDefinitionAtPositionEditorContribution = class GotoDefinitionAtPositionE
     gotoDefinition(position, openToSide) {
         this.editor.setPosition(position);
         return this.editor.invokeWithinContext((accessor) => {
-            const canPeek = !openToSide && this.editor.getOption(88 ) && !this.isInPeekEditor(accessor);
+            const canPeek = !openToSide && this.editor.getOption(EditorOption.definitionLinkOpensInPeek) && !this.isInPeekEditor(accessor);
             const action = ( (new DefinitionAction(
                 { openToSide, openInPeek: canPeek, muteMessage: true },
                 { title: { value: '', original: '' }, id: '', precondition: undefined }
@@ -240,5 +242,5 @@ GotoDefinitionAtPositionEditorContribution = GotoDefinitionAtPositionEditorContr
     ( (__param(2, ILanguageService))),
     ( (__param(3, ILanguageFeaturesService)))
 ], GotoDefinitionAtPositionEditorContribution)));
-registerEditorContribution(GotoDefinitionAtPositionEditorContribution.ID, GotoDefinitionAtPositionEditorContribution, 2 );
+registerEditorContribution(GotoDefinitionAtPositionEditorContribution.ID, GotoDefinitionAtPositionEditorContribution, EditorContributionInstantiation.BeforeFirstInteraction);
 export { GotoDefinitionAtPositionEditorContribution };

package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.js

@@ -1,9 +1,10 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { createCancelablePromise } from '../../../../../base/common/async.js';
 import { onUnexpectedError } from '../../../../../base/common/errors.js';
-import { KeyChord } from '../../../../../base/common/keyCodes.js';
+import { KeyChord, KeyCode, KeyMod as KeyMod$1 } from '../../../../../base/common/keyCodes.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { ICodeEditorService } from '../../../../browser/services/codeEditorService.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
 import { PeekContext, getOuterEditor } from '../../../peekView/browser/peekView.js';
@@ -12,11 +13,13 @@ import { CommandsRegistry } from '../../../../../platform/commands/common/comman
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
 import { ContextKeyExpr, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.service.js';
+import { TextEditorSelectionSource } from '../../../../../platform/editor/common/editor.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { KeybindingsRegistry } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { WorkbenchListFocusContextKey, WorkbenchTreeElementCanCollapse, WorkbenchTreeElementCanExpand } from '../../../../../platform/list/browser/listService.js';
 import { IListService } from '../../../../../platform/list/browser/listService.service.js';
 import { INotificationService } from '../../../../../platform/notification/common/notification.service.js';
+import { StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../../platform/storage/common/storage.service.js';
 import { OneReference } from '../referencesModel.js';
 import { LayoutData, ReferenceWidget } from './referencesWidget.js';
@@ -74,14 +77,14 @@ let ReferencesController = class ReferencesController {
             }
         }));
         const storageKey = 'peekViewLayout';
-        const data = LayoutData.fromJSON(this._storageService.get(storageKey, 0 , '{}'));
+        const data = LayoutData.fromJSON(this._storageService.get(storageKey, StorageScope.PROFILE, '{}'));
         this._widget = this._instantiationService.createInstance(ReferenceWidget, this._editor, this._defaultTreeKeyboardSupport, data);
         this._widget.setTitle(( localizeWithPath(_moduleId, 1, "Loading...")));
         this._widget.show(range);
         this._disposables.add(this._widget.onDidClose(() => {
             modelPromise.cancel();
             if (this._widget) {
-                this._storageService.store(storageKey, JSON.stringify(this._widget.layoutData), 0 , 1 );
+                this._storageService.store(storageKey, JSON.stringify(this._widget.layoutData), StorageScope.PROFILE, StorageTarget.MACHINE);
                 this._widget = undefined;
             }
             this.closeWidget();
@@ -137,7 +140,7 @@ let ReferencesController = class ReferencesController {
                     const selection = this._model.nearestReference(uri, pos);
                     if (selection) {
                         return this._widget.setSelection(selection).then(() => {
-                            if (this._widget && this._editor.getOption(87 ) === 'editor') {
+                            if (this._widget && this._editor.getOption(EditorOption.peekWidgetDefaultFocus) === 'editor') {
                                 this._widget.focusOnPreviewEditor();
                             }
                         });
@@ -208,7 +211,7 @@ let ReferencesController = class ReferencesController {
         const range = Range.lift(ref.range).collapseToStart();
         return this._editorService.openCodeEditor({
             resource: ref.uri,
-            options: { selection: range, selectionSource: "code.jump" , pinned }
+            options: { selection: range, selectionSource: TextEditorSelectionSource.JUMP, pinned }
         }, this._editor).then(openedEditor => {
             this._ignoreModelChangeEvent = false;
             if (!openedEditor || !this._widget) {
@@ -238,7 +241,7 @@ let ReferencesController = class ReferencesController {
         const { uri, range } = ref;
         this._editorService.openCodeEditor({
             resource: uri,
-            options: { selection: range, selectionSource: "code.jump" , pinned }
+            options: { selection: range, selectionSource: TextEditorSelectionSource.JUMP, pinned }
         }, this._editor, sideBySide);
     }
 };
@@ -262,8 +265,8 @@ function withController(accessor, fn) {
 }
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'togglePeekWidgetFocus',
-    weight: 100 ,
-    primary: KeyChord(2048  | 41 , 60 ),
+    weight: KeybindingWeight.EditorContrib,
+    primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyCode.F2),
     when: ( (ContextKeyExpr.or(ctxReferenceSearchVisible, PeekContext.inPeekEditor))),
     handler(accessor) {
         withController(accessor, controller => {
@@ -273,9 +276,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'goToNextReference',
-    weight: 100  - 10,
-    primary: 62 ,
-    secondary: [70 ],
+    weight: KeybindingWeight.EditorContrib - 10,
+    primary: KeyCode.F4,
+    secondary: [KeyCode.F12],
     when: ( (ContextKeyExpr.or(ctxReferenceSearchVisible, PeekContext.inPeekEditor))),
     handler(accessor) {
         withController(accessor, controller => {
@@ -285,9 +288,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'goToPreviousReference',
-    weight: 100  - 10,
-    primary: 1024  | 62 ,
-    secondary: [1024  | 70 ],
+    weight: KeybindingWeight.EditorContrib - 10,
+    primary: KeyMod$1.Shift | KeyCode.F4,
+    secondary: [KeyMod$1.Shift | KeyCode.F12],
     when: ( (ContextKeyExpr.or(ctxReferenceSearchVisible, PeekContext.inPeekEditor))),
     handler(accessor) {
         withController(accessor, controller => {
@@ -301,16 +304,16 @@ CommandsRegistry.registerCommandAlias('closeReferenceSearchEditor', 'closeRefere
 CommandsRegistry.registerCommand('closeReferenceSearch', accessor => withController(accessor, controller => controller.closeWidget()));
 KeybindingsRegistry.registerKeybindingRule({
     id: 'closeReferenceSearch',
-    weight: 100  - 101,
-    primary: 9 ,
-    secondary: [1024  | 9 ],
+    weight: KeybindingWeight.EditorContrib - 101,
+    primary: KeyCode.Escape,
+    secondary: [KeyMod$1.Shift | KeyCode.Escape],
     when: ( (ContextKeyExpr.and(PeekContext.inPeekEditor, ContextKeyExpr.not('config.editor.stablePeek'))))
 });
 KeybindingsRegistry.registerKeybindingRule({
     id: 'closeReferenceSearch',
-    weight: 200  + 50,
-    primary: 9 ,
-    secondary: [1024  | 9 ],
+    weight: KeybindingWeight.WorkbenchContrib + 50,
+    primary: KeyCode.Escape,
+    secondary: [KeyMod$1.Shift | KeyCode.Escape],
     when: ( (ContextKeyExpr.and(
         ctxReferenceSearchVisible,
         ContextKeyExpr.not('config.editor.stablePeek'),
@@ -322,11 +325,11 @@ KeybindingsRegistry.registerKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'revealReference',
-    weight: 200 ,
-    primary: 3 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyCode.Enter,
     mac: {
-        primary: 3 ,
-        secondary: [2048  | 18 ]
+        primary: KeyCode.Enter,
+        secondary: [KeyMod$1.CtrlCmd | KeyCode.DownArrow]
     },
     when: ( (ContextKeyExpr.and(
         ctxReferenceSearchVisible,
@@ -344,10 +347,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'openReferenceToSide',
-    weight: 100 ,
-    primary: 2048  | 3 ,
+    weight: KeybindingWeight.EditorContrib,
+    primary: KeyMod$1.CtrlCmd | KeyCode.Enter,
     mac: {
-        primary: 256  | 3
+        primary: KeyMod$1.WinCtrl | KeyCode.Enter
     },
     when: ( (ContextKeyExpr.and(
         ctxReferenceSearchVisible,

package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.js

@@ -1,14 +1,18 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { Dimension, append, $, hide, addStandardDisposableListener, show } from '../../../../../base/browser/dom.js';
+import { Orientation } from '../../../../../base/browser/ui/sash/sash.js';
 import { SplitView, Sizing } from '../../../../../base/browser/ui/splitview/splitview.js';
 import { Color } from '../../../../../base/common/color.js';
 import { Emitter, Event } from '../../../../../base/common/event.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
 import { DisposableStore, dispose } from '../../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../../base/common/network.js';
 import { basenameOrAuthority, dirname } from '../../../../../base/common/resources.js';
 import './referencesWidget.css.js';
 import { EmbeddedCodeEditorWidget } from '../../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { Range } from '../../../../common/core/range.js';
+import { ScrollType } from '../../../../common/editorCommon.js';
+import { TrackedRangeStickiness } from '../../../../common/model.js';
 import { ModelDecorationOptions, TextModel } from '../../../../common/model/textModel.js';
 import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../common/languages/modesRegistry.js';
@@ -28,7 +32,7 @@ const _moduleId = "vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget";
 class DecorationsManager {
     static { this.DecorationOptions = ModelDecorationOptions.register({
         description: 'reference-decoration',
-        stickiness: 1 ,
+        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
         className: 'reference-decoration'
     }); }
     constructor(_editor, _model) {
@@ -222,7 +226,7 @@ let ReferenceWidget = class ReferenceWidget extends PeekViewWidget {
         this.setCssClass('reference-zone-widget');
         this._messageContainer = append(containerElement, $('div.messages'));
         hide(this._messageContainer);
-        this._splitView = ( (new SplitView(containerElement, { orientation: 1  })));
+        this._splitView = ( (new SplitView(containerElement, { orientation: Orientation.HORIZONTAL })));
         this._previewContainer = append(containerElement, $('div.preview.inline'));
         const options = {
             scrollBeyondLastLine: false,
@@ -257,7 +261,7 @@ let ReferenceWidget = class ReferenceWidget extends PeekViewWidget {
         };
         if (this._defaultTreeKeyboardSupport) {
             this._callOnDispose.add(addStandardDisposableListener(this._treeContainer, 'keydown', (e) => {
-                if (e.equals(9 )) {
+                if (e.equals(KeyCode.Escape)) {
                     this._keybindingService.dispatchEvent(e, e.target);
                     e.stopPropagation();
                 }
@@ -424,7 +428,7 @@ let ReferenceWidget = class ReferenceWidget extends PeekViewWidget {
         dispose(this._previewModelReference);
         const model = ref.object;
         if (model) {
-            const scrollType = this._preview.getModel() === model.textEditorModel ? 0  : 1 ;
+            const scrollType = this._preview.getModel() === model.textEditorModel ? ScrollType.Smooth : ScrollType.Immediate;
             const sel = Range.lift(reference.range).collapseToStart();
             this._previewModelReference = ref;
             this._preview.setModel(model.textEditorModel);

package/vscode/src/vs/editor/contrib/gotoSymbol/browser/referencesModel.js

@@ -5,6 +5,7 @@ import { dispose } from '../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../base/common/map.js';
 import { basename, extUri } from '../../../../base/common/resources.js';
 import { commonPrefixLength } from '../../../../base/common/strings.js';
+import { Constants } from '../../../../base/common/uint.js';
 import { Range } from '../../../common/core/range.js';
 import { localizeWithPath } from '../../../../nls.js';
 const _moduleId = "vs/editor/contrib/gotoSymbol/browser/referencesModel";
@@ -66,12 +67,7 @@ class FilePreview {
         const { startLineNumber, startColumn, endLineNumber, endColumn } = range;
         const word = model.getWordUntilPosition({ lineNumber: startLineNumber, column: startColumn - n });
         const beforeRange = ( (new Range(startLineNumber, word.startColumn, startLineNumber, startColumn)));
-        const afterRange = ( (new Range(
-            endLineNumber,
-            endColumn,
-            endLineNumber,
-            1073741824
-        )));
+        const afterRange = ( (new Range(endLineNumber, endColumn, endLineNumber, Constants.MAX_SAFE_SMALL_INTEGER)));
         const before = model.getValueInRange(beforeRange).replace(/^\s+/, '');
         const inside = model.getValueInRange(range);
         const after = model.getValueInRange(afterRange).replace(/\s+$/, '');