@codingame/monaco-vscode-api 17.2.1 → 18.0.0

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

@@ -56,7 +56,7 @@ class PeekViewService {
 }
 var PeekContext;
 (function (PeekContext) {
-    PeekContext.inPeekEditor = ( new RawContextKey('inReferenceSearchEditor', true, ( localize(1371, "Whether the current code editor is embedded inside peek"))));
+    PeekContext.inPeekEditor = ( new RawContextKey('inReferenceSearchEditor', true, ( localize(1374, "Whether the current code editor is embedded inside peek"))));
     PeekContext.notInPeekEditor = ( PeekContext.inPeekEditor.toNegated());
 })(PeekContext || (PeekContext = {}));
 let PeekContextController = class PeekContextController {
@@ -152,7 +152,7 @@ let PeekViewWidget = class PeekViewWidget extends ZoneWidget {
         this._actionbarWidget = ( new ActionBar(actionsContainer, actionBarOptions));
         this._disposables.add(this._actionbarWidget);
         if (!noCloseAction) {
-            this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(1372, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
+            this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(1375, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
                 this.dispose();
                 return Promise.resolve();
             }))), { label: false, icon: true });
@@ -197,7 +197,7 @@ let PeekViewWidget = class PeekViewWidget extends ZoneWidget {
             return;
         }
         const headHeight = Math.ceil(this.editor.getOption(EditorOption.lineHeight) * 1.2);
-        const bodyHeight = Math.round(heightInPixel - ((headHeight + 2) ));
+        const bodyHeight = Math.round(heightInPixel - ((headHeight + 1) ));
         this._doLayoutHead(headHeight, widthInPixel);
         this._doLayoutBody(bodyHeight, widthInPixel);
     }
@@ -216,26 +216,26 @@ let PeekViewWidget = class PeekViewWidget extends ZoneWidget {
 PeekViewWidget = ( __decorate([
     ( __param(2, IInstantiationService))
 ], PeekViewWidget));
-const peekViewTitleBackground = registerColor('peekViewTitle.background', { dark: '#252526', light: '#F3F3F3', hcDark: Color.black, hcLight: Color.white }, ( localize(1373, 'Background color of the peek view title area.')));
-const peekViewTitleForeground = registerColor('peekViewTitleLabel.foreground', { dark: Color.white, light: Color.black, hcDark: Color.white, hcLight: editorForeground }, ( localize(1374, 'Color of the peek view title.')));
-const peekViewTitleInfoForeground = registerColor('peekViewTitleDescription.foreground', { dark: '#ccccccb3', light: '#616161', hcDark: '#FFFFFF99', hcLight: '#292929' }, ( localize(1375, 'Color of the peek view title info.')));
-const peekViewBorder = registerColor('peekView.border', { dark: editorInfoForeground, light: editorInfoForeground, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(1376, 'Color of the peek view borders and arrow.')));
-const peekViewResultsBackground = registerColor('peekViewResult.background', { dark: '#252526', light: '#F3F3F3', hcDark: Color.black, hcLight: Color.white }, ( localize(1377, 'Background color of the peek view result list.')));
-registerColor('peekViewResult.lineForeground', { dark: '#bbbbbb', light: '#646465', hcDark: Color.white, hcLight: editorForeground }, ( localize(1378, 'Foreground color for line nodes in the peek view result list.')));
-registerColor('peekViewResult.fileForeground', { dark: Color.white, light: '#1E1E1E', hcDark: Color.white, hcLight: editorForeground }, ( localize(1379, 'Foreground color for file nodes in the peek view result list.')));
+const peekViewTitleBackground = registerColor('peekViewTitle.background', { dark: '#252526', light: '#F3F3F3', hcDark: Color.black, hcLight: Color.white }, ( localize(1376, 'Background color of the peek view title area.')));
+const peekViewTitleForeground = registerColor('peekViewTitleLabel.foreground', { dark: Color.white, light: Color.black, hcDark: Color.white, hcLight: editorForeground }, ( localize(1377, 'Color of the peek view title.')));
+const peekViewTitleInfoForeground = registerColor('peekViewTitleDescription.foreground', { dark: '#ccccccb3', light: '#616161', hcDark: '#FFFFFF99', hcLight: '#292929' }, ( localize(1378, 'Color of the peek view title info.')));
+const peekViewBorder = registerColor('peekView.border', { dark: editorInfoForeground, light: editorInfoForeground, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(1379, 'Color of the peek view borders and arrow.')));
+const peekViewResultsBackground = registerColor('peekViewResult.background', { dark: '#252526', light: '#F3F3F3', hcDark: Color.black, hcLight: Color.white }, ( localize(1380, 'Background color of the peek view result list.')));
+registerColor('peekViewResult.lineForeground', { dark: '#bbbbbb', light: '#646465', hcDark: Color.white, hcLight: editorForeground }, ( localize(1381, 'Foreground color for line nodes in the peek view result list.')));
+registerColor('peekViewResult.fileForeground', { dark: Color.white, light: '#1E1E1E', hcDark: Color.white, hcLight: editorForeground }, ( localize(1382, 'Foreground color for file nodes in the peek view result list.')));
 registerColor('peekViewResult.selectionBackground', { dark: '#3399ff33', light: '#3399ff33', hcDark: null, hcLight: null }, ( localize(
-    1380,
+    1383,
     'Background color of the selected entry in the peek view result list.'
 )));
 registerColor('peekViewResult.selectionForeground', { dark: Color.white, light: '#6C6C6C', hcDark: Color.white, hcLight: editorForeground }, ( localize(
-    1381,
+    1384,
     'Foreground color of the selected entry in the peek view result list.'
 )));
-const peekViewEditorBackground = registerColor('peekViewEditor.background', { dark: '#001F33', light: '#F2F8FC', hcDark: Color.black, hcLight: Color.white }, ( localize(1382, 'Background color of the peek view editor.')));
-registerColor('peekViewEditorGutter.background', peekViewEditorBackground, ( localize(1383, 'Background color of the gutter in the peek view editor.')));
-registerColor('peekViewEditorStickyScroll.background', peekViewEditorBackground, ( localize(1384, 'Background color of sticky scroll in the peek view editor.')));
-registerColor('peekViewResult.matchHighlightBackground', { dark: '#ea5c004d', light: '#ea5c004d', hcDark: null, hcLight: null }, ( localize(1385, 'Match highlight color in the peek view result list.')));
-const peekViewEditorMatchHighlight = registerColor('peekViewEditor.matchHighlightBackground', { dark: '#ff8f0099', light: '#f5d802de', hcDark: null, hcLight: null }, ( localize(1386, 'Match highlight color in the peek view editor.')));
-registerColor('peekViewEditor.matchHighlightBorder', { dark: null, light: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, ( localize(1387, 'Match highlight border in the peek view editor.')));
+const peekViewEditorBackground = registerColor('peekViewEditor.background', { dark: '#001F33', light: '#F2F8FC', hcDark: Color.black, hcLight: Color.white }, ( localize(1385, 'Background color of the peek view editor.')));
+registerColor('peekViewEditorGutter.background', peekViewEditorBackground, ( localize(1386, 'Background color of the gutter in the peek view editor.')));
+registerColor('peekViewEditorStickyScroll.background', peekViewEditorBackground, ( localize(1387, 'Background color of sticky scroll in the peek view editor.')));
+registerColor('peekViewResult.matchHighlightBackground', { dark: '#ea5c004d', light: '#ea5c004d', hcDark: null, hcLight: null }, ( localize(1388, 'Match highlight color in the peek view result list.')));
+const peekViewEditorMatchHighlight = registerColor('peekViewEditor.matchHighlightBackground', { dark: '#ff8f0099', light: '#f5d802de', hcDark: null, hcLight: null }, ( localize(1389, 'Match highlight color in the peek view editor.')));
+registerColor('peekViewEditor.matchHighlightBorder', { dark: null, light: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, ( localize(1390, 'Match highlight border in the peek view editor.')));
 
 export { PeekContext, PeekViewService, PeekViewWidget, peekViewBorder, peekViewEditorBackground, peekViewEditorMatchHighlight, peekViewResultsBackground, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground };

package/vscode/src/vs/editor/contrib/placeholderText/browser/placeholderText.contribution.js

@@ -10,4 +10,4 @@ import { wrapInReloadableClass1 } from '../../../../platform/observable/common/w
 
 registerCss(placeholderText);
 registerEditorContribution(PlaceholderTextContribution.ID, wrapInReloadableClass1(() => PlaceholderTextContribution), EditorContributionInstantiation.Eager);
-registerColor('editor.placeholder.foreground', ghostTextForeground, ( localize(1388, 'Foreground color of the placeholder text in the editor.')));
+registerColor('editor.placeholder.foreground', ghostTextForeground, ( localize(1391, 'Foreground color of the placeholder text in the editor.')));

package/vscode/src/vs/editor/contrib/placeholderText/browser/placeholderTextContribution.js

@@ -5,9 +5,10 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import '../../../../base/common/observableInternal/index.js';
 import { observableCodeEditor } from '../../../browser/observableCodeEditor.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
-import { derivedOpts, derivedWithStore } from '../../../../base/common/observableInternal/derived.js';
-import { constObservable, derivedObservableWithCache } from '../../../../base/common/observableInternal/utils.js';
-import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import { derivedOpts, derived } from '../../../../base/common/observableInternal/observables/derived.js';
+import { autorun } from '../../../../base/common/observableInternal/reactions/autorun.js';
+import { constObservable } from '../../../../base/common/observableInternal/observables/constObservable.js';
+import { derivedObservableWithCache } from '../../../../base/common/observableInternal/utils/utils.js';
 
 class PlaceholderTextContribution extends Disposable {
     static get(editor) {
@@ -30,29 +31,29 @@ class PlaceholderTextContribution extends Disposable {
             return { placeholder: p };
         });
         this._shouldViewBeAlive = isOrWasTrue(this, reader => this._state.read(reader)?.placeholder !== undefined);
-        this._view = derivedWithStore((reader, store) => {
+        this._view = derived((reader) => {
             if (!this._shouldViewBeAlive.read(reader)) {
                 return;
             }
             const element = h('div.editorPlaceholder');
-            store.add(autorun(reader => {
+            reader.store.add(autorun(reader => {
                 const data = this._state.read(reader);
                 const shouldBeVisibile = data?.placeholder !== undefined;
                 element.root.style.display = shouldBeVisibile ? 'block' : 'none';
                 element.root.innerText = data?.placeholder ?? '';
             }));
-            store.add(autorun(reader => {
+            reader.store.add(autorun(reader => {
                 const info = this._editorObs.layoutInfo.read(reader);
                 element.root.style.left = `${info.contentLeft}px`;
                 element.root.style.width = (info.contentWidth - info.verticalScrollbarWidth) + 'px';
                 element.root.style.top = `${this._editor.getTopForLineNumber(0)}px`;
             }));
-            store.add(autorun(reader => {
+            reader.store.add(autorun(reader => {
                 element.root.style.fontFamily = this._editorObs.getOption(EditorOption.fontFamily).read(reader);
                 element.root.style.fontSize = this._editorObs.getOption(EditorOption.fontSize).read(reader) + 'px';
                 element.root.style.lineHeight = this._editorObs.getOption(EditorOption.lineHeight).read(reader) + 'px';
             }));
-            store.add(this._editorObs.createOverlayWidget({
+            reader.store.add(this._editorObs.createOverlayWidget({
                 allowEditorOverflow: false,
                 minContentWidthInPx: constObservable(0),
                 position: constObservable(null),

package/vscode/src/vs/editor/contrib/readOnlyMessage/browser/contribution.js

@@ -19,10 +19,10 @@ class ReadOnlyMessageController extends Disposable {
             let message = this.editor.getOptions().get(EditorOption.readOnlyMessage);
             if (!message) {
                 if (this.editor.isSimpleWidget) {
-                    message = ( new MarkdownString(( localize(1426, "Cannot edit in read-only input"))));
+                    message = ( new MarkdownString(( localize(1429, "Cannot edit in read-only input"))));
                 }
                 else {
-                    message = ( new MarkdownString(( localize(1427, "Cannot edit in read-only editor"))));
+                    message = ( new MarkdownString(( localize(1430, "Cannot edit in read-only editor"))));
                 }
             }
             messageController.showMessage(message, this.editor.getPosition());

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

@@ -93,7 +93,7 @@ class RenameSkeleton {
         }
         const result = await provider.provideRenameEdits(this.model, this.position, newName, token);
         if (!result) {
-            return this._provideRenameEdits(newName, i + 1, rejects.concat(( localize(1428, "No result."))), token);
+            return this._provideRenameEdits(newName, i + 1, rejects.concat(( localize(1431, "No result."))), token);
         }
         else if (result.rejectReason) {
             return this._provideRenameEdits(newName, i + 1, rejects.concat(result.rejectReason), token);
@@ -171,7 +171,7 @@ let RenameController = class RenameController {
             else {
                 trace('resolve rename location failed', e instanceof Error ? e : JSON.stringify(e, null, '\t'));
                 if (typeof e === 'string' || isMarkdownString(e)) {
-                    MessageController.get(this.editor)?.showMessage(e || ( localize(1429, "An unknown error occurred while resolving rename location")), position);
+                    MessageController.get(this.editor)?.showMessage(e || ( localize(1432, "An unknown error occurred while resolving rename location")), position);
                 }
             }
             return undefined;
@@ -243,15 +243,15 @@ let RenameController = class RenameController {
             this._bulkEditService.apply(renameResult, {
                 editor: this.editor,
                 showPreview: inputFieldResult.wantsPreview,
-                label: ( localize(1430, "Renaming '{0}' to '{1}'", loc?.text, inputFieldResult.newName)),
+                label: ( localize(1433, "Renaming '{0}' to '{1}'", loc?.text, inputFieldResult.newName)),
                 code: 'undoredo.rename',
-                quotableLabel: ( localize(1431, "Renaming {0} to {1}", loc?.text, inputFieldResult.newName)),
+                quotableLabel: ( localize(1434, "Renaming {0} to {1}", loc?.text, inputFieldResult.newName)),
                 respectAutoSaveConfig: true
             }).then(result => {
                 trace('edits applied');
                 if (result.ariaSummary) {
                     alert(( localize(
-                        1432,
+                        1435,
                         "Successfully renamed '{0}' to '{1}'. Summary: {2}",
                         loc.text,
                         inputFieldResult.newName,
@@ -260,12 +260,12 @@ let RenameController = class RenameController {
                 }
             }).catch(err => {
                 trace(`error when applying edits ${JSON.stringify(err, null, '\t')}`);
-                this._notificationService.error(( localize(1433, "Rename failed to apply edits")));
+                this._notificationService.error(( localize(1436, "Rename failed to apply edits")));
                 this._logService.error(err);
             });
         }, err => {
             trace('error when providing rename edits', JSON.stringify(err, null, '\t'));
-            this._notificationService.error(( localize(1434, "Rename failed to compute edits")));
+            this._notificationService.error(( localize(1437, "Rename failed to compute edits")));
             this._logService.error(err);
         }).finally(() => {
             cts2.dispose();
@@ -300,7 +300,7 @@ class RenameAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.rename',
-            label: ( localize2(1435, "Rename Symbol")),
+            label: ( localize2(1438, "Rename Symbol")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasRenameProvider)),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -380,7 +380,7 @@ registerAction2(class FocusNextRenameSuggestion extends Action2 {
         super({
             id: 'focusNextRenameSuggestion',
             title: {
-                ...( localize2(1436, "Focus Next Rename Suggestion")),
+                ...( localize2(1439, "Focus Next Rename Suggestion")),
             },
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [
@@ -408,7 +408,7 @@ registerAction2(class FocusPreviousRenameSuggestion extends Action2 {
         super({
             id: 'focusPreviousRenameSuggestion',
             title: {
-                ...( localize2(1437, "Focus Previous Rename Suggestion")),
+                ...( localize2(1440, "Focus Previous Rename Suggestion")),
             },
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [
@@ -451,7 +451,7 @@ registerModelAndPositionCommand('_executePrepareRename', async function (accesso
     properties: {
         'editor.rename.enablePreview': {
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            description: ( localize(1438, "Enable/disable the ability to preview changes before renaming")),
+            description: ( localize(1441, "Enable/disable the ability to preview changes before renaming")),
             default: true,
             type: 'boolean'
         }

package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.d.ts

@@ -1,7 +1,7 @@
 import { CancellationToken, CancellationTokenSource } from "../../../../base/common/cancellation.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from "../../../browser/editorBrowser.js";
-import { IDimension } from "../../../common/core/dimension.js";
+import { IDimension } from "../../../common/core/2d/dimension.js";
 import { IRange } from "../../../common/core/range.js";
 import { NewSymbolName, NewSymbolNameTriggerKind, ProviderResult } from "../../../common/languages.js";
 import { RawContextKey } from "../../../../platform/contextkey/common/contextkey.js";

package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.js

@@ -44,7 +44,7 @@ import '../../../../platform/theme/common/colors/searchColors.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 
 registerCss(renameWidget);
-const CONTEXT_RENAME_INPUT_VISIBLE = ( new RawContextKey('renameInputVisible', false, ( localize(1439, "Whether the rename input widget is visible"))));
+const CONTEXT_RENAME_INPUT_VISIBLE = ( new RawContextKey('renameInputVisible', false, ( localize(1442, "Whether the rename input widget is visible"))));
 let RenameWidget = class RenameWidget {
     constructor(_editor, _acceptKeybindings, _themeService, _keybindingService, contextKeyService, _logService) {
         this._editor = _editor;
@@ -167,7 +167,7 @@ let RenameWidget = class RenameWidget {
     beforeRender() {
         const [accept, preview] = this._acceptKeybindings;
         this._label.innerText = ( localize(
-            1440,
+            1443,
             "{0} to Rename, {1} to Preview",
             this._keybindingService.lookupKeybinding(accept)?.getLabel(),
             this._keybindingService.lookupKeybinding(preview)?.getLabel()
@@ -463,7 +463,7 @@ class RenameCandidateListView {
         this._listWidget.layout(height, width);
         this._listContainer.style.height = `${height}px`;
         this._listContainer.style.width = `${width}px`;
-        status(( localize(1441, "Received {0} rename suggestions", candidates.length)));
+        status(( localize(1444, "Received {0} rename suggestions", candidates.length)));
     }
     clearCandidates() {
         this._listContainer.style.height = '0px';
@@ -602,13 +602,13 @@ class InputWithButton {
             this._inputNode.className = 'rename-input';
             this._inputNode.type = 'text';
             this._inputNode.style.border = 'none';
-            this._inputNode.setAttribute('aria-label', ( localize(1442, "Rename input. Type new name and press Enter to commit.")));
+            this._inputNode.setAttribute('aria-label', ( localize(1445, "Rename input. Type new name and press Enter to commit.")));
             this._domNode.appendChild(this._inputNode);
             this._buttonNode = document.createElement('div');
             this._buttonNode.className = 'rename-suggestions-button';
             this._buttonNode.setAttribute('tabindex', '0');
-            this._buttonGenHoverText = ( localize(1443, "Generate new name suggestions"));
-            this._buttonCancelHoverText = ( localize(1444, "Cancel"));
+            this._buttonGenHoverText = ( localize(1446, "Generate new name suggestions"));
+            this._buttonCancelHoverText = ( localize(1447, "Cancel"));
             this._buttonHoverContent = this._buttonGenHoverText;
             this._disposables.add(getBaseLayerHoverDelegate().setupDelayedHover(this._buttonNode, () => ({
                 content: this._buttonHoverContent,

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

@@ -118,7 +118,7 @@ class GrowSelectionAction extends AbstractSmartSelect {
     constructor() {
         super(true, {
             id: 'editor.action.smartSelect.expand',
-            label: ( localize2(1445, "Expand Selection")),
+            label: ( localize2(1448, "Expand Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -132,7 +132,7 @@ class GrowSelectionAction extends AbstractSmartSelect {
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: '1_basic',
-                title: ( localize(1446, "&&Expand Selection")),
+                title: ( localize(1449, "&&Expand Selection")),
                 order: 2
             }
         });
@@ -143,7 +143,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
     constructor() {
         super(false, {
             id: 'editor.action.smartSelect.shrink',
-            label: ( localize2(1447, "Shrink Selection")),
+            label: ( localize2(1450, "Shrink Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -157,7 +157,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: '1_basic',
-                title: ( localize(1448, "&&Shrink Selection")),
+                title: ( localize(1451, "&&Shrink Selection")),
                 order: 3
             }
         });

package/vscode/src/vs/editor/contrib/snippet/browser/snippetController2.js

@@ -33,9 +33,9 @@ let SnippetController2 = class SnippetController2 {
     static get(editor) {
         return editor.getContribution(SnippetController2_1.ID);
     }
-    static { this.InSnippetMode = ( new RawContextKey('inSnippetMode', false, ( localize(1449, "Whether the editor in current in snippet mode")))); }
-    static { this.HasNextTabstop = ( new RawContextKey('hasNextTabstop', false, ( localize(1450, "Whether there is a next tab stop when in snippet mode")))); }
-    static { this.HasPrevTabstop = ( new RawContextKey('hasPrevTabstop', false, ( localize(1451, "Whether there is a previous tab stop when in snippet mode")))); }
+    static { this.InSnippetMode = ( new RawContextKey('inSnippetMode', false, ( localize(1452, "Whether the editor in current in snippet mode")))); }
+    static { this.HasNextTabstop = ( new RawContextKey('hasNextTabstop', false, ( localize(1453, "Whether there is a next tab stop when in snippet mode")))); }
+    static { this.HasPrevTabstop = ( new RawContextKey('hasPrevTabstop', false, ( localize(1454, "Whether there is a previous tab stop when in snippet mode")))); }
     constructor(_editor, _logService, _languageFeaturesService, contextKeyService, _languageConfigurationService) {
         this._editor = _editor;
         this._logService = _logService;
@@ -124,7 +124,7 @@ let SnippetController2 = class SnippetController2 {
                             sortText: 'a'.repeat(i + 1),
                             range: activeChoice.range,
                             filterText: isAnyOfOptions ? `${word}_${option.value}` : undefined,
-                            command: { id: 'jumpToNextSnippetPlaceholder', title: ( localize(1452, 'Go to next placeholder...')) }
+                            command: { id: 'jumpToNextSnippetPlaceholder', title: ( localize(1455, 'Go to next placeholder...')) }
                         });
                     }
                     return { suggestions };

package/vscode/src/vs/editor/contrib/snippet/browser/snippetVariables.js

@@ -214,10 +214,10 @@ class TimeBasedVariableResolver {
     constructor() {
         this._date = ( new Date());
     }
-    static { this.dayNames = [( localize(1453, "Sunday")), ( localize(1454, "Monday")), ( localize(1455, "Tuesday")), ( localize(1456, "Wednesday")), ( localize(1457, "Thursday")), ( localize(1458, "Friday")), ( localize(1459, "Saturday"))]; }
-    static { this.dayNamesShort = [( localize(1460, "Sun")), ( localize(1461, "Mon")), ( localize(1462, "Tue")), ( localize(1463, "Wed")), ( localize(1464, "Thu")), ( localize(1465, "Fri")), ( localize(1466, "Sat"))]; }
-    static { this.monthNames = [( localize(1467, "January")), ( localize(1468, "February")), ( localize(1469, "March")), ( localize(1470, "April")), ( localize(1471, "May")), ( localize(1472, "June")), ( localize(1473, "July")), ( localize(1474, "August")), ( localize(1475, "September")), ( localize(1476, "October")), ( localize(1477, "November")), ( localize(1478, "December"))]; }
-    static { this.monthNamesShort = [( localize(1479, "Jan")), ( localize(1480, "Feb")), ( localize(1481, "Mar")), ( localize(1482, "Apr")), ( localize(1483, "May")), ( localize(1484, "Jun")), ( localize(1485, "Jul")), ( localize(1486, "Aug")), ( localize(1487, "Sep")), ( localize(1488, "Oct")), ( localize(1489, "Nov")), ( localize(1490, "Dec"))]; }
+    static { this.dayNames = [( localize(1456, "Sunday")), ( localize(1457, "Monday")), ( localize(1458, "Tuesday")), ( localize(1459, "Wednesday")), ( localize(1460, "Thursday")), ( localize(1461, "Friday")), ( localize(1462, "Saturday"))]; }
+    static { this.dayNamesShort = [( localize(1463, "Sun")), ( localize(1464, "Mon")), ( localize(1465, "Tue")), ( localize(1466, "Wed")), ( localize(1467, "Thu")), ( localize(1468, "Fri")), ( localize(1469, "Sat"))]; }
+    static { this.monthNames = [( localize(1470, "January")), ( localize(1471, "February")), ( localize(1472, "March")), ( localize(1473, "April")), ( localize(1474, "May")), ( localize(1475, "June")), ( localize(1476, "July")), ( localize(1477, "August")), ( localize(1478, "September")), ( localize(1479, "October")), ( localize(1480, "November")), ( localize(1481, "December"))]; }
+    static { this.monthNamesShort = [( localize(1482, "Jan")), ( localize(1483, "Feb")), ( localize(1484, "Mar")), ( localize(1485, "Apr")), ( localize(1486, "May")), ( localize(1487, "Jun")), ( localize(1488, "Jul")), ( localize(1489, "Aug")), ( localize(1490, "Sep")), ( localize(1491, "Oct")), ( localize(1492, "Nov")), ( localize(1493, "Dec"))]; }
     resolve(variable) {
         const { name } = variable;
         if (name === 'CURRENT_YEAR') {

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js

@@ -15,20 +15,20 @@ class ToggleStickyScroll extends EditorAction2 {
         super({
             id: 'editor.action.toggleStickyScroll',
             title: {
-                ...( localize2(1491, "Toggle Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1492, "&&Toggle Editor Sticky Scroll")),
+                ...( localize2(1494, "Toggle Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1495, "&&Toggle Editor Sticky Scroll")),
             },
             metadata: {
                 description: ( localize2(
-                    1493,
+                    1496,
                     "Toggle/enable the editor sticky scroll which shows the nested scopes at the top of the viewport"
                 )),
             },
             category: Categories.View,
             toggled: {
                 condition: ( ContextKeyExpr.equals('config.editor.stickyScroll.enabled', true)),
-                title: ( localize(1494, "Sticky Scroll")),
-                mnemonicTitle: ( localize(1495, "&&Sticky Scroll")),
+                title: ( localize(1497, "Sticky Scroll")),
+                mnemonicTitle: ( localize(1498, "&&Sticky Scroll")),
             },
             menu: [
                 { id: MenuId.CommandPalette },
@@ -53,8 +53,8 @@ class FocusStickyScroll extends EditorAction2 {
         super({
             id: 'editor.action.focusStickyScroll',
             title: {
-                ...( localize2(1496, "Focus Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1497, "&&Focus Editor Sticky Scroll")),
+                ...( localize2(1499, "Focus Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1500, "&&Focus Editor Sticky Scroll")),
             },
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.has('config.editor.stickyScroll.enabled')), EditorContextKeys.stickyScrollVisible)),
             menu: [
@@ -70,7 +70,7 @@ class SelectNextStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.selectNextStickyScrollLine',
-            title: ( localize2(1498, "Select the next editor sticky scroll line")),
+            title: ( localize2(1501, "Select the next editor sticky scroll line")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,
@@ -86,7 +86,7 @@ class SelectPreviousStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.selectPreviousStickyScrollLine',
-            title: ( localize2(1499, "Select the previous sticky scroll line")),
+            title: ( localize2(1502, "Select the previous sticky scroll line")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,
@@ -102,7 +102,7 @@ class GoToStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.goToFocusedStickyScrollLine',
-            title: ( localize2(1500, "Go to the focused sticky scroll line")),
+            title: ( localize2(1503, "Go to the focused sticky scroll line")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,
@@ -118,7 +118,7 @@ class SelectEditor extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.selectEditor',
-            title: ( localize2(1501, "Select Editor")),
+            title: ( localize2(1504, "Select Editor")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.js

@@ -9,6 +9,7 @@ import { binarySearch } from '../../../../base/common/arrays.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.service.js';
 import { StickyModelProvider } from './stickyScrollModelProvider.js';
+import { Position } from '../../../common/core/position.js';
 
 class StickyLineCandidate {
     constructor(startLineNumber, endLineNumber, top, height) {
@@ -128,7 +129,7 @@ let StickyLineCandidateProvider = class StickyLineCandidateProvider extends Disp
                 const childEndLine = childRange.endLineNumber;
                 if (range.startLineNumber <= childEndLine + 1 && childStartLine - 1 <= range.endLineNumber && childStartLine !== lastLine) {
                     lastLine = childStartLine;
-                    const lineHeight = this._editor.getLineHeightForLineNumber(childStartLine);
+                    const lineHeight = this._editor.getLineHeightForPosition(( new Position(childStartLine, 1)));
                     result.push(( new StickyLineCandidate(childStartLine, childEndLine - 1, top, lineHeight)));
                     this.getCandidateStickyLinesIntersectingFromStickyModel(range, child, result, depth + 1, top + lineHeight, childStartLine);
                 }

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.js

@@ -218,7 +218,7 @@ class StickyScrollWidget extends Disposable {
     _getHeightOfLines(lineNumbers, lastLineRelativePosition) {
         let totalHeight = 0;
         for (let i = 0; i < lineNumbers.length; i++) {
-            totalHeight += this._editor.getLineHeightForLineNumber(lineNumbers[i]);
+            totalHeight += this._editor.getLineHeightForPosition(( new Position(lineNumbers[i], 1)));
         }
         return totalHeight + lastLineRelativePosition;
     }
@@ -268,7 +268,7 @@ class StickyScrollWidget extends Disposable {
         catch (err) {
             actualInlineDecorations = [];
         }
-        const lineHeight = this._editor.getLineHeightForLineNumber(line);
+        const lineHeight = this._editor.getLineHeightForPosition(( new Position(line, 1)));
         const renderLineInput = ( new RenderLineInput(
             true,
             true,

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

@@ -21,21 +21,21 @@ import { StandardTokenType } from '../../../common/encodedTokenAttributes.js';
 
 const Context = {
     Visible: historyNavigationVisible,
-    HasFocusedSuggestion: ( new RawContextKey('suggestWidgetHasFocusedSuggestion', false, ( localize(1502, "Whether any suggestion is focused")))),
-    DetailsVisible: ( new RawContextKey('suggestWidgetDetailsVisible', false, ( localize(1503, "Whether suggestion details are visible")))),
-    MultipleSuggestions: ( new RawContextKey('suggestWidgetMultipleSuggestions', false, ( localize(1504, "Whether there are multiple suggestions to pick from")))),
+    HasFocusedSuggestion: ( new RawContextKey('suggestWidgetHasFocusedSuggestion', false, ( localize(1505, "Whether any suggestion is focused")))),
+    DetailsVisible: ( new RawContextKey('suggestWidgetDetailsVisible', false, ( localize(1506, "Whether suggestion details are visible")))),
+    MultipleSuggestions: ( new RawContextKey('suggestWidgetMultipleSuggestions', false, ( localize(1507, "Whether there are multiple suggestions to pick from")))),
     MakesTextEdit: ( new RawContextKey('suggestionMakesTextEdit', true, ( localize(
-        1505,
+        1508,
         "Whether inserting the current suggestion yields in a change or has everything already been typed"
     )))),
-    AcceptSuggestionsOnEnter: ( new RawContextKey('acceptSuggestionOnEnter', true, ( localize(1506, "Whether suggestions are inserted when pressing Enter")))),
-    HasInsertAndReplaceRange: ( new RawContextKey('suggestionHasInsertAndReplaceRange', false, ( localize(1507, "Whether the current suggestion has insert and replace behaviour")))),
+    AcceptSuggestionsOnEnter: ( new RawContextKey('acceptSuggestionOnEnter', true, ( localize(1509, "Whether suggestions are inserted when pressing Enter")))),
+    HasInsertAndReplaceRange: ( new RawContextKey('suggestionHasInsertAndReplaceRange', false, ( localize(1510, "Whether the current suggestion has insert and replace behaviour")))),
     InsertMode: ( new RawContextKey(
         'suggestionInsertMode',
         undefined,
-        { type: 'string', description: ( localize(1508, "Whether the default behaviour is to insert or replace")) }
+        { type: 'string', description: ( localize(1511, "Whether the default behaviour is to insert or replace")) }
     )),
-    CanResolve: ( new RawContextKey('suggestionCanResolve', false, ( localize(1509, "Whether the current suggestion supports to resolve further details")))),
+    CanResolve: ( new RawContextKey('suggestionCanResolve', false, ( localize(1512, "Whether the current suggestion supports to resolve further details")))),
 };
 const suggestWidgetStatusbarMenu = ( new MenuId('suggestWidgetStatusBar'));
 class CompletionItem {

package/vscode/src/vs/editor/contrib/suggest/browser/suggestController.js

@@ -449,7 +449,7 @@ let SuggestController = class SuggestController {
     _alertCompletionItem(item) {
         if (isNonEmptyArray(item.completion.additionalTextEdits)) {
             const msg = ( localize(
-                1510,
+                1513,
                 "Accepting '{0}' made {1} additional edits",
                 item.textLabel,
                 item.completion.additionalTextEdits.length
@@ -626,7 +626,7 @@ class TriggerSuggestAction extends EditorAction {
     constructor() {
         super({
             id: TriggerSuggestAction.id,
-            label: ( localize2(1511, "Trigger Suggest")),
+            label: ( localize2(1514, "Trigger Suggest")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 EditorContextKeys.hasCompletionItemProvider,
@@ -681,19 +681,19 @@ registerEditorCommand(( new SuggestCommand({
         }],
     menuOpts: [{
             menuId: suggestWidgetStatusbarMenu,
-            title: ( localize(1512, "Insert")),
+            title: ( localize(1515, "Insert")),
             group: 'left',
             order: 1,
             when: ( Context.HasInsertAndReplaceRange.toNegated())
         }, {
             menuId: suggestWidgetStatusbarMenu,
-            title: ( localize(1512, "Insert")),
+            title: ( localize(1515, "Insert")),
             group: 'left',
             order: 1,
             when: ( ContextKeyExpr.and(Context.HasInsertAndReplaceRange, ( Context.InsertMode.isEqualTo('insert'))))
         }, {
             menuId: suggestWidgetStatusbarMenu,
-            title: ( localize(1513, "Replace")),
+            title: ( localize(1516, "Replace")),
             group: 'left',
             order: 1,
             when: ( ContextKeyExpr.and(Context.HasInsertAndReplaceRange, ( Context.InsertMode.isEqualTo('replace'))))
@@ -720,13 +720,13 @@ registerEditorCommand(( new SuggestCommand({
             group: 'left',
             order: 2,
             when: ( ContextKeyExpr.and(Context.HasInsertAndReplaceRange, ( Context.InsertMode.isEqualTo('insert')))),
-            title: ( localize(1513, "Replace"))
+            title: ( localize(1516, "Replace"))
         }, {
             menuId: suggestWidgetStatusbarMenu,
             group: 'left',
             order: 2,
             when: ( ContextKeyExpr.and(Context.HasInsertAndReplaceRange, ( Context.InsertMode.isEqualTo('replace')))),
-            title: ( localize(1512, "Insert"))
+            title: ( localize(1515, "Insert"))
         }]
 })));
 CommandsRegistry.registerCommandAlias('acceptSelectedSuggestionOnEnter', 'acceptSelectedSuggestion');
@@ -833,13 +833,13 @@ registerEditorCommand(( new SuggestCommand({
             group: 'right',
             order: 1,
             when: ( ContextKeyExpr.and(Context.DetailsVisible, Context.CanResolve)),
-            title: ( localize(1514, "Show Less"))
+            title: ( localize(1517, "Show Less"))
         }, {
             menuId: suggestWidgetStatusbarMenu,
             group: 'right',
             order: 1,
             when: ( ContextKeyExpr.and(( Context.DetailsVisible.toNegated()), Context.CanResolve)),
-            title: ( localize(1515, "Show More"))
+            title: ( localize(1518, "Show More"))
         }]
 })));
 registerEditorCommand(( new SuggestCommand({
@@ -897,7 +897,7 @@ registerEditorAction(class extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.resetSuggestSize',
-            label: ( localize2(1516, "Reset Suggest Widget Size")),
+            label: ( localize2(1519, "Reset Suggest Widget Size")),
             precondition: undefined
         });
     }