@codingame/monaco-vscode-api 14.0.6 → 15.0.1

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

@@ -42,7 +42,7 @@ import { quickInputListFocusBackground, quickInputListFocusForeground } from '..
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 
-const CONTEXT_RENAME_INPUT_VISIBLE = ( new RawContextKey('renameInputVisible', false, ( localize(1396, "Whether the rename input widget is visible"))));
+const CONTEXT_RENAME_INPUT_VISIBLE = ( new RawContextKey('renameInputVisible', false, ( localize(1412, "Whether the rename input widget is visible"))));
 let RenameWidget = class RenameWidget {
     constructor(_editor, _acceptKeybindings, _themeService, _keybindingService, contextKeyService, _logService) {
         this._editor = _editor;
@@ -66,7 +66,7 @@ let RenameWidget = class RenameWidget {
                 this._updateFont();
             }
         }));
-        this._disposables.add(_themeService.onDidColorThemeChange(this._updateStyles, this));
+        this._disposables.add(_themeService.onDidColorThemeChange(e => this._updateStyles(e.theme)));
     }
     dispose() {
         this._disposables.dispose();
@@ -165,7 +165,7 @@ let RenameWidget = class RenameWidget {
     beforeRender() {
         const [accept, preview] = this._acceptKeybindings;
         this._label.innerText = ( localize(
-            1397,
+            1413,
             "{0} to Rename, {1} to Preview",
             this._keybindingService.lookupKeybinding(accept)?.getLabel(),
             this._keybindingService.lookupKeybinding(preview)?.getLabel()
@@ -461,7 +461,7 @@ class RenameCandidateListView {
         this._listWidget.layout(height, width);
         this._listContainer.style.height = `${height}px`;
         this._listContainer.style.width = `${width}px`;
-        status(( localize(1398, "Received {0} rename suggestions", candidates.length)));
+        status(( localize(1414, "Received {0} rename suggestions", candidates.length)));
     }
     clearCandidates() {
         this._listContainer.style.height = '0px';
@@ -600,13 +600,13 @@ class InputWithButton {
             this._inputNode.className = 'rename-input';
             this._inputNode.type = 'text';
             this._inputNode.style.border = 'none';
-            this._inputNode.setAttribute('aria-label', ( localize(1399, "Rename input. Type new name and press Enter to commit.")));
+            this._inputNode.setAttribute('aria-label', ( localize(1415, "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(1400, "Generate new name suggestions"));
-            this._buttonCancelHoverText = ( localize(1401, "Cancel"));
+            this._buttonGenHoverText = ( localize(1416, "Generate new name suggestions"));
+            this._buttonCancelHoverText = ( localize(1417, "Cancel"));
             this._buttonHoverContent = this._buttonGenHoverText;
             this._disposables.add(getBaseLayerHoverDelegate().setupDelayedHover(this._buttonNode, () => ({
                 content: this._buttonHoverContent,

package/vscode/src/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.d.ts

@@ -1,8 +1,8 @@
 import { Disposable } from "../../../../base/common/lifecycle.js";
 import { ICodeEditor } from "../../../browser/editorBrowser.js";
 import { IEditorContribution } from "../../../common/editorCommon.js";
-import { ILanguageConfigurationService } from "../../../common/languages/languageConfigurationRegistry.js";
-import { IEditorWorkerService } from "../../../common/services/editorWorker.js";
+import { ILanguageConfigurationService } from "../../../common/languages/languageConfigurationRegistry.service.js";
+import { IEditorWorkerService } from "../../../common/services/editorWorker.service.js";
 export declare class SectionHeaderDetector extends Disposable implements IEditorContribution {
     private readonly editor;
     private readonly languageConfigurationService;

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

@@ -5,10 +5,10 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import { registerEditorContribution, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { StandardTokenType } from '../../../common/encodedTokenAttributes.js';
-import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.service.js';
 import { MinimapSectionHeaderStyle, MinimapPosition, TrackedRangeStickiness } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
-import { IEditorWorkerService } from '../../../common/services/editorWorker.js';
+import { IEditorWorkerService } from '../../../common/services/editorWorker.service.js';
 
 let SectionHeaderDetector = class SectionHeaderDetector extends Disposable {
     static { this.ID = 'editor.sectionHeaderDetector'; }
@@ -79,6 +79,7 @@ let SectionHeaderDetector = class SectionHeaderDetector extends Disposable {
         }
         return {
             foldingRules,
+            markSectionHeaderRegex: minimap.markSectionHeaderRegex,
             findMarkSectionHeaders: minimap.showMarkSectionHeaders,
             findRegionSectionHeaders: minimap.showRegionSectionHeaders,
         };

package/vscode/src/vs/editor/contrib/semanticTokens/browser/documentSemanticTokens.d.ts

@@ -1,10 +1,10 @@
 import { Disposable } from "../../../../base/common/lifecycle.js";
 import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
 import { IThemeService } from "../../../../platform/theme/common/themeService.service.js";
-import { ILanguageFeatureDebounceService } from "../../../common/services/languageFeatureDebounce.js";
-import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.js";
-import { IModelService } from "../../../common/services/model.js";
-import { ISemanticTokensStylingService } from "../../../common/services/semanticTokensStyling.js";
+import { ILanguageFeatureDebounceService } from "../../../common/services/languageFeatureDebounce.service.js";
+import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.service.js";
+import { IModelService } from "../../../common/services/model.service.js";
+import { ISemanticTokensStylingService } from "../../../common/services/semanticTokensStyling.service.js";
 export declare class DocumentSemanticTokensFeature extends Disposable {
     private readonly _watchers;
     constructor(semanticTokensStylingService: ISemanticTokensStylingService, modelService: IModelService, themeService: IThemeService, configurationService: IConfigurationService, languageFeatureDebounceService: ILanguageFeatureDebounceService, languageFeaturesService: ILanguageFeaturesService);

package/vscode/src/vs/editor/contrib/semanticTokens/browser/documentSemanticTokens.js

@@ -9,11 +9,11 @@ import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { registerEditorFeature } from '../../../common/editorFeatures.js';
-import { ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
-import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
-import { IModelService } from '../../../common/services/model.js';
+import { ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.service.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.service.js';
+import { IModelService } from '../../../common/services/model.service.js';
 import { toMultilineTokens2 } from '../../../common/services/semanticTokensProviderStyling.js';
-import { ISemanticTokensStylingService } from '../../../common/services/semanticTokensStyling.js';
+import { ISemanticTokensStylingService } from '../../../common/services/semanticTokensStyling.service.js';
 import { hasDocumentSemanticTokensProvider, getDocumentSemanticTokens, isSemanticTokensEdits, isSemanticTokens } from '../common/getSemanticTokens.js';
 import { isSemanticColoringEnabled, SEMANTIC_HIGHLIGHTING_SETTING_ID } from '../common/semanticTokensConfig.js';
 

package/vscode/src/vs/editor/contrib/semanticTokens/browser/viewportSemanticTokens.d.ts

@@ -3,9 +3,9 @@ import { ICodeEditor } from "../../../browser/editorBrowser.js";
 import { IEditorContribution } from "../../../common/editorCommon.js";
 import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
 import { IThemeService } from "../../../../platform/theme/common/themeService.service.js";
-import { ILanguageFeatureDebounceService } from "../../../common/services/languageFeatureDebounce.js";
-import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.js";
-import { ISemanticTokensStylingService } from "../../../common/services/semanticTokensStyling.js";
+import { ILanguageFeatureDebounceService } from "../../../common/services/languageFeatureDebounce.service.js";
+import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.service.js";
+import { ISemanticTokensStylingService } from "../../../common/services/semanticTokensStyling.service.js";
 export declare class ViewportSemanticTokensContribution extends Disposable implements IEditorContribution {
     private readonly _semanticTokensStylingService;
     private readonly _themeService;

package/vscode/src/vs/editor/contrib/semanticTokens/browser/viewportSemanticTokens.js

@@ -8,10 +8,10 @@ import { SEMANTIC_HIGHLIGHTING_SETTING_ID, isSemanticColoringEnabled } from '../
 import { toMultilineTokens2 } from '../../../common/services/semanticTokensProviderStyling.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
-import { ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
+import { ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.service.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
-import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
-import { ISemanticTokensStylingService } from '../../../common/services/semanticTokensStyling.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.service.js';
+import { ISemanticTokensStylingService } from '../../../common/services/semanticTokensStyling.service.js';
 
 var ViewportSemanticTokensContribution_1;
 let ViewportSemanticTokensContribution = class ViewportSemanticTokensContribution extends Disposable {

package/vscode/src/vs/editor/contrib/semanticTokens/common/getSemanticTokens.js

@@ -2,13 +2,13 @@
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
 import { URI } from '../../../../base/common/uri.js';
-import { IModelService } from '../../../common/services/model.js';
+import { IModelService } from '../../../common/services/model.service.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { assertType } from '../../../../base/common/types.js';
 import { encodeSemanticTokensDto } from '../../../common/services/semanticTokensDto.js';
 import { Range } from '../../../common/core/range.js';
-import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.service.js';
 
 function isSemanticTokens(v) {
     return v && !!(v.data);

package/vscode/src/vs/editor/contrib/smartSelect/browser/smartSelect.d.ts

@@ -5,7 +5,7 @@ import { Range } from "../../../common/core/range.js";
 import { IEditorContribution } from "../../../common/editorCommon.js";
 import { ITextModel } from "../../../common/model.js";
 import * as languages from "../../../common/languages.js";
-import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.js";
+import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.service.js";
 import { LanguageFeatureRegistry } from "../../../common/languageFeatureRegistry.js";
 export declare class SmartSelectController implements IEditorContribution {
     private readonly _editor;

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

@@ -16,8 +16,8 @@ import { localize, localize2 } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
-import { ITextModelService } from '../../../common/services/resolverService.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.service.js';
+import { ITextModelService } from '../../../common/services/resolverService.service.js';
 import { assertType } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 
@@ -118,7 +118,7 @@ class GrowSelectionAction extends AbstractSmartSelect {
     constructor() {
         super(true, {
             id: 'editor.action.smartSelect.expand',
-            label: ( localize2(1402, "Expand Selection")),
+            label: ( localize2(1418, "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(1403, "&&Expand Selection")),
+                title: ( localize(1419, "&&Expand Selection")),
                 order: 2
             }
         });
@@ -143,7 +143,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
     constructor() {
         super(false, {
             id: 'editor.action.smartSelect.shrink',
-            label: ( localize2(1404, "Shrink Selection")),
+            label: ( localize2(1420, "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(1405, "&&Shrink Selection")),
+                title: ( localize(1421, "&&Shrink Selection")),
                 order: 3
             }
         });

package/vscode/src/vs/editor/contrib/snippet/browser/snippetController2.d.ts

@@ -1,8 +1,8 @@
 import { ICodeEditor } from "../../../browser/editorBrowser.js";
 import { Range } from "../../../common/core/range.js";
 import { IEditorContribution } from "../../../common/editorCommon.js";
-import { ILanguageConfigurationService } from "../../../common/languages/languageConfigurationRegistry.js";
-import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.js";
+import { ILanguageConfigurationService } from "../../../common/languages/languageConfigurationRegistry.service.js";
+import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.service.js";
 import { OvertypingCapturer } from "../../suggest/browser/suggestOvertypingCapturer.js";
 import { RawContextKey } from "../../../../platform/contextkey/common/contextkey.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";

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

@@ -7,8 +7,8 @@ import { registerEditorContribution, EditorContributionInstantiation, EditorComm
 import { Position } from '../../../common/core/position.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { CompletionItemKind } from '../../../common/languages.js';
-import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
-import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.service.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.service.js';
 import { showSimpleSuggestions } from '../../suggest/browser/suggest.js';
 import { localize } from '../../../../nls.js';
 import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.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(1406, "Whether the editor in current in snippet mode")))); }
-    static { this.HasNextTabstop = ( new RawContextKey('hasNextTabstop', false, ( localize(1407, "Whether there is a next tab stop when in snippet mode")))); }
-    static { this.HasPrevTabstop = ( new RawContextKey('hasPrevTabstop', false, ( localize(1408, "Whether there is a previous tab stop when in snippet mode")))); }
+    static { this.InSnippetMode = ( new RawContextKey('inSnippetMode', false, ( localize(1422, "Whether the editor in current in snippet mode")))); }
+    static { this.HasNextTabstop = ( new RawContextKey('hasNextTabstop', false, ( localize(1423, "Whether there is a next tab stop when in snippet mode")))); }
+    static { this.HasPrevTabstop = ( new RawContextKey('hasPrevTabstop', false, ( localize(1424, "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(1409, 'Go to next placeholder...')) }
+                            command: { id: 'jumpToNextSnippetPlaceholder', title: ( localize(1425, 'Go to next placeholder...')) }
                         });
                     }
                     return { suggestions };

package/vscode/src/vs/editor/contrib/snippet/browser/snippetSession.d.ts

@@ -3,7 +3,7 @@ import { IPosition } from "../../../common/core/position.js";
 import { Range } from "../../../common/core/range.js";
 import { Selection } from "../../../common/core/selection.js";
 import { TextChange } from "../../../common/core/textChange.js";
-import { ILanguageConfigurationService } from "../../../common/languages/languageConfigurationRegistry.js";
+import { ILanguageConfigurationService } from "../../../common/languages/languageConfigurationRegistry.service.js";
 import { IIdentifiedSingleEditOperation, ITextModel } from "../../../common/model.js";
 import { OvertypingCapturer } from "../../suggest/browser/suggestOvertypingCapturer.js";
 import { Choice, Marker, TextmateSnippet } from "./snippetParser.js";
@@ -46,6 +46,7 @@ export interface ISnippetSessionInsertOptions {
 export interface ISnippetEdit {
     range: Range;
     template: string;
+    keepWhitespace?: boolean;
 }
 export declare class SnippetSession {
     private readonly _editor;

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

@@ -9,7 +9,7 @@ import { EditorOption } from '../../../common/config/editorOptions.js';
 import { EditOperation } from '../../../common/core/editOperation.js';
 import { Range } from '../../../common/core/range.js';
 import { Selection } from '../../../common/core/selection.js';
-import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.service.js';
 import { TrackedRangeStickiness } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
@@ -398,7 +398,7 @@ let SnippetSession = SnippetSession_1 = class SnippetSession {
         snippetEdits = snippetEdits.sort((a, b) => Range.compareRangesUsingStarts(a.range, b.range));
         let offset = 0;
         for (let i = 0; i < snippetEdits.length; i++) {
-            const { range, template } = snippetEdits[i];
+            const { range, template, keepWhitespace } = snippetEdits[i];
             if (i > 0) {
                 const lastRange = snippetEdits[i - 1].range;
                 const textRange = Range.fromPositions(lastRange.getEndPosition(), range.getStartPosition());
@@ -407,7 +407,7 @@ let SnippetSession = SnippetSession_1 = class SnippetSession {
                 offset += textNode.value.length;
             }
             const newNodes = parser.parseFragment(template, snippet);
-            SnippetSession_1.adjustWhitespace(model, range.getStartPosition(), true, snippet, ( new Set(newNodes)));
+            SnippetSession_1.adjustWhitespace(model, range.getStartPosition(), keepWhitespace !== undefined ? !keepWhitespace : adjustWhitespace, snippet, ( new Set(newNodes)));
             snippet.resolveVariables(resolver);
             const snippetText = ( snippet.toString());
             const snippetFragmentText = snippetText.slice(offset);

package/vscode/src/vs/editor/contrib/snippet/browser/snippetVariables.d.ts

@@ -1,6 +1,6 @@
 import { Selection } from "../../../common/core/selection.js";
 import { ITextModel } from "../../../common/model.js";
-import { ILanguageConfigurationService } from "../../../common/languages/languageConfigurationRegistry.js";
+import { ILanguageConfigurationService } from "../../../common/languages/languageConfigurationRegistry.service.js";
 import { Variable, VariableResolver } from "./snippetParser.js";
 import { OvertypingCapturer } from "../../suggest/browser/suggestOvertypingCapturer.js";
 import { ILabelService } from "../../../../platform/label/common/label.service.js";

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

@@ -5,7 +5,7 @@ import { basename, dirname } from '../../../../base/common/path.js';
 import { dirname as dirname$1 } from '../../../../base/common/resources.js';
 import { getLeadingWhitespace, splitLines, commonPrefixLength, isFalsyOrWhitespace } from '../../../../base/common/strings.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
-import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.service.js';
 import { Text } from './snippetParser.js';
 import { localize } from '../../../../nls.js';
 import { toWorkspaceIdentifier, isEmptyWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, WORKSPACE_EXTENSION } from '../../../../platform/workspace/common/workspace.js';
@@ -214,10 +214,10 @@ class TimeBasedVariableResolver {
     constructor() {
         this._date = ( new Date());
     }
-    static { this.dayNames = [( localize(1410, "Sunday")), ( localize(1411, "Monday")), ( localize(1412, "Tuesday")), ( localize(1413, "Wednesday")), ( localize(1414, "Thursday")), ( localize(1415, "Friday")), ( localize(1416, "Saturday"))]; }
-    static { this.dayNamesShort = [( localize(1417, "Sun")), ( localize(1418, "Mon")), ( localize(1419, "Tue")), ( localize(1420, "Wed")), ( localize(1421, "Thu")), ( localize(1422, "Fri")), ( localize(1423, "Sat"))]; }
-    static { this.monthNames = [( localize(1424, "January")), ( localize(1425, "February")), ( localize(1426, "March")), ( localize(1427, "April")), ( localize(1428, "May")), ( localize(1429, "June")), ( localize(1430, "July")), ( localize(1431, "August")), ( localize(1432, "September")), ( localize(1433, "October")), ( localize(1434, "November")), ( localize(1435, "December"))]; }
-    static { this.monthNamesShort = [( localize(1436, "Jan")), ( localize(1437, "Feb")), ( localize(1438, "Mar")), ( localize(1439, "Apr")), ( localize(1440, "May")), ( localize(1441, "Jun")), ( localize(1442, "Jul")), ( localize(1443, "Aug")), ( localize(1444, "Sep")), ( localize(1445, "Oct")), ( localize(1446, "Nov")), ( localize(1447, "Dec"))]; }
+    static { this.dayNames = [( localize(1426, "Sunday")), ( localize(1427, "Monday")), ( localize(1428, "Tuesday")), ( localize(1429, "Wednesday")), ( localize(1430, "Thursday")), ( localize(1431, "Friday")), ( localize(1432, "Saturday"))]; }
+    static { this.dayNamesShort = [( localize(1433, "Sun")), ( localize(1434, "Mon")), ( localize(1435, "Tue")), ( localize(1436, "Wed")), ( localize(1437, "Thu")), ( localize(1438, "Fri")), ( localize(1439, "Sat"))]; }
+    static { this.monthNames = [( localize(1440, "January")), ( localize(1441, "February")), ( localize(1442, "March")), ( localize(1443, "April")), ( localize(1444, "May")), ( localize(1445, "June")), ( localize(1446, "July")), ( localize(1447, "August")), ( localize(1448, "September")), ( localize(1449, "October")), ( localize(1450, "November")), ( localize(1451, "December"))]; }
+    static { this.monthNamesShort = [( localize(1452, "Jan")), ( localize(1453, "Feb")), ( localize(1454, "Mar")), ( localize(1455, "Apr")), ( localize(1456, "May")), ( localize(1457, "Jun")), ( localize(1458, "Jul")), ( localize(1459, "Aug")), ( localize(1460, "Sep")), ( localize(1461, "Oct")), ( localize(1462, "Nov")), ( localize(1463, "Dec"))]; }
     resolve(variable) {
         const { name } = variable;
         if (name === 'CURRENT_YEAR') {

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

@@ -1,6 +1,6 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = ".monaco-editor .sticky-widget{overflow:hidden}.monaco-editor .sticky-widget-line-numbers{background-color:inherit;float:left}.monaco-editor .sticky-widget-lines-scrollable{background-color:inherit;display:inline-block;overflow:hidden;position:absolute;width:var(--vscode-editorStickyScroll-scrollableWidth)}.monaco-editor .sticky-widget-lines{background-color:inherit;position:absolute}.monaco-editor .sticky-line-content,.monaco-editor .sticky-line-number{background-color:inherit;color:var(--vscode-editorLineNumber-foreground);display:inline-block;position:absolute;white-space:nowrap}.monaco-editor .sticky-line-number .codicon-folding-collapsed,.monaco-editor .sticky-line-number .codicon-folding-expanded{align-items:center;display:flex;float:right;transition:var(--vscode-editorStickyScroll-foldingOpacityTransition)}.monaco-editor .sticky-line-content{background-color:inherit;white-space:nowrap;width:var(--vscode-editorStickyScroll-scrollableWidth)}.monaco-editor .sticky-line-number-inner{display:inline-block;text-align:right}.monaco-editor .sticky-widget{border-bottom:1px solid var(--vscode-editorStickyScroll-border)}.monaco-editor .sticky-line-content:hover{background-color:var(--vscode-editorStickyScrollHover-background);cursor:pointer}.monaco-editor .sticky-widget{background-color:var(--vscode-editorStickyScroll-background);box-shadow:var(--vscode-editorStickyScroll-shadow) 0 4px 2px -2px;right:auto!important;width:100%;z-index:4}.monaco-editor .sticky-widget.peek{background-color:var(--vscode-peekViewEditorStickyScroll-background)}";
+var css = ".monaco-editor .sticky-widget{overflow:hidden}.monaco-editor .sticky-widget-line-numbers{background-color:inherit;float:left}.monaco-editor .sticky-widget-lines-scrollable{background-color:inherit;display:inline-block;overflow:hidden;position:absolute;width:var(--vscode-editorStickyScroll-scrollableWidth)}.monaco-editor .sticky-widget-lines{background-color:inherit;position:absolute}.monaco-editor .sticky-line-content,.monaco-editor .sticky-line-number{background-color:inherit;color:var(--vscode-editorLineNumber-foreground);display:inline-block;position:absolute;white-space:nowrap}.monaco-editor .sticky-line-number .codicon-folding-collapsed,.monaco-editor .sticky-line-number .codicon-folding-expanded{float:right;margin-left:2px;position:absolute;transition:var(--vscode-editorStickyScroll-foldingOpacityTransition)}.monaco-editor .sticky-line-content{background-color:inherit;white-space:nowrap;width:var(--vscode-editorStickyScroll-scrollableWidth)}.monaco-editor .sticky-line-number-inner{display:inline-block;text-align:right}.monaco-editor .sticky-widget{border-bottom:1px solid var(--vscode-editorStickyScroll-border)}.monaco-editor .sticky-line-content:hover{background-color:var(--vscode-editorStickyScrollHover-background);cursor:pointer}.monaco-editor .sticky-widget{background-color:var(--vscode-editorStickyScroll-background);box-shadow:var(--vscode-editorStickyScroll-shadow) 0 4px 2px -2px;right:auto!important;width:100%;z-index:4}.monaco-editor .sticky-widget.peek{background-color:var(--vscode-peekViewEditorStickyScroll-background)}";
 n(css,{});
 
 export { css, css as default };

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(1448, "Toggle Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1449, "&&Toggle Editor Sticky Scroll")),
+                ...( localize2(1464, "Toggle Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1465, "&&Toggle Editor Sticky Scroll")),
             },
             metadata: {
                 description: ( localize2(
-                    1450,
+                    1466,
                     "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(1451, "Sticky Scroll")),
-                mnemonicTitle: ( localize(1452, "&&Sticky Scroll")),
+                title: ( localize(1467, "Sticky Scroll")),
+                mnemonicTitle: ( localize(1468, "&&Sticky Scroll")),
             },
             menu: [
                 { id: MenuId.CommandPalette },
@@ -53,8 +53,8 @@ class FocusStickyScroll extends EditorAction2 {
         super({
             id: 'editor.action.focusStickyScroll',
             title: {
-                ...( localize2(1453, "Focus Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1454, "&&Focus Editor Sticky Scroll")),
+                ...( localize2(1469, "Focus Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1470, "&&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(1455, "Select the next editor sticky scroll line")),
+            title: ( localize2(1471, "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(1456, "Select the previous sticky scroll line")),
+            title: ( localize2(1472, "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(1457, "Go to the focused sticky scroll line")),
+            title: ( localize2(1473, "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(1458, "Select Editor")),
+            title: ( localize2(1474, "Select Editor")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.d.ts

@@ -1,14 +1,14 @@
 import { Disposable } from "../../../../base/common/lifecycle.js";
 import { ICodeEditor } from "../../../browser/editorBrowser.js";
 import { IEditorContribution } from "../../../common/editorCommon.js";
-import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.js";
+import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.service.js";
 import { StickyScrollWidgetState } from "./stickyScrollWidget.js";
 import { IStickyLineCandidateProvider } from "./stickyScrollProvider.js";
 import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
 import { IContextMenuService } from "../../../../platform/contextview/browser/contextView.service.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
-import { ILanguageConfigurationService } from "../../../common/languages/languageConfigurationRegistry.js";
-import { ILanguageFeatureDebounceService } from "../../../common/services/languageFeatureDebounce.js";
+import { ILanguageConfigurationService } from "../../../common/languages/languageConfigurationRegistry.service.js";
+import { ILanguageFeatureDebounceService } from "../../../common/services/languageFeatureDebounce.service.js";
 import { Event } from "../../../../base/common/event.js";
 export interface IStickyScrollController {
     get stickyScrollCandidateProvider(): IStickyLineCandidateProvider;

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { MouseTargetType } from '../../../browser/editorBrowser.js';
 import { ScrollType } from '../../../common/editorCommon.js';
-import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.service.js';
 import { EditorOption, RenderLineNumbersType } from '../../../common/config/editorOptions.js';
 import { StickyScrollWidget, StickyScrollWidgetState } from './stickyScrollWidget.js';
 import { StickyLineCandidateProvider } from './stickyScrollProvider.js';
@@ -18,8 +18,8 @@ import { getDefinitionsAtPosition } from '../../gotoSymbol/browser/goToSymbol.js
 import { goToDefinitionWithLocation } from '../../inlayHints/browser/inlayHintsLocations.js';
 import { Position } from '../../../common/core/position.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
-import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
-import { ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.service.js';
+import { ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.service.js';
 import { addDisposableListener, EventType, getWindow, trackFocus, addStandardDisposableListener, isHTMLElement } from '../../../../base/browser/dom.js';
 import { StickyRange } from './stickyScrollElement.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.d.ts

@@ -1,8 +1,8 @@
 import { Disposable, IDisposable } from "../../../../base/common/lifecycle.js";
 import { IActiveCodeEditor } from "../../../browser/editorBrowser.js";
-import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.js";
+import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.service.js";
 import { CancellationToken } from "../../../../base/common/cancellation.js";
-import { ILanguageConfigurationService } from "../../../common/languages/languageConfigurationRegistry.js";
+import { ILanguageConfigurationService } from "../../../common/languages/languageConfigurationRegistry.service.js";
 import { StickyModel } from "./stickyScrollElement.js";
 export interface IStickyModelProvider extends IDisposable {
     update(token: CancellationToken): Promise<StickyModel | null>;

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

@@ -1,13 +1,13 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.service.js';
 import { OutlineModel, OutlineGroup, OutlineElement } from '../../documentSymbols/browser/outlineModel.js';
 import { Delayer, createCancelablePromise } from '../../../../base/common/async.js';
 import { RangesLimitReporter, FoldingController } from '../../folding/browser/folding.js';
 import { SyntaxRangeProvider } from '../../folding/browser/syntaxRangeProvider.js';
 import { IndentRangeProvider } from '../../folding/browser/indentRangeProvider.js';
-import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.service.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { StickyModel, StickyRange, StickyElement } from './stickyScrollElement.js';
 import { Iterable } from '../../../../base/common/iterator.js';

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.d.ts

@@ -1,8 +1,8 @@
 import { Disposable } from "../../../../base/common/lifecycle.js";
 import { ICodeEditor } from "../../../browser/editorBrowser.js";
-import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.js";
+import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.service.js";
 import { Event } from "../../../../base/common/event.js";
-import { ILanguageConfigurationService } from "../../../common/languages/languageConfigurationRegistry.js";
+import { ILanguageConfigurationService } from "../../../common/languages/languageConfigurationRegistry.service.js";
 import { StickyElement, StickyRange } from "./stickyScrollElement.js";
 export declare class StickyLineCandidate {
     readonly startLineNumber: number;

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

@@ -1,13 +1,13 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
-import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.service.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { binarySearch } from '../../../../base/common/arrays.js';
 import { Emitter } from '../../../../base/common/event.js';
-import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.service.js';
 import { StickyModelProvider } from './stickyScrollModelProvider.js';
 
 class StickyLineCandidate {

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

@@ -317,6 +317,7 @@ class StickyScrollWidget extends Disposable {
         const foldingIcon = this._renderFoldingIconForLine(foldingModel, line);
         if (foldingIcon) {
             lineNumberHTMLNode.appendChild(foldingIcon.domNode);
+            foldingIcon.domNode.style.left = `${layoutInfo.lineNumbersWidth + layoutInfo.lineNumbersLeft}px`;
         }
         this._editor.applyFontInfo(lineHTMLNode);
         this._editor.applyFontInfo(lineNumberHTMLNode);
@@ -455,8 +456,9 @@ class StickyFoldingIcon {
         this.foldingEndLine = foldingEndLine;
         this.dimension = dimension;
         this.domNode = document.createElement('div');
-        this.domNode.style.width = `${dimension}px`;
+        this.domNode.style.width = `26px`;
         this.domNode.style.height = `${dimension}px`;
+        this.domNode.style.lineHeight = `${dimension}px`;
         this.domNode.className = ThemeIcon.asClassName(isCollapsed ? foldingCollapsedIcon : foldingExpandedIcon);
     }
     setVisible(visible) {