@codingame/monaco-vscode-api 5.3.0 → 6.0.1

package/vscode/src/vs/editor/contrib/folding/browser/foldingRanges.js

@@ -1,7 +1,13 @@
+var FoldSource;
+( (function(FoldSource) {
+    FoldSource[FoldSource["provider"] = 0] = "provider";
+    FoldSource[FoldSource["userDefined"] = 1] = "userDefined";
+    FoldSource[FoldSource["recovered"] = 2] = "recovered";
+})(FoldSource || (FoldSource = {})));
 const foldSourceAbbr = {
-    [0 ]: ' ',
-    [1 ]: 'u',
-    [2 ]: 'r',
+    [FoldSource.provider]: ' ',
+    [FoldSource.userDefined]: 'u',
+    [FoldSource.recovered]: 'r',
 };
 const MAX_FOLDING_REGIONS = 0xFFFF;
 const MAX_LINE_NUMBER = 0xFFFFFF;
@@ -100,19 +106,19 @@ class FoldingRegions {
     }
     getSource(index) {
         if (this.isUserDefined(index)) {
-            return 1 ;
+            return FoldSource.userDefined;
         }
         else if (this.isRecovered(index)) {
-            return 2 ;
+            return FoldSource.recovered;
         }
-        return 0 ;
+        return FoldSource.provider;
     }
     setSource(index, source) {
-        if (source === 1 ) {
+        if (source === FoldSource.userDefined) {
             this.setUserDefined(index, true);
             this.setRecovered(index, false);
         }
-        else if (source === 2 ) {
+        else if (source === FoldSource.recovered) {
             this.setUserDefined(index, false);
             this.setRecovered(index, true);
         }
@@ -244,20 +250,20 @@ class FoldingRegions {
             let useRange = undefined;
             if (nextB && (!nextA || nextA.startLineNumber >= nextB.startLineNumber)) {
                 if (nextA && nextA.startLineNumber === nextB.startLineNumber) {
-                    if (nextB.source === 1 ) {
+                    if (nextB.source === FoldSource.userDefined) {
                         useRange = nextB;
                     }
                     else {
                         useRange = nextA;
                         useRange.isCollapsed = nextB.isCollapsed && nextA.endLineNumber === nextB.endLineNumber;
-                        useRange.source = 0 ;
+                        useRange.source = FoldSource.provider;
                     }
                     nextA = getA(++indexA);
                 }
                 else {
                     useRange = nextB;
-                    if (nextB.isCollapsed && nextB.source === 0 ) {
-                        useRange.source = 2 ;
+                    if (nextB.isCollapsed && nextB.source === FoldSource.provider) {
+                        useRange.source = FoldSource.recovered;
                     }
                 }
                 nextB = getB(++indexB);
@@ -270,7 +276,7 @@ class FoldingRegions {
                         useRange = nextA;
                         break;
                     }
-                    if (prescanB.source === 1  && prescanB.endLineNumber > nextA.endLineNumber) {
+                    if (prescanB.source === FoldSource.userDefined && prescanB.endLineNumber > nextA.endLineNumber) {
                         break;
                     }
                     prescanB = getB(++scanIndex);
@@ -329,4 +335,4 @@ class FoldingRegion {
         return this.startLineNumber < lineNumber && lineNumber <= this.endLineNumber;
     }
 }
-export { FoldingRegion, FoldingRegions, MAX_FOLDING_REGIONS, MAX_LINE_NUMBER, foldSourceAbbr };
+export { FoldSource, FoldingRegion, FoldingRegions, MAX_FOLDING_REGIONS, MAX_LINE_NUMBER, foldSourceAbbr };

package/vscode/src/vs/editor/contrib/format/browser/format.js

@@ -5,11 +5,12 @@ import { Iterable } from '../../../../base/common/iterator.js';
 import { LinkedList } from '../../../../base/common/linkedList.js';
 import { assertType } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
-import { EditorStateCancellationTokenSource, TextModelCancellationTokenSource } from '../../editorState/browser/editorState.js';
+import { EditorStateCancellationTokenSource, CodeEditorStateFlag, TextModelCancellationTokenSource } from '../../editorState/browser/editorState.js';
 import { isCodeEditor } from '../../../browser/editorBrowser.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { Selection } from '../../../common/core/selection.js';
+import { ScrollType } from '../../../common/editorCommon.js';
 import { IEditorWorkerService } from '../../../common/services/editorWorker.js';
 import { ITextModelService } from '../../../common/services/resolverService.js';
 import { FormattingEdit } from './formattingEdit.js';
@@ -48,6 +49,16 @@ function getRealAndSyntheticDocumentFormattersOrdered(documentFormattingEditProv
     }
     return result;
 }
+var FormattingKind;
+( (function(FormattingKind) {
+    FormattingKind[FormattingKind["File"] = 1] = "File";
+    FormattingKind[FormattingKind["Selection"] = 2] = "Selection";
+})(FormattingKind || (FormattingKind = {})));
+var FormattingMode;
+( (function(FormattingMode) {
+    FormattingMode[FormattingMode["Explicit"] = 1] = "Explicit";
+    FormattingMode[FormattingMode["Silent"] = 2] = "Silent";
+})(FormattingMode || (FormattingMode = {})));
 class FormattingConflicts {
     static { this._selectors = ( new LinkedList()); }
     static setFormatterSelector(selector) {
@@ -70,7 +81,7 @@ async function formatDocumentRangesWithSelectedProvider(accessor, editorOrModel,
     const { documentRangeFormattingEditProvider: documentRangeFormattingEditProviderRegistry } = accessor.get(ILanguageFeaturesService);
     const model = isCodeEditor(editorOrModel) ? editorOrModel.getModel() : editorOrModel;
     const provider = documentRangeFormattingEditProviderRegistry.ordered(model);
-    const selected = await FormattingConflicts.select(provider, model, mode, 2 );
+    const selected = await FormattingConflicts.select(provider, model, mode, FormattingKind.Selection);
     if (selected) {
         progress.report(selected);
         await instaService.invokeFunction(formatDocumentRangesWithProvider, selected, editorOrModel, rangeOrRanges, token, userGesture);
@@ -86,7 +97,7 @@ async function formatDocumentRangesWithProvider(accessor, provider, editorOrMode
         model = editorOrModel.getModel();
         cts = ( new EditorStateCancellationTokenSource(
             editorOrModel,
-            1  | 4 ,
+            CodeEditorStateFlag.Value | CodeEditorStateFlag.Position,
             undefined,
             token
         ));
@@ -182,7 +193,7 @@ async function formatDocumentRangesWithProvider(accessor, provider, editorOrMode
     }
     if (isCodeEditor(editorOrModel)) {
         FormattingEdit.execute(editorOrModel, allEdits, true);
-        editorOrModel.revealPositionInCenterIfOutsideViewport(editorOrModel.getPosition(), 1 );
+        editorOrModel.revealPositionInCenterIfOutsideViewport(editorOrModel.getPosition(), ScrollType.Immediate);
     }
     else {
         const [{ range }] = allEdits;
@@ -220,7 +231,7 @@ async function formatDocumentWithSelectedProvider(accessor, editorOrModel, mode,
     const languageFeaturesService = accessor.get(ILanguageFeaturesService);
     const model = isCodeEditor(editorOrModel) ? editorOrModel.getModel() : editorOrModel;
     const provider = getRealAndSyntheticDocumentFormattersOrdered(languageFeaturesService.documentFormattingEditProvider, languageFeaturesService.documentRangeFormattingEditProvider, model);
-    const selected = await FormattingConflicts.select(provider, model, mode, 1 );
+    const selected = await FormattingConflicts.select(provider, model, mode, FormattingKind.File);
     if (selected) {
         progress.report(selected);
         await instaService.invokeFunction(formatDocumentWithProvider, selected, editorOrModel, mode, token, userGesture);
@@ -235,7 +246,7 @@ async function formatDocumentWithProvider(accessor, provider, editorOrModel, mod
         model = editorOrModel.getModel();
         cts = ( new EditorStateCancellationTokenSource(
             editorOrModel,
-            1  | 4 ,
+            CodeEditorStateFlag.Value | CodeEditorStateFlag.Position,
             undefined,
             token
         ));
@@ -259,9 +270,9 @@ async function formatDocumentWithProvider(accessor, provider, editorOrModel, mod
         return false;
     }
     if (isCodeEditor(editorOrModel)) {
-        FormattingEdit.execute(editorOrModel, edits, mode !== 2 );
-        if (mode !== 2 ) {
-            editorOrModel.revealPositionInCenterIfOutsideViewport(editorOrModel.getPosition(), 1 );
+        FormattingEdit.execute(editorOrModel, edits, mode !== FormattingMode.Silent);
+        if (mode !== FormattingMode.Silent) {
+            editorOrModel.revealPositionInCenterIfOutsideViewport(editorOrModel.getPosition(), ScrollType.Immediate);
         }
     }
     else {
@@ -315,6 +326,16 @@ async function getDocumentFormattingEditsUntilResult(workerService, languageFeat
     }
     return undefined;
 }
+async function getDocumentFormattingEditsWithSelectedProvider(workerService, languageFeaturesService, editorOrModel, mode, token) {
+    const model = isCodeEditor(editorOrModel) ? editorOrModel.getModel() : editorOrModel;
+    const provider = getRealAndSyntheticDocumentFormattersOrdered(languageFeaturesService.documentFormattingEditProvider, languageFeaturesService.documentRangeFormattingEditProvider, model);
+    const selected = await FormattingConflicts.select(provider, model, mode, FormattingKind.File);
+    if (selected) {
+        const rawEdits = await Promise.resolve(selected.provideDocumentFormattingEdits(model, model.getOptions(), token)).catch(onUnexpectedExternalError);
+        return await workerService.computeMoreMinimalEdits(model.uri, rawEdits);
+    }
+    return undefined;
+}
 function getOnTypeFormattingEdits(workerService, languageFeaturesService, model, position, ch, options, token) {
     const providers = languageFeaturesService.onTypeFormattingEditProvider.ordered(model);
     if (providers.length === 0) {
@@ -372,4 +393,4 @@ CommandsRegistry.registerCommand('_executeFormatOnTypeProvider', async function
         reference.dispose();
     }
 });
-export { FormattingConflicts, formatDocumentRangesWithProvider, formatDocumentRangesWithSelectedProvider, formatDocumentWithProvider, formatDocumentWithSelectedProvider, getDocumentFormattingEditsUntilResult, getDocumentRangeFormattingEditsUntilResult, getOnTypeFormattingEdits, getRealAndSyntheticDocumentFormattersOrdered };
+export { FormattingConflicts, FormattingKind, FormattingMode, formatDocumentRangesWithProvider, formatDocumentRangesWithSelectedProvider, formatDocumentWithProvider, formatDocumentWithSelectedProvider, getDocumentFormattingEditsUntilResult, getDocumentFormattingEditsWithSelectedProvider, getDocumentRangeFormattingEditsUntilResult, getOnTypeFormattingEdits, getRealAndSyntheticDocumentFormattersOrdered };

package/vscode/src/vs/editor/contrib/format/browser/formatActions.js

@@ -2,16 +2,17 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { isNonEmptyArray } from '../../../../base/common/arrays.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
-import { KeyChord } from '../../../../base/common/keyCodes.js';
+import { KeyMod as KeyMod$1, KeyCode, KeyChord } from '../../../../base/common/keyCodes.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
-import { registerEditorContribution, registerEditorAction, EditorAction } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, registerEditorAction, EditorContributionInstantiation, EditorAction } from '../../../browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { CharacterSet } from '../../../common/core/characterClassifier.js';
 import { Range } from '../../../common/core/range.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { IEditorWorkerService } from '../../../common/services/editorWorker.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
-import { getOnTypeFormattingEdits, formatDocumentRangesWithSelectedProvider, formatDocumentWithSelectedProvider } from './format.js';
+import { getOnTypeFormattingEdits, formatDocumentRangesWithSelectedProvider, FormattingMode, formatDocumentWithSelectedProvider } from './format.js';
 import { FormattingEdit } from './formattingEdit.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { AccessibilitySignal } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
@@ -20,6 +21,7 @@ import { CommandsRegistry } from '../../../../platform/commands/common/commands.
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { Progress } from '../../../../platform/progress/common/progress.js';
 import { IEditorProgressService } from '../../../../platform/progress/common/progress.service.js';
 const _moduleId = "vs/editor/contrib/format/browser/formatActions";
@@ -36,7 +38,7 @@ let FormatOnType = class FormatOnType {
         this._disposables.add(_editor.onDidChangeModel(() => this._update()));
         this._disposables.add(_editor.onDidChangeModelLanguage(() => this._update()));
         this._disposables.add(_editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(56 )) {
+            if (e.hasChanged(EditorOption.formatOnType)) {
                 this._update();
             }
         }));
@@ -48,7 +50,7 @@ let FormatOnType = class FormatOnType {
     }
     _update() {
         this._sessionDisposables.clear();
-        if (!this._editor.getOption(56 )) {
+        if (!this._editor.getOption(EditorOption.formatOnType)) {
             return;
         }
         if (!this._editor.hasModel()) {
@@ -132,7 +134,7 @@ let FormatOnPaste = class FormatOnPaste {
     }
     _update() {
         this._callOnModel.clear();
-        if (!this.editor.getOption(55 )) {
+        if (!this.editor.getOption(EditorOption.formatOnPaste)) {
             return;
         }
         if (!this.editor.hasModel()) {
@@ -150,7 +152,7 @@ let FormatOnPaste = class FormatOnPaste {
         if (this.editor.getSelections().length > 1) {
             return;
         }
-        this._instantiationService.invokeFunction(formatDocumentRangesWithSelectedProvider, this.editor, range, 2 , Progress.None, CancellationToken.None, false).catch(onUnexpectedError);
+        this._instantiationService.invokeFunction(formatDocumentRangesWithSelectedProvider, this.editor, range, FormattingMode.Silent, Progress.None, CancellationToken.None, false).catch(onUnexpectedError);
     }
 };
 FormatOnPaste = ( (__decorate([
@@ -170,9 +172,9 @@ class FormatDocumentAction extends EditorAction {
             ))),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 1024  | 512  | 36 ,
-                linux: { primary: 2048  | 1024  | 39  },
-                weight: 100
+                primary: KeyMod$1.Shift | KeyMod$1.Alt | KeyCode.KeyF,
+                linux: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyI },
+                weight: KeybindingWeight.EditorContrib
             },
             contextMenuOpts: {
                 group: '1_modification',
@@ -184,7 +186,7 @@ class FormatDocumentAction extends EditorAction {
         if (editor.hasModel()) {
             const instaService = accessor.get(IInstantiationService);
             const progressService = accessor.get(IEditorProgressService);
-            await progressService.showWhile(instaService.invokeFunction(formatDocumentWithSelectedProvider, editor, 1 , Progress.None, CancellationToken.None, true), 250);
+            await progressService.showWhile(instaService.invokeFunction(formatDocumentWithSelectedProvider, editor, FormattingMode.Explicit, Progress.None, CancellationToken.None, true), 250);
         }
     }
 }
@@ -200,8 +202,8 @@ class FormatSelectionAction extends EditorAction {
             ))),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: KeyChord(2048  | 41 , 2048  | 36 ),
-                weight: 100
+                primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.CtrlCmd | KeyCode.KeyF),
+                weight: KeybindingWeight.EditorContrib
             },
             contextMenuOpts: {
                 when: EditorContextKeys.hasNonEmptySelection,
@@ -227,11 +229,11 @@ class FormatSelectionAction extends EditorAction {
                 : range;
         })));
         const progressService = accessor.get(IEditorProgressService);
-        await progressService.showWhile(instaService.invokeFunction(formatDocumentRangesWithSelectedProvider, editor, ranges, 1 , Progress.None, CancellationToken.None, true), 250);
+        await progressService.showWhile(instaService.invokeFunction(formatDocumentRangesWithSelectedProvider, editor, ranges, FormattingMode.Explicit, Progress.None, CancellationToken.None, true), 250);
     }
 }
-registerEditorContribution(FormatOnType.ID, FormatOnType, 2 );
-registerEditorContribution(FormatOnPaste.ID, FormatOnPaste, 2 );
+registerEditorContribution(FormatOnType.ID, FormatOnType, EditorContributionInstantiation.BeforeFirstInteraction);
+registerEditorContribution(FormatOnPaste.ID, FormatOnPaste, EditorContributionInstantiation.BeforeFirstInteraction);
 registerEditorAction(FormatDocumentAction);
 registerEditorAction(FormatSelectionAction);
 CommandsRegistry.registerCommand('editor.action.format', async (accessor) => {

package/vscode/src/vs/editor/contrib/gotoError/browser/gotoError.js

@@ -1,7 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Codicon } from '../../../../base/common/codicons.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
-import { registerEditorContribution, registerEditorAction, registerEditorCommand, EditorAction, EditorCommand } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, registerEditorAction, registerEditorCommand, EditorAction, EditorContributionInstantiation, EditorCommand } from '../../../browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
@@ -11,7 +12,9 @@ import { localizeWithPath } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { TextEditorSelectionRevealType } from '../../../../platform/editor/common/editor.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { MarkerNavigationWidget } from './gotoErrorWidget.js';
 var MarkerController_1;
@@ -113,7 +116,7 @@ let MarkerController = class MarkerController {
                 this._cleanUp();
                 const otherEditor = await this._editorService.openCodeEditor({
                     resource: model.selected.marker.resource,
-                    options: { pinned: false, revealIfOpened: true, selectionRevealType: 2 , selection: model.selected.marker }
+                    options: { pinned: false, revealIfOpened: true, selectionRevealType: TextEditorSelectionRevealType.NearTop, selection: model.selected.marker }
                 }, this._editor);
                 if (otherEditor) {
                     MarkerController_1.get(otherEditor)?.close();
@@ -155,8 +158,8 @@ class NextMarkerAction extends MarkerNavigationAction {
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.focus,
-                primary: 512  | 66 ,
-                weight: 100
+                primary: KeyMod$1.Alt | KeyCode.F8,
+                weight: KeybindingWeight.EditorContrib
             },
             menuOpts: {
                 menuId: MarkerNavigationWidget.TitleMenu,
@@ -179,8 +182,8 @@ class PrevMarkerAction extends MarkerNavigationAction {
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.focus,
-                primary: 1024  | 512  | 66 ,
-                weight: 100
+                primary: KeyMod$1.Shift | KeyMod$1.Alt | KeyCode.F8,
+                weight: KeybindingWeight.EditorContrib
             },
             menuOpts: {
                 menuId: MarkerNavigationWidget.TitleMenu,
@@ -201,8 +204,8 @@ class NextMarkerInFilesAction extends MarkerNavigationAction {
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.focus,
-                primary: 66 ,
-                weight: 100
+                primary: KeyCode.F8,
+                weight: KeybindingWeight.EditorContrib
             },
             menuOpts: {
                 menuId: MenuId.MenubarGoMenu,
@@ -222,8 +225,8 @@ class PrevMarkerInFilesAction extends MarkerNavigationAction {
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.focus,
-                primary: 1024  | 66 ,
-                weight: 100
+                primary: KeyMod$1.Shift | KeyCode.F8,
+                weight: KeybindingWeight.EditorContrib
             },
             menuOpts: {
                 menuId: MenuId.MenubarGoMenu,
@@ -234,7 +237,7 @@ class PrevMarkerInFilesAction extends MarkerNavigationAction {
         });
     }
 }
-registerEditorContribution(MarkerController.ID, MarkerController, 4 );
+registerEditorContribution(MarkerController.ID, MarkerController, EditorContributionInstantiation.Lazy);
 registerEditorAction(NextMarkerAction);
 registerEditorAction(PrevMarkerAction);
 registerEditorAction(NextMarkerInFilesAction);
@@ -246,10 +249,10 @@ registerEditorCommand(( (new MarkerCommand({
     precondition: CONTEXT_MARKERS_NAVIGATION_VISIBLE,
     handler: x => x.close(),
     kbOpts: {
-        weight: 100  + 50,
+        weight: KeybindingWeight.EditorContrib + 50,
         kbExpr: EditorContextKeys.focus,
-        primary: 9 ,
-        secondary: [1024  | 9 ]
+        primary: KeyCode.Escape,
+        secondary: [KeyMod$1.Shift | KeyCode.Escape]
     }
 }))));
 export { MarkerController, NextMarkerAction };

package/vscode/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.js

@@ -6,9 +6,12 @@ import { Color } from '../../../../base/common/color.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { DisposableStore, dispose } from '../../../../base/common/lifecycle.js';
 import { basename } from '../../../../base/common/resources.js';
+import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
 import { splitLines } from '../../../../base/common/strings.js';
 import './media/gotoErrorWidget.css.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
+import { ScrollType } from '../../../common/editorCommon.js';
 import { PeekViewWidget, peekViewTitleForeground, peekViewTitleInfoForeground } from '../../peekView/browser/peekView.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
@@ -60,8 +63,8 @@ class MessageWidget {
             }
         }));
         this._scrollable = ( (new ScrollableElement(domNode, {
-            horizontal: 1 ,
-            vertical: 1 ,
+            horizontal: ScrollbarVisibility.Auto,
+            vertical: ScrollbarVisibility.Auto,
             useShadows: false,
             horizontalScrollbarSize: 6,
             verticalScrollbarSize: 6
@@ -140,7 +143,7 @@ class MessageWidget {
         this._editor.applyFontInfo(this._relatedBlock);
         if (isNonEmptyArray(relatedInformation)) {
             const relatedInformationNode = this._relatedBlock.appendChild(document.createElement('div'));
-            relatedInformationNode.style.paddingTop = `${Math.floor(this._editor.getOption(67 ) * 0.66)}px`;
+            relatedInformationNode.style.paddingTop = `${Math.floor(this._editor.getOption(EditorOption.lineHeight) * 0.66)}px`;
             this._lines += 1;
             for (const related of relatedInformation) {
                 const container = document.createElement('div');
@@ -157,7 +160,7 @@ class MessageWidget {
                 relatedInformationNode.appendChild(container);
             }
         }
-        const fontInfo = this._editor.getOption(50 );
+        const fontInfo = this._editor.getOption(EditorOption.fontInfo);
         const scrollWidth = Math.ceil(fontInfo.typicalFullwidthCharacterWidth * this._longestLineLength * 0.75);
         const scrollHeight = fontInfo.lineHeight * this._lines;
         this._scrollable.setScrollDimensions({ scrollWidth, scrollHeight });
@@ -303,7 +306,7 @@ let MarkerNavigationWidget = class MarkerNavigationWidget extends PeekViewWidget
             this.setTitle(basename(model.uri), detail);
         }
         this._icon.className = `codicon ${SeverityIcon.className(MarkerSeverity.toSeverity(this._severity))}`;
-        this.editor.revealPositionNearTop(position, 0 );
+        this.editor.revealPositionNearTop(position, ScrollType.Smooth);
         this.editor.focus();
     }
     updateMarker(marker) {

package/vscode/src/vs/editor/contrib/gotoError/browser/markerNavigationService.js

@@ -6,7 +6,7 @@ import { LinkedList } from '../../../../base/common/linkedList.js';
 import { compare } from '../../../../base/common/strings.js';
 import { URI } from '../../../../base/common/uri.js';
 import { Range } from '../../../common/core/range.js';
-import { registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { IMarkerService } from '../../../../platform/markers/common/markers.service.js';
@@ -184,5 +184,5 @@ MarkerNavigationService = ( __decorate([
     ( __param(0, IMarkerService)),
     ( __param(1, IConfigurationService))
 ], MarkerNavigationService));
-registerSingleton(IMarkerNavigationService, MarkerNavigationService, 1 );
+registerSingleton(IMarkerNavigationService, MarkerNavigationService, InstantiationType.Delayed);
 export { IMarkerNavigationService, MarkerCoordinate, MarkerList };