@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/editor/common/viewModel/viewModelDecorations.js

@@ -1,7 +1,9 @@
 import { Position } from '../core/position.js';
 import { Range } from '../core/range.js';
-import { ViewModelDecoration, InlineDecoration } from '../viewModel.js';
+import { PositionAffinity } from '../model.js';
+import { ViewModelDecoration, InlineDecoration, InlineDecorationType } from '../viewModel.js';
 import { filterValidationDecorations } from '../config/editorOptions.js';
+import { StandardTokenType } from '../encodedTokenAttributes.js';
 class ViewModelDecorations {
     constructor(editorId, model, configuration, linesCollection, coordinatesConverter) {
         this.editorId = editorId;
@@ -41,15 +43,15 @@ class ViewModelDecorations {
             const options = modelDecoration.options;
             let viewRange;
             if (options.isWholeLine) {
-                const start = this._coordinatesConverter.convertModelPositionToViewPosition(( new Position(modelRange.startLineNumber, 1)), 0 , false, true);
+                const start = this._coordinatesConverter.convertModelPositionToViewPosition(( new Position(modelRange.startLineNumber, 1)), PositionAffinity.Left, false, true);
                 const end = this._coordinatesConverter.convertModelPositionToViewPosition(( new Position(
                     modelRange.endLineNumber,
                     this.model.getLineMaxColumn(modelRange.endLineNumber)
-                )), 1 );
+                )), PositionAffinity.Right);
                 viewRange = ( new Range(start.lineNumber, start.column, end.lineNumber, end.column));
             }
             else {
-                viewRange = this._coordinatesConverter.convertModelRangeToViewRange(modelRange, 1 );
+                viewRange = this._coordinatesConverter.convertModelRangeToViewRange(modelRange, PositionAffinity.Right);
             }
             r = ( new ViewModelDecoration(viewRange, options));
             this._decorationsCache[id] = r;
@@ -100,7 +102,7 @@ class ViewModelDecorations {
                 const inlineDecoration = ( new InlineDecoration(
                     viewRange,
                     decorationOptions.inlineClassName,
-                    decorationOptions.inlineClassNameAffectsLetterSpacing ? 3  : 0
+                    decorationOptions.inlineClassNameAffectsLetterSpacing ? InlineDecorationType.RegularAffectingLetterSpacing : InlineDecorationType.Regular
                 ));
                 const intersectedStartLineNumber = Math.max(startLineNumber, viewRange.startLineNumber);
                 const intersectedEndLineNumber = Math.min(endLineNumber, viewRange.endLineNumber);
@@ -115,7 +117,7 @@ class ViewModelDecorations {
                         viewRange.startColumn,
                         viewRange.startLineNumber,
                         viewRange.startColumn
-                    )), decorationOptions.beforeContentClassName, 1 ));
+                    )), decorationOptions.beforeContentClassName, InlineDecorationType.Before));
                     inlineDecorations[viewRange.startLineNumber - startLineNumber].push(inlineDecoration);
                 }
             }
@@ -126,7 +128,7 @@ class ViewModelDecorations {
                         viewRange.endColumn,
                         viewRange.endLineNumber,
                         viewRange.endColumn
-                    )), decorationOptions.afterContentClassName, 2 ));
+                    )), decorationOptions.afterContentClassName, InlineDecorationType.After));
                     inlineDecorations[viewRange.endLineNumber - startLineNumber].push(inlineDecoration);
                 }
             }
@@ -147,10 +149,10 @@ function isModelDecorationVisible(model, decoration) {
     return true;
 }
 function isModelDecorationInComment(model, decoration) {
-    return testTokensInRange(model, decoration.range, (tokenType) => tokenType === 1 );
+    return testTokensInRange(model, decoration.range, (tokenType) => tokenType === StandardTokenType.Comment);
 }
 function isModelDecorationInString(model, decoration) {
-    return testTokensInRange(model, decoration.range, (tokenType) => tokenType === 2 );
+    return testTokensInRange(model, decoration.range, (tokenType) => tokenType === StandardTokenType.String);
 }
 function testTokensInRange(model, range, callback) {
     for (let lineNumber = range.startLineNumber; lineNumber <= range.endLineNumber; lineNumber++) {

package/vscode/src/vs/editor/common/viewModel/viewModelImpl.js

@@ -4,16 +4,20 @@ import { Color } from '../../../base/common/color.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { isWindows } from '../../../base/common/platform.js';
 import { firstNonWhitespaceIndex, lastNonWhitespaceIndex } from '../../../base/common/strings.js';
-import { filterValidationDecorations, EDITOR_FONT_DEFAULTS } from '../config/editorOptions.js';
+import { EditorOption, filterValidationDecorations, EDITOR_FONT_DEFAULTS } from '../config/editorOptions.js';
 import { CursorsController } from '../cursor/cursor.js';
 import { CursorConfiguration } from '../cursorCommon.js';
+import { CursorChangeReason } from '../cursorEvents.js';
 import { Position } from '../core/position.js';
 import { Range } from '../core/range.js';
-import { InternalModelContentChangeEvent } from '../textModelEvents.js';
+import { ScrollType } from '../editorCommon.js';
+import { EndOfLinePreference, TrackedRangeStickiness } from '../model.js';
+import { RawContentChangedType, InternalModelContentChangeEvent } from '../textModelEvents.js';
 import { TokenizationRegistry } from '../languages.js';
+import { ColorId } from '../encodedTokenAttributes.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../languages/modesRegistry.js';
 import { tokenizeLineToHTML } from '../languages/textToHtmlTokenizer.js';
-import { ViewScrollChangedEvent, ViewTokensColorsChangedEvent, ViewThemeChangedEvent, ViewFocusChangedEvent, ViewCompositionStartEvent, ViewCompositionEndEvent, ViewFlushedEvent, ViewLineMappingChangedEvent, ViewDecorationsChangedEvent, ViewConfigurationChangedEvent, ViewTokensChangedEvent, ViewLanguageConfigurationEvent, ViewRevealRangeRequestEvent, ViewZonesChangedEvent } from '../viewEvents.js';
+import { ViewScrollChangedEvent, ViewTokensColorsChangedEvent, ViewThemeChangedEvent, ViewFocusChangedEvent, ViewCompositionStartEvent, ViewCompositionEndEvent, ViewFlushedEvent, ViewLineMappingChangedEvent, ViewDecorationsChangedEvent, ViewConfigurationChangedEvent, ViewTokensChangedEvent, ViewLanguageConfigurationEvent, VerticalRevealType, ViewRevealRangeRequestEvent, ViewZonesChangedEvent } from '../viewEvents.js';
 import { ViewLayout } from '../viewLayout/viewLayout.js';
 import { MinimapTokensColorTracker } from './minimapTokensColorTracker.js';
 import { ViewLineRenderingData, MinimapLinesRenderingData, OverviewRulerDecorationsGroup } from '../viewModel.js';
@@ -49,11 +53,11 @@ class ViewModel extends Disposable {
         }
         else {
             const options = this._configuration.options;
-            const fontInfo = options.get(50 );
-            const wrappingStrategy = options.get(139 );
-            const wrappingInfo = options.get(146 );
-            const wrappingIndent = options.get(138 );
-            const wordBreak = options.get(129 );
+            const fontInfo = options.get(EditorOption.fontInfo);
+            const wrappingStrategy = options.get(EditorOption.wrappingStrategy);
+            const wrappingInfo = options.get(EditorOption.wrappingInfo);
+            const wrappingIndent = options.get(EditorOption.wrappingIndent);
+            const wordBreak = options.get(EditorOption.wordBreak);
             this._lines = ( new ViewModelLinesFromProjectedModel(
                 this._editorId,
                 this.model,
@@ -182,11 +186,11 @@ class ViewModel extends Disposable {
     _onConfigurationChanged(eventsCollector, e) {
         const stableViewport = this._captureStableViewport();
         const options = this._configuration.options;
-        const fontInfo = options.get(50 );
-        const wrappingStrategy = options.get(139 );
-        const wrappingInfo = options.get(146 );
-        const wrappingIndent = options.get(138 );
-        const wordBreak = options.get(129 );
+        const fontInfo = options.get(EditorOption.fontInfo);
+        const wrappingStrategy = options.get(EditorOption.wrappingStrategy);
+        const wrappingInfo = options.get(EditorOption.wrappingInfo);
+        const wrappingIndent = options.get(EditorOption.wrappingIndent);
+        const wordBreak = options.get(EditorOption.wordBreak);
         if (this._lines.setWrappingSettings(fontInfo, wrappingStrategy, wrappingInfo.wrappingColumn, wrappingIndent, wordBreak)) {
             eventsCollector.emitViewEvent(new ViewFlushedEvent());
             eventsCollector.emitViewEvent(new ViewLineMappingChangedEvent());
@@ -196,11 +200,11 @@ class ViewModel extends Disposable {
             this.viewLayout.onFlushed(this.getLineCount());
             this._updateConfigurationViewLineCount.schedule();
         }
-        if (e.hasChanged(91 )) {
+        if (e.hasChanged(EditorOption.readOnly)) {
             this._decorations.reset();
             eventsCollector.emitViewEvent(new ViewDecorationsChangedEvent(null));
         }
-        if (e.hasChanged(98 )) {
+        if (e.hasChanged(EditorOption.renderValidationDecorations)) {
             this._decorations.reset();
             eventsCollector.emitViewEvent(new ViewDecorationsChangedEvent(null));
         }
@@ -228,7 +232,7 @@ class ViewModel extends Disposable {
                 const lineBreaksComputer = this._lines.createLineBreaksComputer();
                 for (const change of changes) {
                     switch (change.changeType) {
-                        case 4 : {
+                        case RawContentChangedType.LinesInserted: {
                             for (let lineIdx = 0; lineIdx < change.detail.length; lineIdx++) {
                                 const line = change.detail[lineIdx];
                                 let injectedText = change.injectedTexts[lineIdx];
@@ -239,7 +243,7 @@ class ViewModel extends Disposable {
                             }
                             break;
                         }
-                        case 2 : {
+                        case RawContentChangedType.LineChanged: {
                             let injectedText = null;
                             if (change.injectedText) {
                                 injectedText = change.injectedText.filter(element => (!element.ownerId || element.ownerId === this._editorId));
@@ -253,7 +257,7 @@ class ViewModel extends Disposable {
                 const lineBreakQueue = ( new ArrayQueue(lineBreaks));
                 for (const change of changes) {
                     switch (change.changeType) {
-                        case 1 : {
+                        case RawContentChangedType.Flush: {
                             this._lines.onModelFlushed();
                             eventsCollector.emitViewEvent(new ViewFlushedEvent());
                             this._decorations.reset();
@@ -261,7 +265,7 @@ class ViewModel extends Disposable {
                             hadOtherModelChange = true;
                             break;
                         }
-                        case 3 : {
+                        case RawContentChangedType.LinesDeleted: {
                             const linesDeletedEvent = this._lines.onModelLinesDeleted(versionId, change.fromLineNumber, change.toLineNumber);
                             if (linesDeletedEvent !== null) {
                                 eventsCollector.emitViewEvent(linesDeletedEvent);
@@ -270,7 +274,7 @@ class ViewModel extends Disposable {
                             hadOtherModelChange = true;
                             break;
                         }
-                        case 4 : {
+                        case RawContentChangedType.LinesInserted: {
                             const insertedLineBreaks = lineBreakQueue.takeCount(change.detail.length);
                             const linesInsertedEvent = this._lines.onModelLinesInserted(versionId, change.fromLineNumber, change.toLineNumber, insertedLineBreaks);
                             if (linesInsertedEvent !== null) {
@@ -280,7 +284,7 @@ class ViewModel extends Disposable {
                             hadOtherModelChange = true;
                             break;
                         }
-                        case 2 : {
+                        case RawContentChangedType.LineChanged: {
                             const changedLineBreakData = lineBreakQueue.dequeue();
                             const [lineMappingChanged, linesChangedEvent, linesInsertedEvent, linesDeletedEvent] = this._lines.onModelLineChanged(versionId, change.lineNumber, changedLineBreakData);
                             hadModelLineChangeThatChangedLineMapping = lineMappingChanged;
@@ -322,7 +326,7 @@ class ViewModel extends Disposable {
                 if (modelRange) {
                     const viewPosition = this.coordinatesConverter.convertModelPositionToViewPosition(modelRange.getStartPosition());
                     const viewPositionTop = this.viewLayout.getVerticalOffsetForLineNumber(viewPosition.lineNumber);
-                    this.viewLayout.setScrollPosition({ scrollTop: viewPositionTop + this._viewportStart.startLineDelta }, 1 );
+                    this.viewLayout.setScrollPosition({ scrollTop: viewPositionTop + this._viewportStart.startLineDelta }, ScrollType.Immediate);
                 }
             }
             try {
@@ -444,8 +448,8 @@ class ViewModel extends Disposable {
         }
     }
     getVisibleRangesPlusViewportAboveBelow() {
-        const layoutInfo = this._configuration.options.get(145 );
-        const lineHeight = this._configuration.options.get(67 );
+        const layoutInfo = this._configuration.options.get(EditorOption.layoutInfo);
+        const lineHeight = this._configuration.options.get(EditorOption.lineHeight);
         const linesAround = Math.max(20, Math.round(layoutInfo.height / lineHeight));
         const partialData = this.viewLayout.getLinesViewportData();
         const startViewLineNumber = Math.max(1, partialData.completelyVisibleStartLineNumber - linesAround);
@@ -741,7 +745,7 @@ class ViewModel extends Disposable {
                     }
                 }
                 else {
-                    result.push(this.model.getValueInRange(modelRange, forceCRLF ? 2  : 0 ));
+                    result.push(this.model.getValueInRange(modelRange, forceCRLF ? EndOfLinePreference.CRLF : EndOfLinePreference.TextDefined));
                 }
                 prevModelLineNumber = modelLineNumber;
             }
@@ -750,7 +754,7 @@ class ViewModel extends Disposable {
         const result = [];
         for (const modelRange of modelRanges) {
             if (!modelRange.isEmpty()) {
-                result.push(this.model.getValueInRange(modelRange, forceCRLF ? 2  : 0 ));
+                result.push(this.model.getValueInRange(modelRange, forceCRLF ? EndOfLinePreference.CRLF : EndOfLinePreference.TextDefined));
             }
         }
         return result.length === 1 ? result[0] : result;
@@ -776,7 +780,7 @@ class ViewModel extends Disposable {
                 this.model.getLineMaxColumn(lineNumber)
             ));
         }
-        const fontInfo = this._configuration.options.get(50 );
+        const fontInfo = this._configuration.options.get(EditorOption.fontInfo);
         const colorMap = this._getColorMap();
         const hasBadChars = (/[:;\\\/<>]/.test(fontInfo.fontFamily));
         const useDefaultFontFamily = (hasBadChars || fontInfo.fontFamily === EDITOR_FONT_DEFAULTS.fontFamily);
@@ -799,8 +803,8 @@ class ViewModel extends Disposable {
         return {
             mode: languageId,
             html: (`<div style="`
-                + `color: ${colorMap[1 ]};`
-                + `background-color: ${colorMap[2 ]};`
+                + `color: ${colorMap[ColorId.DefaultForeground]};`
+                + `background-color: ${colorMap[ColorId.DefaultBackground]};`
                 + `font-family: ${fontFamily};`
                 + `font-weight: ${fontInfo.fontWeight};`
                 + `font-size: ${fontInfo.fontSize}px;`
@@ -878,7 +882,7 @@ class ViewModel extends Disposable {
     getPosition() {
         return this._cursor.getPrimaryCursorState().modelState.position;
     }
-    setSelections(source, selections, reason = 0 ) {
+    setSelections(source, selections, reason = CursorChangeReason.NotSet) {
         this._withViewEventsCollector(eventsCollector => this._cursor.setSelections(eventsCollector, source, selections, reason));
     }
     saveCursorState() {
@@ -922,10 +926,10 @@ class ViewModel extends Disposable {
         this._executeCursorEdit(eventsCollector => this._cursor.executeCommands(eventsCollector, commands, source));
     }
     revealAllCursors(source, revealHorizontal, minimalReveal = false) {
-        this._withViewEventsCollector(eventsCollector => this._cursor.revealAll(eventsCollector, source, minimalReveal, 0 , revealHorizontal, 0 ));
+        this._withViewEventsCollector(eventsCollector => this._cursor.revealAll(eventsCollector, source, minimalReveal, VerticalRevealType.Simple, revealHorizontal, ScrollType.Smooth));
     }
     revealPrimaryCursor(source, revealHorizontal, minimalReveal = false) {
-        this._withViewEventsCollector(eventsCollector => this._cursor.revealPrimary(eventsCollector, source, minimalReveal, 0 , revealHorizontal, 0 ));
+        this._withViewEventsCollector(eventsCollector => this._cursor.revealPrimary(eventsCollector, source, minimalReveal, VerticalRevealType.Simple, revealHorizontal, ScrollType.Smooth));
     }
     revealTopMostCursor(source) {
         const viewPosition = this._cursor.getTopMostViewPosition();
@@ -935,7 +939,7 @@ class ViewModel extends Disposable {
             viewPosition.lineNumber,
             viewPosition.column
         ));
-        this._withViewEventsCollector(eventsCollector => eventsCollector.emitViewEvent(new ViewRevealRangeRequestEvent(source, false, viewRange, null, 0 , true, 0 )));
+        this._withViewEventsCollector(eventsCollector => eventsCollector.emitViewEvent(new ViewRevealRangeRequestEvent(source, false, viewRange, null, VerticalRevealType.Simple, true, ScrollType.Smooth)));
     }
     revealBottomMostCursor(source) {
         const viewPosition = this._cursor.getBottomMostViewPosition();
@@ -945,7 +949,7 @@ class ViewModel extends Disposable {
             viewPosition.lineNumber,
             viewPosition.column
         ));
-        this._withViewEventsCollector(eventsCollector => eventsCollector.emitViewEvent(new ViewRevealRangeRequestEvent(source, false, viewRange, null, 0 , true, 0 )));
+        this._withViewEventsCollector(eventsCollector => eventsCollector.emitViewEvent(new ViewRevealRangeRequestEvent(source, false, viewRange, null, VerticalRevealType.Simple, true, ScrollType.Smooth)));
     }
     revealRange(source, revealHorizontal, viewRange, verticalType, scrollType) {
         this._withViewEventsCollector(eventsCollector => eventsCollector.emitViewEvent(new ViewRevealRangeRequestEvent(source, false, viewRange, null, verticalType, revealHorizontal, scrollType)));
@@ -978,7 +982,7 @@ class ViewModel extends Disposable {
 }
 class ViewportStart {
     static create(model) {
-        const viewportStartLineTrackedRange = model._setTrackedRange(null, ( new Range(1, 1, 1, 1)), 1 );
+        const viewportStartLineTrackedRange = model._setTrackedRange(null, ( new Range(1, 1, 1, 1)), TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges);
         return ( new ViewportStart(model, 1, false, viewportStartLineTrackedRange, 0));
     }
     get viewLineNumber() {
@@ -1001,11 +1005,11 @@ class ViewportStart {
         this._startLineDelta = _startLineDelta;
     }
     dispose() {
-        this._model._setTrackedRange(this._modelTrackedRange, null, 1 );
+        this._model._setTrackedRange(this._modelTrackedRange, null, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges);
     }
     update(viewModel, startLineNumber) {
         const position = viewModel.coordinatesConverter.convertViewPositionToModelPosition(( new Position(startLineNumber, viewModel.getLineMinColumn(startLineNumber))));
-        const viewportStartLineTrackedRange = viewModel.model._setTrackedRange(this._modelTrackedRange, ( new Range(position.lineNumber, position.column, position.lineNumber, position.column)), 1 );
+        const viewportStartLineTrackedRange = viewModel.model._setTrackedRange(this._modelTrackedRange, ( new Range(position.lineNumber, position.column, position.lineNumber, position.column)), TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges);
         const viewportStartLineTop = viewModel.viewLayout.getVerticalOffsetForLineNumber(startLineNumber);
         const scrollTop = viewModel.viewLayout.getCurrentScrollTop();
         this._viewLineNumber = startLineNumber;
@@ -1121,7 +1125,7 @@ class StableViewport {
         }
         const viewPosition = coordinatesConverter.convertModelPositionToViewPosition(this.viewportStartModelPosition);
         const viewPositionTop = viewLayout.getVerticalOffsetForLineNumber(viewPosition.lineNumber);
-        viewLayout.setScrollPosition({ scrollTop: viewPositionTop + this.startLineDelta }, 1 );
+        viewLayout.setScrollPosition({ scrollTop: viewPositionTop + this.startLineDelta }, ScrollType.Immediate);
     }
 }
 export { ViewModel };

package/vscode/src/vs/editor/common/viewModel/viewModelLines.js

@@ -1,6 +1,7 @@
 import { ArrayQueue } from '../../../base/common/arrays.js';
 import { Position } from '../core/position.js';
 import { Range } from '../core/range.js';
+import { PositionAffinity } from '../model.js';
 import { IndentGuide, IndentGuideHorizontalLine } from '../textModelGuides.js';
 import { ModelDecorationOptions } from '../model/textModel.js';
 import { LineInjectedText } from '../textModelEvents.js';
@@ -424,9 +425,9 @@ class ViewModelLinesFromProjectedModel {
                 const viewLineStartIndex = line.getViewLineNumberOfModelPosition(0, modelLineIndex === modelStartLineIndex ? modelStart.column : 1);
                 const viewLineEndIndex = line.getViewLineNumberOfModelPosition(0, this.model.getLineMaxColumn(modelLineIndex + 1));
                 const count = viewLineEndIndex - viewLineStartIndex + 1;
-                let option = 0 ;
+                let option = IndentGuideRepeatOption.BlockNone;
                 if (count > 1 && line.getViewLineMinColumn(this.model, modelLineIndex + 1, viewLineEndIndex) === 1) {
-                    option = ((viewLineStartIndex === 0 ? 1  : 2) );
+                    option = (viewLineStartIndex === 0 ? IndentGuideRepeatOption.BlockSubsequent : IndentGuideRepeatOption.BlockAll);
                 }
                 resultRepeatCount.push(count);
                 resultRepeatOption.push(option);
@@ -453,10 +454,10 @@ class ViewModelLinesFromProjectedModel {
             const count = Math.min(viewLineCount - currIndex, resultRepeatCount[i]);
             const option = resultRepeatOption[i];
             let blockAtIndex;
-            if (option === 2 ) {
+            if (option === IndentGuideRepeatOption.BlockAll) {
                 blockAtIndex = 0;
             }
-            else if (option === 1 ) {
+            else if (option === IndentGuideRepeatOption.BlockSubsequent) {
                 blockAtIndex = 1;
             }
             else {
@@ -560,7 +561,7 @@ class ViewModelLinesFromProjectedModel {
         const end = this.convertViewPositionToModelPosition(viewRange.endLineNumber, viewRange.endColumn);
         return ( new Range(start.lineNumber, start.column, end.lineNumber, end.column));
     }
-    convertModelPositionToViewPosition(_modelLineNumber, _modelColumn, affinity = 2 , allowZeroLineNumber = false, belowHiddenRanges = false) {
+    convertModelPositionToViewPosition(_modelLineNumber, _modelColumn, affinity = PositionAffinity.None, allowZeroLineNumber = false, belowHiddenRanges = false) {
         const validPosition = this.model.validatePosition(( new Position(_modelLineNumber, _modelColumn)));
         const inputLineNumber = validPosition.lineNumber;
         const inputColumn = validPosition.column;
@@ -595,14 +596,14 @@ class ViewModelLinesFromProjectedModel {
         }
         return r;
     }
-    convertModelRangeToViewRange(modelRange, affinity = 0 ) {
+    convertModelRangeToViewRange(modelRange, affinity = PositionAffinity.Left) {
         if (modelRange.isEmpty()) {
             const start = this.convertModelPositionToViewPosition(modelRange.startLineNumber, modelRange.startColumn, affinity);
             return Range.fromPositions(start);
         }
         else {
-            const start = this.convertModelPositionToViewPosition(modelRange.startLineNumber, modelRange.startColumn, 1 );
-            const end = this.convertModelPositionToViewPosition(modelRange.endLineNumber, modelRange.endColumn, 0 );
+            const start = this.convertModelPositionToViewPosition(modelRange.startLineNumber, modelRange.startColumn, PositionAffinity.Right);
+            const end = this.convertModelPositionToViewPosition(modelRange.endLineNumber, modelRange.endColumn, PositionAffinity.Left);
             return ( new Range(start.lineNumber, start.column, end.lineNumber, end.column));
         }
     }
@@ -765,6 +766,12 @@ class CoordinatesConverter {
         return this._lines.getViewLineNumberOfModelPosition(modelLineNumber, modelColumn);
     }
 }
+var IndentGuideRepeatOption;
+( (function(IndentGuideRepeatOption) {
+    IndentGuideRepeatOption[IndentGuideRepeatOption["BlockNone"] = 0] = "BlockNone";
+    IndentGuideRepeatOption[IndentGuideRepeatOption["BlockSubsequent"] = 1] = "BlockSubsequent";
+    IndentGuideRepeatOption[IndentGuideRepeatOption["BlockAll"] = 2] = "BlockAll";
+})(IndentGuideRepeatOption || (IndentGuideRepeatOption = {})));
 class ViewModelLinesFromModelAsIs {
     constructor(model) {
         this.model = model;

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

@@ -54,6 +54,13 @@ class ViewLineRenderingData {
         return false;
     }
 }
+var InlineDecorationType;
+( (function(InlineDecorationType) {
+    InlineDecorationType[InlineDecorationType["Regular"] = 0] = "Regular";
+    InlineDecorationType[InlineDecorationType["Before"] = 1] = "Before";
+    InlineDecorationType[InlineDecorationType["After"] = 2] = "After";
+    InlineDecorationType[InlineDecorationType["RegularAffectingLetterSpacing"] = 3] = "RegularAffectingLetterSpacing";
+})(InlineDecorationType || (InlineDecorationType = {})));
 class InlineDecoration {
     constructor(range, inlineClassName, type) {
         this.range = range;
@@ -69,7 +76,7 @@ class SingleLineInlineDecoration {
         this.inlineClassNameAffectsLetterSpacing = inlineClassNameAffectsLetterSpacing;
     }
     toInlineDecoration(lineNumber) {
-        return ( new InlineDecoration(( new Range(lineNumber, this.startOffset + 1, lineNumber, this.endOffset + 1)), this.inlineClassName, this.inlineClassNameAffectsLetterSpacing ? 3  : 0 ));
+        return ( new InlineDecoration(( new Range(lineNumber, this.startOffset + 1, lineNumber, this.endOffset + 1)), this.inlineClassName, this.inlineClassNameAffectsLetterSpacing ? InlineDecorationType.RegularAffectingLetterSpacing : InlineDecorationType.Regular));
     }
 }
 class ViewModelDecoration {
@@ -107,4 +114,4 @@ class OverviewRulerDecorationsGroup {
         return equals(a, b, OverviewRulerDecorationsGroup.equals);
     }
 }
-export { InlineDecoration, MinimapLinesRenderingData, OverviewRulerDecorationsGroup, SingleLineInlineDecoration, ViewLineData, ViewLineRenderingData, ViewModelDecoration, Viewport };
+export { InlineDecoration, InlineDecorationType, MinimapLinesRenderingData, OverviewRulerDecorationsGroup, SingleLineInlineDecoration, ViewLineData, ViewLineRenderingData, ViewModelDecoration, Viewport };

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

@@ -128,9 +128,25 @@ class ViewModelEventsCollector {
         this.outgoingEvents.push(e);
     }
 }
+var OutgoingViewModelEventKind;
+( (function(OutgoingViewModelEventKind) {
+    OutgoingViewModelEventKind[OutgoingViewModelEventKind["ContentSizeChanged"] = 0] = "ContentSizeChanged";
+    OutgoingViewModelEventKind[OutgoingViewModelEventKind["FocusChanged"] = 1] = "FocusChanged";
+    OutgoingViewModelEventKind[OutgoingViewModelEventKind["ScrollChanged"] = 2] = "ScrollChanged";
+    OutgoingViewModelEventKind[OutgoingViewModelEventKind["ViewZonesChanged"] = 3] = "ViewZonesChanged";
+    OutgoingViewModelEventKind[OutgoingViewModelEventKind["HiddenAreasChanged"] = 4] = "HiddenAreasChanged";
+    OutgoingViewModelEventKind[OutgoingViewModelEventKind["ReadOnlyEditAttempt"] = 5] = "ReadOnlyEditAttempt";
+    OutgoingViewModelEventKind[OutgoingViewModelEventKind["CursorStateChanged"] = 6] = "CursorStateChanged";
+    OutgoingViewModelEventKind[OutgoingViewModelEventKind["ModelDecorationsChanged"] = 7] = "ModelDecorationsChanged";
+    OutgoingViewModelEventKind[OutgoingViewModelEventKind["ModelLanguageChanged"] = 8] = "ModelLanguageChanged";
+    OutgoingViewModelEventKind[OutgoingViewModelEventKind["ModelLanguageConfigurationChanged"] = 9] = "ModelLanguageConfigurationChanged";
+    OutgoingViewModelEventKind[OutgoingViewModelEventKind["ModelContentChanged"] = 10] = "ModelContentChanged";
+    OutgoingViewModelEventKind[OutgoingViewModelEventKind["ModelOptionsChanged"] = 11] = "ModelOptionsChanged";
+    OutgoingViewModelEventKind[OutgoingViewModelEventKind["ModelTokensChanged"] = 12] = "ModelTokensChanged";
+})(OutgoingViewModelEventKind || (OutgoingViewModelEventKind = {})));
 class ContentSizeChangedEvent {
     constructor(oldContentWidth, oldContentHeight, contentWidth, contentHeight) {
-        this.kind = 0 ;
+        this.kind = OutgoingViewModelEventKind.ContentSizeChanged;
         this._oldContentWidth = oldContentWidth;
         this._oldContentHeight = oldContentHeight;
         this.contentWidth = contentWidth;
@@ -155,7 +171,7 @@ class ContentSizeChangedEvent {
 }
 class FocusChangedEvent {
     constructor(oldHasFocus, hasFocus) {
-        this.kind = 1 ;
+        this.kind = OutgoingViewModelEventKind.FocusChanged;
         this.oldHasFocus = oldHasFocus;
         this.hasFocus = hasFocus;
     }
@@ -171,7 +187,7 @@ class FocusChangedEvent {
 }
 class ScrollChangedEvent {
     constructor(oldScrollWidth, oldScrollLeft, oldScrollHeight, oldScrollTop, scrollWidth, scrollLeft, scrollHeight, scrollTop) {
-        this.kind = 2 ;
+        this.kind = OutgoingViewModelEventKind.ScrollChanged;
         this._oldScrollWidth = oldScrollWidth;
         this._oldScrollLeft = oldScrollLeft;
         this._oldScrollHeight = oldScrollHeight;
@@ -206,7 +222,7 @@ class ScrollChangedEvent {
 }
 class ViewZonesChangedEvent {
     constructor() {
-        this.kind = 3 ;
+        this.kind = OutgoingViewModelEventKind.ViewZonesChanged;
     }
     isNoOp() {
         return false;
@@ -220,7 +236,7 @@ class ViewZonesChangedEvent {
 }
 class HiddenAreasChangedEvent {
     constructor() {
-        this.kind = 4 ;
+        this.kind = OutgoingViewModelEventKind.HiddenAreasChanged;
     }
     isNoOp() {
         return false;
@@ -234,7 +250,7 @@ class HiddenAreasChangedEvent {
 }
 class CursorStateChangedEvent {
     constructor(oldSelections, selections, oldModelVersionId, modelVersionId, source, reason, reachedMaxCursorCount) {
-        this.kind = 6 ;
+        this.kind = OutgoingViewModelEventKind.CursorStateChanged;
         this.oldSelections = oldSelections;
         this.selections = selections;
         this.oldModelVersionId = oldModelVersionId;
@@ -283,7 +299,7 @@ class CursorStateChangedEvent {
 }
 class ReadOnlyEditAttemptEvent {
     constructor() {
-        this.kind = 5 ;
+        this.kind = OutgoingViewModelEventKind.ReadOnlyEditAttempt;
     }
     isNoOp() {
         return false;
@@ -298,7 +314,7 @@ class ReadOnlyEditAttemptEvent {
 class ModelDecorationsChangedEvent {
     constructor(event) {
         this.event = event;
-        this.kind = 7 ;
+        this.kind = OutgoingViewModelEventKind.ModelDecorationsChanged;
     }
     isNoOp() {
         return false;
@@ -310,7 +326,7 @@ class ModelDecorationsChangedEvent {
 class ModelLanguageChangedEvent {
     constructor(event) {
         this.event = event;
-        this.kind = 8 ;
+        this.kind = OutgoingViewModelEventKind.ModelLanguageChanged;
     }
     isNoOp() {
         return false;
@@ -322,7 +338,7 @@ class ModelLanguageChangedEvent {
 class ModelLanguageConfigurationChangedEvent {
     constructor(event) {
         this.event = event;
-        this.kind = 9 ;
+        this.kind = OutgoingViewModelEventKind.ModelLanguageConfigurationChanged;
     }
     isNoOp() {
         return false;
@@ -334,7 +350,7 @@ class ModelLanguageConfigurationChangedEvent {
 class ModelContentChangedEvent {
     constructor(event) {
         this.event = event;
-        this.kind = 10 ;
+        this.kind = OutgoingViewModelEventKind.ModelContentChanged;
     }
     isNoOp() {
         return false;
@@ -346,7 +362,7 @@ class ModelContentChangedEvent {
 class ModelOptionsChangedEvent {
     constructor(event) {
         this.event = event;
-        this.kind = 11 ;
+        this.kind = OutgoingViewModelEventKind.ModelOptionsChanged;
     }
     isNoOp() {
         return false;
@@ -358,7 +374,7 @@ class ModelOptionsChangedEvent {
 class ModelTokensChangedEvent {
     constructor(event) {
         this.event = event;
-        this.kind = 12 ;
+        this.kind = OutgoingViewModelEventKind.ModelTokensChanged;
     }
     isNoOp() {
         return false;
@@ -367,4 +383,4 @@ class ModelTokensChangedEvent {
         return null;
     }
 }
-export { ContentSizeChangedEvent, CursorStateChangedEvent, FocusChangedEvent, HiddenAreasChangedEvent, ModelContentChangedEvent, ModelDecorationsChangedEvent, ModelLanguageChangedEvent, ModelLanguageConfigurationChangedEvent, ModelOptionsChangedEvent, ModelTokensChangedEvent, ReadOnlyEditAttemptEvent, ScrollChangedEvent, ViewModelEventDispatcher, ViewModelEventsCollector, ViewZonesChangedEvent };
+export { ContentSizeChangedEvent, CursorStateChangedEvent, FocusChangedEvent, HiddenAreasChangedEvent, ModelContentChangedEvent, ModelDecorationsChangedEvent, ModelLanguageChangedEvent, ModelLanguageConfigurationChangedEvent, ModelOptionsChangedEvent, ModelTokensChangedEvent, OutgoingViewModelEventKind, ReadOnlyEditAttemptEvent, ScrollChangedEvent, ViewModelEventDispatcher, ViewModelEventsCollector, ViewZonesChangedEvent };

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

@@ -1,14 +1,16 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { KeyChord } from '../../../../base/common/keyCodes.js';
+import { KeyChord, KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import './anchorSelect.css.js';
-import { registerEditorContribution, registerEditorAction, EditorAction } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, registerEditorAction, EditorContributionInstantiation, EditorAction } from '../../../browser/editorExtensions.js';
 import { Selection } from '../../../common/core/selection.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { TrackedRangeStickiness } from '../../../common/model.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 var SelectionAnchorController_1;
 const _moduleId = "vs/editor/contrib/anchorSelect/browser/anchorSelect";
 const SelectionAnchorSet = ( (new RawContextKey('selectionAnchorSet', false)));
@@ -32,7 +34,7 @@ let SelectionAnchorController = class SelectionAnchorController {
                 }
                 this.decorationId = accessor.addDecoration(Selection.fromPositions(position, position), {
                     description: 'selection-anchor',
-                    stickiness: 1 ,
+                    stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
                     hoverMessage: ( (new MarkdownString())).appendText(( localizeWithPath(_moduleId, 0, "Selection Anchor"))),
                     className: 'selection-anchor'
                 });
@@ -92,8 +94,8 @@ class SetSelectionAnchor extends EditorAction {
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: KeyChord(2048  | 41 , 2048  | 32 ),
-                weight: 100
+                primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.CtrlCmd | KeyCode.KeyB),
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -123,8 +125,8 @@ class SelectFromAnchorToCursor extends EditorAction {
             precondition: SelectionAnchorSet,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: KeyChord(2048  | 41 , 2048  | 41 ),
-                weight: 100
+                primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.CtrlCmd | KeyCode.KeyK),
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -141,8 +143,8 @@ class CancelSelectionAnchor extends EditorAction {
             precondition: SelectionAnchorSet,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 9 ,
-                weight: 100
+                primary: KeyCode.Escape,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -150,7 +152,7 @@ class CancelSelectionAnchor extends EditorAction {
         SelectionAnchorController.get(editor)?.cancelSelectionAnchor();
     }
 }
-registerEditorContribution(SelectionAnchorController.ID, SelectionAnchorController, 4 );
+registerEditorContribution(SelectionAnchorController.ID, SelectionAnchorController, EditorContributionInstantiation.Lazy);
 registerEditorAction(SetSelectionAnchor);
 registerEditorAction(GoToSelectionAnchor);
 registerEditorAction(SelectFromAnchorToCursor);