@codingame/monaco-vscode-api 5.3.0 → 6.0.0

package/vscode/src/vs/editor/common/model.js

@@ -12,6 +12,16 @@ var GlyphMarginLane;
     GlyphMarginLane[GlyphMarginLane["Center"] = 2] = "Center";
     GlyphMarginLane[GlyphMarginLane["Right"] = 3] = "Right";
 })(GlyphMarginLane || (GlyphMarginLane = {})));
+var MinimapPosition;
+( (function(MinimapPosition) {
+    MinimapPosition[MinimapPosition["Inline"] = 1] = "Inline";
+    MinimapPosition[MinimapPosition["Gutter"] = 2] = "Gutter";
+})(MinimapPosition || (MinimapPosition = {})));
+var MinimapSectionHeaderStyle;
+( (function(MinimapSectionHeaderStyle) {
+    MinimapSectionHeaderStyle[MinimapSectionHeaderStyle["Normal"] = 1] = "Normal";
+    MinimapSectionHeaderStyle[MinimapSectionHeaderStyle["Underlined"] = 2] = "Underlined";
+})(MinimapSectionHeaderStyle || (MinimapSectionHeaderStyle = {})));
 var InjectedTextCursorStops;
 ( (function(InjectedTextCursorStops) {
     InjectedTextCursorStops[InjectedTextCursorStops["Both"] = 0] = "Both";
@@ -19,6 +29,22 @@ var InjectedTextCursorStops;
     InjectedTextCursorStops[InjectedTextCursorStops["Left"] = 2] = "Left";
     InjectedTextCursorStops[InjectedTextCursorStops["None"] = 3] = "None";
 })(InjectedTextCursorStops || (InjectedTextCursorStops = {})));
+var EndOfLinePreference;
+( (function(EndOfLinePreference) {
+    EndOfLinePreference[EndOfLinePreference["TextDefined"] = 0] = "TextDefined";
+    EndOfLinePreference[EndOfLinePreference["LF"] = 1] = "LF";
+    EndOfLinePreference[EndOfLinePreference["CRLF"] = 2] = "CRLF";
+})(EndOfLinePreference || (EndOfLinePreference = {})));
+var DefaultEndOfLine;
+( (function(DefaultEndOfLine) {
+    DefaultEndOfLine[DefaultEndOfLine["LF"] = 1] = "LF";
+    DefaultEndOfLine[DefaultEndOfLine["CRLF"] = 2] = "CRLF";
+})(DefaultEndOfLine || (DefaultEndOfLine = {})));
+var EndOfLineSequence;
+( (function(EndOfLineSequence) {
+    EndOfLineSequence[EndOfLineSequence["LF"] = 0] = "LF";
+    EndOfLineSequence[EndOfLineSequence["CRLF"] = 1] = "CRLF";
+})(EndOfLineSequence || (EndOfLineSequence = {})));
 class TextModelResolvedOptions {
     get originalIndentSize() {
         return this._indentSizeIsTabSize ? 'tabSize' : this.indentSize;
@@ -64,9 +90,28 @@ class FindMatch {
         this.matches = matches;
     }
 }
+var TrackedRangeStickiness;
+( (function(TrackedRangeStickiness) {
+    TrackedRangeStickiness[TrackedRangeStickiness["AlwaysGrowsWhenTypingAtEdges"] = 0] = "AlwaysGrowsWhenTypingAtEdges";
+    TrackedRangeStickiness[TrackedRangeStickiness["NeverGrowsWhenTypingAtEdges"] = 1] = "NeverGrowsWhenTypingAtEdges";
+    TrackedRangeStickiness[TrackedRangeStickiness["GrowsOnlyWhenTypingBefore"] = 2] = "GrowsOnlyWhenTypingBefore";
+    TrackedRangeStickiness[TrackedRangeStickiness["GrowsOnlyWhenTypingAfter"] = 3] = "GrowsOnlyWhenTypingAfter";
+})(TrackedRangeStickiness || (TrackedRangeStickiness = {})));
 function isITextSnapshot(obj) {
     return (obj && typeof obj.read === 'function');
 }
+var PositionAffinity;
+( (function(PositionAffinity) {
+    PositionAffinity[PositionAffinity["Left"] = 0] = "Left";
+    PositionAffinity[PositionAffinity["Right"] = 1] = "Right";
+    PositionAffinity[PositionAffinity["None"] = 2] = "None";
+    PositionAffinity[PositionAffinity["LeftOfInjectedText"] = 3] = "LeftOfInjectedText";
+    PositionAffinity[PositionAffinity["RightOfInjectedText"] = 4] = "RightOfInjectedText";
+})(PositionAffinity || (PositionAffinity = {})));
+var ModelConstants;
+( (function(ModelConstants) {
+    ModelConstants[ModelConstants["FIRST_LINE_DETECTION_LENGTH_LIMIT"] = 1000] = "FIRST_LINE_DETECTION_LENGTH_LIMIT";
+})(ModelConstants || (ModelConstants = {})));
 class ValidAnnotatedEditOperation {
     constructor(identifier, range, text, forceMoveMarkers, isAutoWhitespaceEdit, _isTracked) {
         this.identifier = identifier;
@@ -94,4 +139,4 @@ class ApplyEditsResult {
 function shouldSynchronizeModel(model) {
     return (!model.isTooLargeForSyncing() && !model.isForSimpleWidget);
 }
-export { ApplyEditsResult, FindMatch, GlyphMarginLane, InjectedTextCursorStops, OverviewRulerLane, SearchData, TextModelResolvedOptions, ValidAnnotatedEditOperation, isITextSnapshot, shouldSynchronizeModel };
+export { ApplyEditsResult, DefaultEndOfLine, EndOfLinePreference, EndOfLineSequence, FindMatch, GlyphMarginLane, InjectedTextCursorStops, MinimapPosition, MinimapSectionHeaderStyle, ModelConstants, OverviewRulerLane, PositionAffinity, SearchData, TextModelResolvedOptions, TrackedRangeStickiness, ValidAnnotatedEditOperation, isITextSnapshot, shouldSynchronizeModel };

package/vscode/src/vs/editor/common/modelLineProjectionData.js

@@ -1,6 +1,6 @@
 import { assertNever } from '../../base/common/assert.js';
 import { Position } from './core/position.js';
-import { InjectedTextCursorStops } from './model.js';
+import { PositionAffinity, InjectedTextCursorStops } from './model.js';
 class ModelLineProjectionData {
     constructor(injectionOffsets,
     injectionOptions,
@@ -56,14 +56,14 @@ class ModelLineProjectionData {
         }
         return offsetInInput;
     }
-    translateToOutputPosition(inputOffset, affinity = 2 ) {
+    translateToOutputPosition(inputOffset, affinity = PositionAffinity.None) {
         let inputOffsetInInputWithInjection = inputOffset;
         if (this.injectionOffsets !== null) {
             for (let i = 0; i < this.injectionOffsets.length; i++) {
                 if (inputOffset < this.injectionOffsets[i]) {
                     break;
                 }
-                if (affinity !== 1  && inputOffset === this.injectionOffsets[i]) {
+                if (affinity !== PositionAffinity.Right && inputOffset === this.injectionOffsets[i]) {
                     break;
                 }
                 inputOffsetInInputWithInjection += this.injectionOptions[i].content.length;
@@ -71,7 +71,7 @@ class ModelLineProjectionData {
         }
         return this.offsetInInputWithInjectionsToOutputPosition(inputOffsetInInputWithInjection, affinity);
     }
-    offsetInInputWithInjectionsToOutputPosition(offsetInInputWithInjections, affinity = 2 ) {
+    offsetInInputWithInjectionsToOutputPosition(offsetInInputWithInjections, affinity = PositionAffinity.None) {
         let low = 0;
         let high = this.breakOffsets.length - 1;
         let mid = 0;
@@ -80,7 +80,7 @@ class ModelLineProjectionData {
             mid = low + ((high - low) / 2) | 0;
             const midStop = this.breakOffsets[mid];
             midStart = mid > 0 ? this.breakOffsets[mid - 1] : 0;
-            if (affinity === 0 ) {
+            if (affinity === PositionAffinity.Left) {
                 if (offsetInInputWithInjections <= midStart) {
                     high = mid - 1;
                 }
@@ -117,12 +117,12 @@ class ModelLineProjectionData {
                 return this.offsetInInputWithInjectionsToOutputPosition(normalizedOffsetInUnwrappedLine, affinity);
             }
         }
-        if (affinity === 0 ) {
+        if (affinity === PositionAffinity.Left) {
             if (outputLineIndex > 0 && outputOffset === this.getMinOutputOffset(outputLineIndex)) {
                 return ( new OutputPosition(outputLineIndex - 1, this.getMaxOutputOffset(outputLineIndex - 1)));
             }
         }
-        else if (affinity === 1 ) {
+        else if (affinity === PositionAffinity.Right) {
             const maxOutputLineIndex = this.getOutputLineCount() - 1;
             if (outputLineIndex < maxOutputLineIndex && outputOffset === this.getMaxOutputOffset(outputLineIndex)) {
                 return ( new OutputPosition(outputLineIndex + 1, this.getMinOutputOffset(outputLineIndex + 1)));
@@ -142,7 +142,7 @@ class ModelLineProjectionData {
         if (!injectedText) {
             return offsetInInputWithInjections;
         }
-        if (affinity === 2 ) {
+        if (affinity === PositionAffinity.None) {
             if (offsetInInputWithInjections === injectedText.offsetInInputWithInjections + injectedText.length
                 && hasRightCursorStop(this.injectionOptions[injectedText.injectedTextIndex].cursorStops)) {
                 return injectedText.offsetInInputWithInjections + injectedText.length;
@@ -166,7 +166,7 @@ class ModelLineProjectionData {
                 return result;
             }
         }
-        else if (affinity === 1  || affinity === 4 ) {
+        else if (affinity === PositionAffinity.Right || affinity === PositionAffinity.RightOfInjectedText) {
             let result = injectedText.offsetInInputWithInjections + injectedText.length;
             let index = injectedText.injectedTextIndex;
             while (index + 1 < this.injectionOffsets.length && this.injectionOffsets[index + 1] === this.injectionOffsets[index]) {
@@ -175,7 +175,7 @@ class ModelLineProjectionData {
             }
             return result;
         }
-        else if (affinity === 0  || affinity === 3 ) {
+        else if (affinity === PositionAffinity.Left || affinity === PositionAffinity.LeftOfInjectedText) {
             let result = injectedText.offsetInInputWithInjections;
             let index = injectedText.injectedTextIndex;
             while (index - 1 >= 0 && this.injectionOffsets[index - 1] === this.injectionOffsets[index]) {

package/vscode/src/vs/editor/common/services/editorBaseApi.js

@@ -1,6 +1,6 @@
 import { CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { Emitter } from '../../../base/common/event.js';
-import { KeyChord } from '../../../base/common/keyCodes.js';
+import { KeyMod as KeyMod$1, KeyChord } from '../../../base/common/keyCodes.js';
 import { URI } from '../../../base/common/uri.js';
 import { Position } from '../core/position.js';
 import { Range } from '../core/range.js';
@@ -8,10 +8,10 @@ import { Selection } from '../core/selection.js';
 import { Token } from '../languages.js';
 import { KeyCode, SelectionDirection, MarkerSeverity, MarkerTag } from '../standalone/standaloneEnums.js';
 class KeyMod {
-    static { this.CtrlCmd = 2048 ; }
-    static { this.Shift = 1024 ; }
-    static { this.Alt = 512 ; }
-    static { this.WinCtrl = 256 ; }
+    static { this.CtrlCmd = KeyMod$1.CtrlCmd; }
+    static { this.Shift = KeyMod$1.Shift; }
+    static { this.Alt = KeyMod$1.Alt; }
+    static { this.WinCtrl = KeyMod$1.WinCtrl; }
     static chord(firstPart, secondPart) {
         return KeyChord(firstPart, secondPart);
     }

package/vscode/src/vs/editor/common/services/findSectionHeaders.js

@@ -1,4 +1,4 @@
-const markRegex = /\bMARK:\s*(.*)$/d;
+const markRegex = ( new RegExp('\\bMARK:\\s*(.*)$', 'd'));
 const trimDashesRegex = /^-+|-+$/g;
 function findSectionHeaders(model, options) {
     let headers = [];

package/vscode/src/vs/editor/common/services/getIconClasses.js

@@ -1,12 +1,17 @@
 import { Schemas } from '../../../base/common/network.js';
 import { DataUri } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../languages/modesRegistry.js';
 import { FileKind } from '../../../platform/files/common/files.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
 const fileIconDirectoryRegex = /(?:\/|^)(?:([^\/]+)\/)?([^\/]+)$/;
 function getIconClasses(modelService, languageService, resource, fileKind, icon) {
-    if (icon) {
+    if (ThemeIcon.isThemeIcon(icon)) {
         return [`codicon-${icon.id}`, 'predefined-file-icon'];
     }
+    if (URI.isUri(icon)) {
+        return [];
+    }
     const classes = fileKind === FileKind.ROOT_FOLDER ? ['rootfolder-icon'] : fileKind === FileKind.FOLDER ? ['folder-icon'] : ['file-icon'];
     if (resource) {
         let name;

package/vscode/src/vs/editor/common/services/languageFeatureDebounce.js

@@ -3,7 +3,7 @@ import { doHash } from '../../../base/common/hash.js';
 import { LRUCache } from '../../../base/common/map.js';
 import { clamp, SlidingWindowAverage, MovingAverage } from '../../../base/common/numbers.js';
 import { IEnvironmentService } from '../../../platform/environment/common/environment.service.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 { ILogService } from '../../../platform/log/common/log.service.js';
 import { matchesScheme } from '../../../base/common/network.js';
@@ -124,5 +124,5 @@ LanguageFeatureDebounceService = ( __decorate([
     ( __param(0, ILogService)),
     ( __param(1, IEnvironmentService))
 ], LanguageFeatureDebounceService));
-registerSingleton(ILanguageFeatureDebounceService, LanguageFeatureDebounceService, 1 );
+registerSingleton(ILanguageFeatureDebounceService, LanguageFeatureDebounceService, InstantiationType.Delayed);
 export { ILanguageFeatureDebounceService, LanguageFeatureDebounceService };

package/vscode/src/vs/editor/common/services/languageFeaturesService.js

@@ -1,6 +1,6 @@
 import { LanguageFeatureRegistry } from '../languageFeatureRegistry.js';
 import { ILanguageFeaturesService } from './languageFeatures.js';
-import { registerSingleton } from '../../../platform/instantiation/common/extensions.js';
+import { registerSingleton, InstantiationType } from '../../../platform/instantiation/common/extensions.js';
 class LanguageFeaturesService {
     constructor() {
         this.referenceProvider = ( new LanguageFeatureRegistry(this._score.bind(this)));
@@ -44,5 +44,5 @@ class LanguageFeaturesService {
         return this._notebookTypeResolver?.(uri);
     }
 }
-registerSingleton(ILanguageFeaturesService, LanguageFeaturesService, 1 );
+registerSingleton(ILanguageFeaturesService, LanguageFeaturesService, InstantiationType.Delayed);
 export { LanguageFeaturesService };

package/vscode/src/vs/editor/common/services/languagesRegistry.js

@@ -2,6 +2,7 @@ import { Emitter } from '../../../base/common/event.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { regExpLeadsToEndlessLoop, compareIgnoreCase } from '../../../base/common/strings.js';
 import { clearPlatformLanguageAssociations, registerPlatformLanguageAssociation, getLanguageIds } from './languagesAssociations.js';
+import { LanguageId } from '../encodedTokenAttributes.js';
 import { ModesRegistry, PLAINTEXT_LANGUAGE_ID } from '../languages/modesRegistry.js';
 import { Extensions } from '../../../platform/configuration/common/configurationRegistry.js';
 import { Registry } from '../../../platform/registry/common/platform.js';
@@ -11,8 +12,8 @@ class LanguageIdCodec {
     constructor() {
         this._languageIdToLanguage = [];
         this._languageToLanguageId = ( new Map());
-        this._register(NULL_LANGUAGE_ID, 0 );
-        this._register(PLAINTEXT_LANGUAGE_ID, 1 );
+        this._register(NULL_LANGUAGE_ID, LanguageId.Null);
+        this._register(PLAINTEXT_LANGUAGE_ID, LanguageId.PlainText);
         this._nextLanguageId = 2;
     }
     _register(language, languageId) {
@@ -27,7 +28,7 @@ class LanguageIdCodec {
         this._register(language, languageId);
     }
     encodeLanguageId(languageId) {
-        return this._languageToLanguageId.get(languageId) || 0 ;
+        return this._languageToLanguageId.get(languageId) || LanguageId.Null;
     }
     decodeLanguageId(languageId) {
         return this._languageIdToLanguage[languageId] || NULL_LANGUAGE_ID;

package/vscode/src/vs/editor/common/services/markerDecorationsService.js

@@ -1,8 +1,9 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { MarkerSeverity } from '../../../platform/markers/common/markers.js';
+import { MarkerSeverity, MarkerTag } from '../../../platform/markers/common/markers.js';
 import { IMarkerService } from '../../../platform/markers/common/markers.service.js';
 import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
-import { OverviewRulerLane } from '../model.js';
+import { TrackedRangeStickiness, OverviewRulerLane, MinimapPosition } from '../model.js';
+import { ClassName } from '../model/intervalTree.js';
 import { themeColorFromId } from '../../../platform/theme/common/themeService.js';
 import { overviewRulerError, overviewRulerWarning, overviewRulerInfo } from '../core/editorColorRegistry.js';
 import { IModelService } from './model.js';
@@ -129,7 +130,7 @@ class MarkerDecorations extends Disposable {
     }
     _createDecorationRange(model, rawMarker) {
         let ret = Range.lift(rawMarker);
-        if (rawMarker.severity === MarkerSeverity.Hint && !this._hasMarkerTag(rawMarker, 1 ) && !this._hasMarkerTag(rawMarker, 2 )) {
+        if (rawMarker.severity === MarkerSeverity.Hint && !this._hasMarkerTag(rawMarker, MarkerTag.Unnecessary) && !this._hasMarkerTag(rawMarker, MarkerTag.Deprecated)) {
             ret = ret.setEndPosition(ret.startLineNumber, ret.startColumn + 2);
         }
         ret = model.validateRange(ret);
@@ -161,57 +162,57 @@ class MarkerDecorations extends Disposable {
         let minimap;
         switch (marker.severity) {
             case MarkerSeverity.Hint:
-                if (this._hasMarkerTag(marker, 2 )) {
+                if (this._hasMarkerTag(marker, MarkerTag.Deprecated)) {
                     className = undefined;
                 }
-                else if (this._hasMarkerTag(marker, 1 )) {
-                    className = "squiggly-unnecessary" ;
+                else if (this._hasMarkerTag(marker, MarkerTag.Unnecessary)) {
+                    className = ClassName.EditorUnnecessaryDecoration;
                 }
                 else {
-                    className = "squiggly-hint" ;
+                    className = ClassName.EditorHintDecoration;
                 }
                 zIndex = 0;
                 break;
             case MarkerSeverity.Info:
-                className = "squiggly-info" ;
+                className = ClassName.EditorInfoDecoration;
                 color = themeColorFromId(overviewRulerInfo);
                 zIndex = 10;
                 minimap = {
                     color: themeColorFromId(minimapInfo),
-                    position: 1
+                    position: MinimapPosition.Inline
                 };
                 break;
             case MarkerSeverity.Warning:
-                className = "squiggly-warning" ;
+                className = ClassName.EditorWarningDecoration;
                 color = themeColorFromId(overviewRulerWarning);
                 zIndex = 20;
                 minimap = {
                     color: themeColorFromId(minimapWarning),
-                    position: 1
+                    position: MinimapPosition.Inline
                 };
                 break;
             case MarkerSeverity.Error:
             default:
-                className = "squiggly-error" ;
+                className = ClassName.EditorErrorDecoration;
                 color = themeColorFromId(overviewRulerError);
                 zIndex = 30;
                 minimap = {
                     color: themeColorFromId(minimapError),
-                    position: 1
+                    position: MinimapPosition.Inline
                 };
                 break;
         }
         if (marker.tags) {
-            if (marker.tags.indexOf(1 ) !== -1) {
-                inlineClassName = "squiggly-inline-unnecessary" ;
+            if (marker.tags.indexOf(MarkerTag.Unnecessary) !== -1) {
+                inlineClassName = ClassName.EditorUnnecessaryInlineDecoration;
             }
-            if (marker.tags.indexOf(2 ) !== -1) {
-                inlineClassName = "squiggly-inline-deprecated" ;
+            if (marker.tags.indexOf(MarkerTag.Deprecated) !== -1) {
+                inlineClassName = ClassName.EditorDeprecatedInlineDecoration;
             }
         }
         return {
             description: 'marker-decoration',
-            stickiness: 1 ,
+            stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
             className,
             showIfCollapsed: true,
             overviewRuler: {

package/vscode/src/vs/editor/common/services/modelService.js

@@ -1,9 +1,10 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { Emitter } from '../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
-import { OS, isLinux, isMacintosh } from '../../../base/common/platform.js';
+import { OS, OperatingSystem, isLinux, isMacintosh } from '../../../base/common/platform.js';
 import { EditOperation } from '../core/editOperation.js';
 import { Range } from '../core/range.js';
+import { DefaultEndOfLine, EndOfLineSequence, EndOfLinePreference } from '../model.js';
 import { createTextBuffer, TextModel } from '../model/textModel.js';
 import { EDITOR_MODEL_DEFAULTS } from '../core/textModelDefaults.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../languages/modesRegistry.js';
@@ -32,7 +33,7 @@ class ModelData {
         this._modelEventListeners.dispose();
     }
 }
-const DEFAULT_EOL = (isLinux || isMacintosh) ? 1  : 2 ;
+const DEFAULT_EOL = (isLinux || isMacintosh) ? DefaultEndOfLine.LF : DefaultEndOfLine.CRLF;
 class DisposedModelInfo {
     constructor(uri, initialUndoRedoSnapshot, time, sharesUndoRedoStack, heapSize, sha1, versionId, alternativeVersionId) {
         this.uri = uri;
@@ -93,10 +94,10 @@ let ModelService = class ModelService extends Disposable {
         let newDefaultEOL = DEFAULT_EOL;
         const eol = config.eol;
         if (eol === '\r\n') {
-            newDefaultEOL = 2 ;
+            newDefaultEOL = DefaultEndOfLine.CRLF;
         }
         else if (eol === '\n') {
-            newDefaultEOL = 1 ;
+            newDefaultEOL = DefaultEndOfLine.LF;
         }
         let trimAutoWhitespace = EDITOR_MODEL_DEFAULTS.trimAutoWhitespace;
         if (config.editor && typeof config.editor.trimAutoWhitespace !== 'undefined') {
@@ -137,7 +138,7 @@ let ModelService = class ModelService extends Disposable {
         if (eol && typeof eol === 'string' && eol !== 'auto') {
             return eol;
         }
-        return OS === 3  || OS === 2  ? '\n' : '\r\n';
+        return OS === OperatingSystem.Linux || OS === OperatingSystem.Macintosh ? '\n' : '\r\n';
     }
     _shouldRestoreUndoStack() {
         const result = this._configurationService.getValue('files.restoreUndoStack');
@@ -176,7 +177,7 @@ let ModelService = class ModelService extends Disposable {
     }
     static _setModelOptionsForModel(model, newOptions, currentOptions) {
         if (currentOptions && currentOptions.defaultEOL !== newOptions.defaultEOL && model.getLineCount() === 1) {
-            model.setEOL(newOptions.defaultEOL === 1  ? 0  : 1 );
+            model.setEOL(newOptions.defaultEOL === DefaultEndOfLine.LF ? EndOfLineSequence.LF : EndOfLineSequence.CRLF);
         }
         if (currentOptions
             && (currentOptions.detectIndentation === newOptions.detectIndentation)
@@ -296,7 +297,7 @@ let ModelService = class ModelService extends Disposable {
             return;
         }
         model.pushStackElement();
-        model.pushEOL(textBuffer.getEOL() === '\r\n' ? 1  : 0 );
+        model.pushEOL(textBuffer.getEOL() === '\r\n' ? EndOfLineSequence.CRLF : EndOfLineSequence.LF);
         model.pushEditOperations([], ModelService_1._computeEdits(model, textBuffer), () => []);
         model.pushStackElement();
         disposable.dispose();
@@ -354,7 +355,7 @@ let ModelService = class ModelService extends Disposable {
                 1 + textBuffer.getLineLength(textBufferLineCount)
             ));
         }
-        return [EditOperation.replaceMove(oldRange, textBuffer.getValueInRange(newRange, 0 ))];
+        return [EditOperation.replaceMove(oldRange, textBuffer.getValueInRange(newRange, EndOfLinePreference.TextDefined))];
     }
     createModel(value, languageSelection, resource, isForSimpleWidget = false) {
         let modelData;

package/vscode/src/vs/editor/common/services/semanticTokensDto.js

@@ -1,5 +1,10 @@
 import { VSBuffer } from '../../../base/common/buffer.js';
 import { isLittleEndian } from '../../../base/common/platform.js';
+var EncodedSemanticTokensType;
+( (function(EncodedSemanticTokensType) {
+    EncodedSemanticTokensType[EncodedSemanticTokensType["Full"] = 1] = "Full";
+    EncodedSemanticTokensType[EncodedSemanticTokensType["Delta"] = 2] = "Delta";
+})(EncodedSemanticTokensType || (EncodedSemanticTokensType = {})));
 function reverseEndianness(arr) {
     for (let i = 0, len = arr.length; i < len; i += 4) {
         const b0 = arr[i + 0];
@@ -38,13 +43,13 @@ function encodeSemanticTokensDto(semanticTokens) {
     let offset = 0;
     dest[offset++] = semanticTokens.id;
     if (semanticTokens.type === 'full') {
-        dest[offset++] = 1 ;
+        dest[offset++] = EncodedSemanticTokensType.Full;
         dest[offset++] = semanticTokens.data.length;
         dest.set(semanticTokens.data, offset);
         offset += semanticTokens.data.length;
     }
     else {
-        dest[offset++] = 2 ;
+        dest[offset++] = EncodedSemanticTokensType.Delta;
         dest[offset++] = semanticTokens.deltas.length;
         for (const delta of semanticTokens.deltas) {
             dest[offset++] = delta.start;
@@ -90,7 +95,7 @@ function decodeSemanticTokensDto(_buff) {
     let offset = 0;
     const id = src[offset++];
     const type = src[offset++];
-    if (type === 1 ) {
+    if (type === EncodedSemanticTokensType.Full) {
         const length = src[offset++];
         const data = src.subarray(offset, offset + length);
         offset += length;

package/vscode/src/vs/editor/common/services/semanticTokensProviderStyling.js

@@ -1,10 +1,16 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { TokenMetadata } from '../encodedTokenAttributes.js';
+import { TokenMetadata, MetadataConsts, FontStyle } from '../encodedTokenAttributes.js';
 import { IThemeService } from '../../../platform/theme/common/themeService.service.js';
 import { LogLevel } from '../../../platform/log/common/log.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { SparseMultilineTokens } from '../tokens/sparseMultilineTokens.js';
 import { ILanguageService } from '../languages/language.js';
+var SemanticTokensProviderStylingConstants;
+( (function(SemanticTokensProviderStylingConstants) {
+    SemanticTokensProviderStylingConstants[SemanticTokensProviderStylingConstants["NO_STYLING"] = 2147483647] = "NO_STYLING";
+})(
+    SemanticTokensProviderStylingConstants || (SemanticTokensProviderStylingConstants = {})
+));
 let SemanticTokensProviderStyling = class SemanticTokensProviderStyling {
     constructor(_legend, _themeService, _languageService, _logService) {
         this._legend = _legend;
@@ -43,32 +49,32 @@ let SemanticTokensProviderStyling = class SemanticTokensProviderStyling {
                 }
                 const tokenStyle = this._themeService.getColorTheme().getTokenStyleMetadata(tokenType, tokenModifiers, languageId);
                 if (typeof tokenStyle === 'undefined') {
-                    metadata = 2147483647 ;
+                    metadata = SemanticTokensProviderStylingConstants.NO_STYLING;
                 }
                 else {
                     metadata = 0;
                     if (typeof tokenStyle.italic !== 'undefined') {
-                        const italicBit = (tokenStyle.italic ? 1  : 0) << 11 ;
-                        metadata |= italicBit | 1 ;
+                        const italicBit = (tokenStyle.italic ? FontStyle.Italic : 0) << MetadataConsts.FONT_STYLE_OFFSET;
+                        metadata |= italicBit | MetadataConsts.SEMANTIC_USE_ITALIC;
                     }
                     if (typeof tokenStyle.bold !== 'undefined') {
-                        const boldBit = (tokenStyle.bold ? 2  : 0) << 11 ;
-                        metadata |= boldBit | 2 ;
+                        const boldBit = (tokenStyle.bold ? FontStyle.Bold : 0) << MetadataConsts.FONT_STYLE_OFFSET;
+                        metadata |= boldBit | MetadataConsts.SEMANTIC_USE_BOLD;
                     }
                     if (typeof tokenStyle.underline !== 'undefined') {
-                        const underlineBit = (tokenStyle.underline ? 4  : 0) << 11 ;
-                        metadata |= underlineBit | 4 ;
+                        const underlineBit = (tokenStyle.underline ? FontStyle.Underline : 0) << MetadataConsts.FONT_STYLE_OFFSET;
+                        metadata |= underlineBit | MetadataConsts.SEMANTIC_USE_UNDERLINE;
                     }
                     if (typeof tokenStyle.strikethrough !== 'undefined') {
-                        const strikethroughBit = (tokenStyle.strikethrough ? 8  : 0) << 11 ;
-                        metadata |= strikethroughBit | 8 ;
+                        const strikethroughBit = (tokenStyle.strikethrough ? FontStyle.Strikethrough : 0) << MetadataConsts.FONT_STYLE_OFFSET;
+                        metadata |= strikethroughBit | MetadataConsts.SEMANTIC_USE_STRIKETHROUGH;
                     }
                     if (tokenStyle.foreground) {
-                        const foregroundBits = (tokenStyle.foreground) << 15 ;
-                        metadata |= foregroundBits | 16 ;
+                        const foregroundBits = (tokenStyle.foreground) << MetadataConsts.FOREGROUND_OFFSET;
+                        metadata |= foregroundBits | MetadataConsts.SEMANTIC_USE_FOREGROUND;
                     }
                     if (metadata === 0) {
-                        metadata = 2147483647 ;
+                        metadata = SemanticTokensProviderStylingConstants.NO_STYLING;
                     }
                 }
             }
@@ -76,7 +82,7 @@ let SemanticTokensProviderStyling = class SemanticTokensProviderStyling {
                 if (this._logService.getLevel() === LogLevel.Trace) {
                     this._logService.trace(`SemanticTokensProviderStyling: unknown token type index: ${tokenTypeIndex} for legend: ${JSON.stringify(this._legend.tokenTypes)}`);
                 }
-                metadata = 2147483647 ;
+                metadata = SemanticTokensProviderStylingConstants.NO_STYLING;
                 tokenType = 'not-in-legend';
             }
             this._hashTable.add(tokenTypeIndex, tokenModifierSet, encodedLanguageId, metadata);
@@ -110,10 +116,15 @@ SemanticTokensProviderStyling = ( __decorate([
     ( __param(2, ILanguageService)),
     ( __param(3, ILogService))
 ], SemanticTokensProviderStyling));
+var SemanticColoringConstants;
+( (function(SemanticColoringConstants) {
+    SemanticColoringConstants[SemanticColoringConstants["DesiredTokensPerArea"] = 400] = "DesiredTokensPerArea";
+    SemanticColoringConstants[SemanticColoringConstants["DesiredMaxAreas"] = 1024] = "DesiredMaxAreas";
+})(SemanticColoringConstants || (SemanticColoringConstants = {})));
 function toMultilineTokens2(tokens, styling, languageId) {
     const srcData = tokens.data;
     const tokenCount = (tokens.data.length / 5) | 0;
-    const tokensPerArea = Math.max(Math.ceil(tokenCount / 1024 ), 400 );
+    const tokensPerArea = Math.max(Math.ceil(tokenCount / SemanticColoringConstants.DesiredMaxAreas), SemanticColoringConstants.DesiredTokensPerArea);
     const result = [];
     let tokenIndex = 0;
     let lastLineNumber = 1;
@@ -160,7 +171,7 @@ function toMultilineTokens2(tokens, styling, languageId) {
             }
             else {
                 const metadata = styling.getMetadata(tokenTypeIndex, tokenModifierSet, languageId);
-                if (metadata !== 2147483647 ) {
+                if (metadata !== SemanticTokensProviderStylingConstants.NO_STYLING) {
                     if (areaLine === 0) {
                         areaLine = lineNumber;
                     }

package/vscode/src/vs/editor/common/services/semanticTokensStylingService.js

@@ -5,7 +5,7 @@ import { IThemeService } from '../../../platform/theme/common/themeService.servi
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { SemanticTokensProviderStyling } from './semanticTokensProviderStyling.js';
 import { ISemanticTokensStylingService } from './semanticTokensStyling.js';
-import { registerSingleton } from '../../../platform/instantiation/common/extensions.js';
+import { registerSingleton, InstantiationType } from '../../../platform/instantiation/common/extensions.js';
 let SemanticTokensStylingService = class SemanticTokensStylingService extends Disposable {
     constructor(_themeService, _logService, _languageService) {
         super();
@@ -34,5 +34,5 @@ SemanticTokensStylingService = ( __decorate([
     ( __param(1, ILogService)),
     ( __param(2, ILanguageService))
 ], SemanticTokensStylingService));
-registerSingleton(ISemanticTokensStylingService, SemanticTokensStylingService, 1 );
+registerSingleton(ISemanticTokensStylingService, SemanticTokensStylingService, InstantiationType.Delayed);
 export { SemanticTokensStylingService };

package/vscode/src/vs/editor/common/services/treeViewsDndService.js

@@ -1,6 +1,6 @@
-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 { TreeViewsDnDService } from './treeViewsDnd.js';
 const ITreeViewsDnDService = ( createDecorator('treeViewsDndService'));
-registerSingleton(ITreeViewsDnDService, TreeViewsDnDService, 1 );
+registerSingleton(ITreeViewsDnDService, TreeViewsDnDService, InstantiationType.Delayed);
 export { ITreeViewsDnDService };