@codingame/monaco-vscode-api 5.3.0 → 6.0.0

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { RunOnceScheduler, createCancelablePromise } from '../../../../base/common/async.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
 import { hasDocumentRangeSemanticTokensProvider, getDocumentRangeSemanticTokens } from '../common/getSemanticTokens.js';
 import { SEMANTIC_HIGHLIGHTING_SETTING_ID, isSemanticColoringEnabled } from '../common/semanticTokensConfig.js';
 import { toMultilineTokens2 } from '../../../common/services/semanticTokensProviderStyling.js';
@@ -120,5 +120,5 @@ ViewportSemanticTokensContribution = ViewportSemanticTokensContribution_1 = ( __
     ( __param(4, ILanguageFeatureDebounceService)),
     ( __param(5, ILanguageFeaturesService))
 ], ViewportSemanticTokensContribution));
-registerEditorContribution(ViewportSemanticTokensContribution.ID, ViewportSemanticTokensContribution, 1 );
+registerEditorContribution(ViewportSemanticTokensContribution.ID, ViewportSemanticTokensContribution, EditorContributionInstantiation.AfterFirstRender);
 export { ViewportSemanticTokensContribution };

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

@@ -2,7 +2,9 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { isNonEmptyArray, equals } from '../../../../base/common/arrays.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
-import { registerEditorContribution, registerEditorAction, EditorAction } from '../../../browser/editorExtensions.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
+import { registerEditorContribution, registerEditorAction, EditorContributionInstantiation, EditorAction } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { Selection } from '../../../common/core/selection.js';
@@ -12,6 +14,7 @@ import { WordSelectionRangeProvider } from './wordSelections.js';
 import { localizeWithPath } 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 { assertType } from '../../../../base/common/types.js';
@@ -56,7 +59,7 @@ let SmartSelectController = class SmartSelectController {
         const selections = this._editor.getSelections();
         const model = this._editor.getModel();
         if (!this._state) {
-            await provideSelectionRanges(this._languageFeaturesService.selectionRangeProvider, model, ( (selections.map(s => s.getPosition()))), this._editor.getOption(113 ), CancellationToken.None).then(ranges => {
+            await provideSelectionRanges(this._languageFeaturesService.selectionRangeProvider, model, ( (selections.map(s => s.getPosition()))), this._editor.getOption(EditorOption.smartSelect), CancellationToken.None).then(ranges => {
                 if (!isNonEmptyArray(ranges) || ranges.length !== selections.length) {
                     return;
                 }
@@ -119,12 +122,12 @@ class GrowSelectionAction extends AbstractSmartSelect {
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 1024  | 512  | 17 ,
+                primary: KeyMod$1.Shift | KeyMod$1.Alt | KeyCode.RightArrow,
                 mac: {
-                    primary: 2048  | 256  | 1024  | 17 ,
-                    secondary: [256  | 1024  | 17 ],
+                    primary: KeyMod$1.CtrlCmd | KeyMod$1.WinCtrl | KeyMod$1.Shift | KeyCode.RightArrow,
+                    secondary: [KeyMod$1.WinCtrl | KeyMod$1.Shift | KeyCode.RightArrow],
                 },
-                weight: 100
+                weight: KeybindingWeight.EditorContrib
             },
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
@@ -145,12 +148,12 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 1024  | 512  | 15 ,
+                primary: KeyMod$1.Shift | KeyMod$1.Alt | KeyCode.LeftArrow,
                 mac: {
-                    primary: 2048  | 256  | 1024  | 15 ,
-                    secondary: [256  | 1024  | 15 ],
+                    primary: KeyMod$1.CtrlCmd | KeyMod$1.WinCtrl | KeyMod$1.Shift | KeyCode.LeftArrow,
+                    secondary: [KeyMod$1.WinCtrl | KeyMod$1.Shift | KeyCode.LeftArrow],
                 },
-                weight: 100
+                weight: KeybindingWeight.EditorContrib
             },
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
@@ -161,7 +164,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
         });
     }
 }
-registerEditorContribution(SmartSelectController.ID, SmartSelectController, 4 );
+registerEditorContribution(SmartSelectController.ID, SmartSelectController, EditorContributionInstantiation.Lazy);
 registerEditorAction(GrowSelectionAction);
 registerEditorAction(ShrinkSelectionAction);
 async function provideSelectionRanges(registry, model, positions, options, token) {

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

@@ -1,3 +1,4 @@
+import { CharCode } from '../../../../base/common/charCode.js';
 import { isLowerAsciiLetter, isUpperAsciiLetter } from '../../../../base/common/strings.js';
 import { Range } from '../../../common/core/range.js';
 class WordSelectionRangeProvider {
@@ -30,7 +31,7 @@ class WordSelectionRangeProvider {
         let lastCh = 0;
         for (; start >= 0; start--) {
             const ch = word.charCodeAt(start);
-            if ((start !== offset) && ((ch === 95  || ch === 45) )) {
+            if ((start !== offset) && (ch === CharCode.Underline || ch === CharCode.Dash)) {
                 break;
             }
             else if (isLowerAsciiLetter(ch) && isUpperAsciiLetter(lastCh)) {
@@ -44,7 +45,7 @@ class WordSelectionRangeProvider {
             if (isUpperAsciiLetter(ch) && isLowerAsciiLetter(lastCh)) {
                 break;
             }
-            else if (ch === 95  || ch === 45 ) {
+            else if (ch === CharCode.Underline || ch === CharCode.Dash) {
                 break;
             }
             lastCh = ch;

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

@@ -1,15 +1,18 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { KeyCode, KeyMod as KeyMod$1 } from '../../../../base/common/keyCodes.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { assertType } from '../../../../base/common/types.js';
-import { registerEditorContribution, registerEditorCommand, EditorCommand } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, registerEditorCommand, EditorContributionInstantiation, EditorCommand } from '../../../browser/editorExtensions.js';
 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 { showSimpleSuggestions } from '../../suggest/browser/suggest.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { SnippetSession } from './snippetSession.js';
 var SnippetController2_1;
@@ -114,7 +117,7 @@ let SnippetController2 = class SnippetController2 {
                     for (let i = 0; i < activeChoice.choice.options.length; i++) {
                         const option = activeChoice.choice.options[i];
                         suggestions.push({
-                            kind: 13 ,
+                            kind: CompletionItemKind.Value,
                             label: option.value,
                             insertText: option.value,
                             sortText: 'a'.repeat(i + 1),
@@ -232,16 +235,16 @@ SnippetController2 = SnippetController2_1 = ( (__decorate([
     ( (__param(3, IContextKeyService))),
     ( (__param(4, ILanguageConfigurationService)))
 ], SnippetController2)));
-registerEditorContribution(SnippetController2.ID, SnippetController2, 4 );
+registerEditorContribution(SnippetController2.ID, SnippetController2, EditorContributionInstantiation.Lazy);
 const CommandCtor = EditorCommand.bindToContribution(SnippetController2.get);
 registerEditorCommand(( (new CommandCtor({
     id: 'jumpToNextSnippetPlaceholder',
     precondition: ( (ContextKeyExpr.and(SnippetController2.InSnippetMode, SnippetController2.HasNextTabstop))),
     handler: ctrl => ctrl.next(),
     kbOpts: {
-        weight: 100  + 30,
+        weight: KeybindingWeight.EditorContrib + 30,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 2
+        primary: KeyCode.Tab
     }
 }))));
 registerEditorCommand(( (new CommandCtor({
@@ -249,9 +252,9 @@ registerEditorCommand(( (new CommandCtor({
     precondition: ( (ContextKeyExpr.and(SnippetController2.InSnippetMode, SnippetController2.HasPrevTabstop))),
     handler: ctrl => ctrl.prev(),
     kbOpts: {
-        weight: 100  + 30,
+        weight: KeybindingWeight.EditorContrib + 30,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 1024  | 2
+        primary: KeyMod$1.Shift | KeyCode.Tab
     }
 }))));
 registerEditorCommand(( (new CommandCtor({
@@ -259,10 +262,10 @@ registerEditorCommand(( (new CommandCtor({
     precondition: SnippetController2.InSnippetMode,
     handler: ctrl => ctrl.cancel(true),
     kbOpts: {
-        weight: 100  + 30,
+        weight: KeybindingWeight.EditorContrib + 30,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 9 ,
-        secondary: [1024  | 9 ]
+        primary: KeyCode.Escape,
+        secondary: [KeyMod$1.Shift | KeyCode.Escape]
     }
 }))));
 registerEditorCommand(( (new CommandCtor({

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

@@ -1,28 +1,47 @@
+import { CharCode } from '../../../../base/common/charCode.js';
+var TokenType;
+( (function(TokenType) {
+    TokenType[TokenType["Dollar"] = 0] = "Dollar";
+    TokenType[TokenType["Colon"] = 1] = "Colon";
+    TokenType[TokenType["Comma"] = 2] = "Comma";
+    TokenType[TokenType["CurlyOpen"] = 3] = "CurlyOpen";
+    TokenType[TokenType["CurlyClose"] = 4] = "CurlyClose";
+    TokenType[TokenType["Backslash"] = 5] = "Backslash";
+    TokenType[TokenType["Forwardslash"] = 6] = "Forwardslash";
+    TokenType[TokenType["Pipe"] = 7] = "Pipe";
+    TokenType[TokenType["Int"] = 8] = "Int";
+    TokenType[TokenType["VariableName"] = 9] = "VariableName";
+    TokenType[TokenType["Format"] = 10] = "Format";
+    TokenType[TokenType["Plus"] = 11] = "Plus";
+    TokenType[TokenType["Dash"] = 12] = "Dash";
+    TokenType[TokenType["QuestionMark"] = 13] = "QuestionMark";
+    TokenType[TokenType["EOF"] = 14] = "EOF";
+})(TokenType || (TokenType = {})));
 class Scanner {
     constructor() {
         this.value = '';
         this.pos = 0;
     }
     static { this._table = {
-        [36 ]: 0 ,
-        [58 ]: 1 ,
-        [44 ]: 2 ,
-        [123 ]: 3 ,
-        [125 ]: 4 ,
-        [92 ]: 5 ,
-        [47 ]: 6 ,
-        [124 ]: 7 ,
-        [43 ]: 11 ,
-        [45 ]: 12 ,
-        [63 ]: 13 ,
+        [CharCode.DollarSign]: TokenType.Dollar,
+        [CharCode.Colon]: TokenType.Colon,
+        [CharCode.Comma]: TokenType.Comma,
+        [CharCode.OpenCurlyBrace]: TokenType.CurlyOpen,
+        [CharCode.CloseCurlyBrace]: TokenType.CurlyClose,
+        [CharCode.Backslash]: TokenType.Backslash,
+        [CharCode.Slash]: TokenType.Forwardslash,
+        [CharCode.Pipe]: TokenType.Pipe,
+        [CharCode.Plus]: TokenType.Plus,
+        [CharCode.Dash]: TokenType.Dash,
+        [CharCode.QuestionMark]: TokenType.QuestionMark,
     }; }
     static isDigitCharacter(ch) {
-        return ch >= 48  && ch <= 57 ;
+        return ch >= CharCode.Digit0 && ch <= CharCode.Digit9;
     }
     static isVariableCharacter(ch) {
-        return ch === 95
-            || ((ch >= 97  && ch <= 122) )
-            || ((ch >= 65  && ch <= 90) );
+        return ch === CharCode.Underline
+            || (ch >= CharCode.a && ch <= CharCode.z)
+            || (ch >= CharCode.A && ch <= CharCode.Z);
     }
     text(value) {
         this.value = value;
@@ -33,7 +52,7 @@ class Scanner {
     }
     next() {
         if (this.pos >= this.value.length) {
-            return { type: 14 , pos: this.pos, len: 0 };
+            return { type: TokenType.EOF, pos: this.pos, len: 0 };
         }
         const pos = this.pos;
         let len = 0;
@@ -45,7 +64,7 @@ class Scanner {
             return { type, pos, len: 1 };
         }
         if (Scanner.isDigitCharacter(ch)) {
-            type = 8 ;
+            type = TokenType.Int;
             do {
                 len += 1;
                 ch = this.value.charCodeAt(pos + len);
@@ -54,14 +73,14 @@ class Scanner {
             return { type, pos, len };
         }
         if (Scanner.isVariableCharacter(ch)) {
-            type = 9 ;
+            type = TokenType.VariableName;
             do {
                 ch = this.value.charCodeAt(pos + (++len));
             } while (Scanner.isVariableCharacter(ch) || Scanner.isDigitCharacter(ch));
             this.pos += len;
             return { type, pos, len };
         }
-        type = 10 ;
+        type = TokenType.Format;
         do {
             len += 1;
             ch = this.value.charCodeAt(pos + len);
@@ -499,7 +518,7 @@ class TextmateSnippet extends Marker {
 class SnippetParser {
     constructor() {
         this._scanner = ( new Scanner());
-        this._token = { type: 14 , pos: 0, len: 0 };
+        this._token = { type: TokenType.EOF, pos: 0, len: 0 };
     }
     static escape(value) {
         return value.replace(/\$|}|\\/g, '\\$&');
@@ -586,14 +605,14 @@ class SnippetParser {
     _until(type) {
         const start = this._token;
         while (this._token.type !== type) {
-            if (this._token.type === 14 ) {
+            if (this._token.type === TokenType.EOF) {
                 return false;
             }
-            else if (this._token.type === 5 ) {
+            else if (this._token.type === TokenType.Backslash) {
                 const nextToken = this._scanner.next();
-                if (nextToken.type !== 0
-                    && nextToken.type !== 4
-                    && nextToken.type !== 5 ) {
+                if (nextToken.type !== TokenType.Dollar
+                    && nextToken.type !== TokenType.CurlyClose
+                    && nextToken.type !== TokenType.Backslash) {
                     return false;
                 }
             }
@@ -612,10 +631,10 @@ class SnippetParser {
     }
     _parseEscaped(marker) {
         let value;
-        if (value = this._accept(5 , true)) {
-            value = this._accept(0 , true)
-                || this._accept(4 , true)
-                || this._accept(5 , true)
+        if (value = this._accept(TokenType.Backslash, true)) {
+            value = this._accept(TokenType.Dollar, true)
+                || this._accept(TokenType.CurlyClose, true)
+                || this._accept(TokenType.Backslash, true)
                 || value;
             marker.appendChild(( new Text(value)));
             return true;
@@ -625,8 +644,8 @@ class SnippetParser {
     _parseTabstopOrVariableName(parent) {
         let value;
         const token = this._token;
-        const match = this._accept(0 )
-            && (value = this._accept(9 , true) || this._accept(8 , true));
+        const match = this._accept(TokenType.Dollar)
+            && (value = this._accept(TokenType.VariableName, true) || this._accept(TokenType.Int, true));
         if (!match) {
             return this._backTo(token);
         }
@@ -638,16 +657,16 @@ class SnippetParser {
     _parseComplexPlaceholder(parent) {
         let index;
         const token = this._token;
-        const match = this._accept(0 )
-            && this._accept(3 )
-            && (index = this._accept(8 , true));
+        const match = this._accept(TokenType.Dollar)
+            && this._accept(TokenType.CurlyOpen)
+            && (index = this._accept(TokenType.Int, true));
         if (!match) {
             return this._backTo(token);
         }
         const placeholder = ( new Placeholder(Number(index)));
-        if (this._accept(1 )) {
+        if (this._accept(TokenType.Colon)) {
             while (true) {
-                if (this._accept(4 )) {
+                if (this._accept(TokenType.CurlyClose)) {
                     parent.appendChild(placeholder);
                     return true;
                 }
@@ -659,16 +678,16 @@ class SnippetParser {
                 return true;
             }
         }
-        else if (placeholder.index > 0 && this._accept(7 )) {
+        else if (placeholder.index > 0 && this._accept(TokenType.Pipe)) {
             const choice = ( new Choice());
             while (true) {
                 if (this._parseChoiceElement(choice)) {
-                    if (this._accept(2 )) {
+                    if (this._accept(TokenType.Comma)) {
                         continue;
                     }
-                    if (this._accept(7 )) {
+                    if (this._accept(TokenType.Pipe)) {
                         placeholder.appendChild(choice);
-                        if (this._accept(4 )) {
+                        if (this._accept(TokenType.CurlyClose)) {
                             parent.appendChild(placeholder);
                             return true;
                         }
@@ -678,7 +697,7 @@ class SnippetParser {
                 return false;
             }
         }
-        else if (this._accept(6 )) {
+        else if (this._accept(TokenType.Forwardslash)) {
             if (this._parseTransform(placeholder)) {
                 parent.appendChild(placeholder);
                 return true;
@@ -686,7 +705,7 @@ class SnippetParser {
             this._backTo(token);
             return false;
         }
-        else if (this._accept(4 )) {
+        else if (this._accept(TokenType.CurlyClose)) {
             parent.appendChild(placeholder);
             return true;
         }
@@ -698,14 +717,14 @@ class SnippetParser {
         const token = this._token;
         const values = [];
         while (true) {
-            if (this._token.type === 2  || this._token.type === 7 ) {
+            if (this._token.type === TokenType.Comma || this._token.type === TokenType.Pipe) {
                 break;
             }
             let value;
-            if (value = this._accept(5 , true)) {
-                value = this._accept(2 , true)
-                    || this._accept(7 , true)
-                    || this._accept(5 , true)
+            if (value = this._accept(TokenType.Backslash, true)) {
+                value = this._accept(TokenType.Comma, true)
+                    || this._accept(TokenType.Pipe, true)
+                    || this._accept(TokenType.Backslash, true)
                     || value;
             }
             else {
@@ -727,16 +746,16 @@ class SnippetParser {
     _parseComplexVariable(parent) {
         let name;
         const token = this._token;
-        const match = this._accept(0 )
-            && this._accept(3 )
-            && (name = this._accept(9 , true));
+        const match = this._accept(TokenType.Dollar)
+            && this._accept(TokenType.CurlyOpen)
+            && (name = this._accept(TokenType.VariableName, true));
         if (!match) {
             return this._backTo(token);
         }
         const variable = ( new Variable(name));
-        if (this._accept(1 )) {
+        if (this._accept(TokenType.Colon)) {
             while (true) {
-                if (this._accept(4 )) {
+                if (this._accept(TokenType.CurlyClose)) {
                     parent.appendChild(variable);
                     return true;
                 }
@@ -748,7 +767,7 @@ class SnippetParser {
                 return true;
             }
         }
-        else if (this._accept(6 )) {
+        else if (this._accept(TokenType.Forwardslash)) {
             if (this._parseTransform(variable)) {
                 parent.appendChild(variable);
                 return true;
@@ -756,7 +775,7 @@ class SnippetParser {
             this._backTo(token);
             return false;
         }
-        else if (this._accept(4 )) {
+        else if (this._accept(TokenType.CurlyClose)) {
             parent.appendChild(variable);
             return true;
         }
@@ -769,28 +788,28 @@ class SnippetParser {
         let regexValue = '';
         let regexOptions = '';
         while (true) {
-            if (this._accept(6 )) {
+            if (this._accept(TokenType.Forwardslash)) {
                 break;
             }
             let escaped;
-            if (escaped = this._accept(5 , true)) {
-                escaped = this._accept(6 , true) || escaped;
+            if (escaped = this._accept(TokenType.Backslash, true)) {
+                escaped = this._accept(TokenType.Forwardslash, true) || escaped;
                 regexValue += escaped;
                 continue;
             }
-            if (this._token.type !== 14 ) {
+            if (this._token.type !== TokenType.EOF) {
                 regexValue += this._accept(undefined, true);
                 continue;
             }
             return false;
         }
         while (true) {
-            if (this._accept(6 )) {
+            if (this._accept(TokenType.Forwardslash)) {
                 break;
             }
             let escaped;
-            if (escaped = this._accept(5 , true)) {
-                escaped = this._accept(5 , true) || this._accept(6 , true) || escaped;
+            if (escaped = this._accept(TokenType.Backslash, true)) {
+                escaped = this._accept(TokenType.Backslash, true) || this._accept(TokenType.Forwardslash, true) || escaped;
                 transform.appendChild(( new Text(escaped)));
                 continue;
             }
@@ -800,10 +819,10 @@ class SnippetParser {
             return false;
         }
         while (true) {
-            if (this._accept(4 )) {
+            if (this._accept(TokenType.CurlyClose)) {
                 break;
             }
-            if (this._token.type !== 14 ) {
+            if (this._token.type !== TokenType.EOF) {
                 regexOptions += this._accept(undefined, true);
                 continue;
             }
@@ -820,14 +839,14 @@ class SnippetParser {
     }
     _parseFormatString(parent) {
         const token = this._token;
-        if (!this._accept(0 )) {
+        if (!this._accept(TokenType.Dollar)) {
             return false;
         }
         let complex = false;
-        if (this._accept(3 )) {
+        if (this._accept(TokenType.CurlyOpen)) {
             complex = true;
         }
-        const index = this._accept(8 , true);
+        const index = this._accept(TokenType.Int, true);
         if (!index) {
             this._backTo(token);
             return false;
@@ -836,17 +855,17 @@ class SnippetParser {
             parent.appendChild(( new FormatString(Number(index))));
             return true;
         }
-        else if (this._accept(4 )) {
+        else if (this._accept(TokenType.CurlyClose)) {
             parent.appendChild(( new FormatString(Number(index))));
             return true;
         }
-        else if (!this._accept(1 )) {
+        else if (!this._accept(TokenType.Colon)) {
             this._backTo(token);
             return false;
         }
-        if (this._accept(6 )) {
-            const shorthand = this._accept(9 , true);
-            if (!shorthand || !this._accept(4 )) {
+        if (this._accept(TokenType.Forwardslash)) {
+            const shorthand = this._accept(TokenType.VariableName, true);
+            if (!shorthand || !this._accept(TokenType.CurlyClose)) {
                 this._backTo(token);
                 return false;
             }
@@ -855,24 +874,24 @@ class SnippetParser {
                 return true;
             }
         }
-        else if (this._accept(11 )) {
-            const ifValue = this._until(4 );
+        else if (this._accept(TokenType.Plus)) {
+            const ifValue = this._until(TokenType.CurlyClose);
             if (ifValue) {
                 parent.appendChild(( new FormatString(Number(index), undefined, ifValue, undefined)));
                 return true;
             }
         }
-        else if (this._accept(12 )) {
-            const elseValue = this._until(4 );
+        else if (this._accept(TokenType.Dash)) {
+            const elseValue = this._until(TokenType.CurlyClose);
             if (elseValue) {
                 parent.appendChild(( new FormatString(Number(index), undefined, undefined, elseValue)));
                 return true;
             }
         }
-        else if (this._accept(13 )) {
-            const ifValue = this._until(1 );
+        else if (this._accept(TokenType.QuestionMark)) {
+            const ifValue = this._until(TokenType.Colon);
             if (ifValue) {
-                const elseValue = this._until(4 );
+                const elseValue = this._until(TokenType.CurlyClose);
                 if (elseValue) {
                     parent.appendChild(( new FormatString(Number(index), undefined, ifValue, elseValue)));
                     return true;
@@ -880,7 +899,7 @@ class SnippetParser {
             }
         }
         else {
-            const elseValue = this._until(4 );
+            const elseValue = this._until(TokenType.CurlyClose);
             if (elseValue) {
                 parent.appendChild(( new FormatString(Number(index), undefined, undefined, elseValue)));
                 return true;
@@ -890,7 +909,7 @@ class SnippetParser {
         return false;
     }
     _parseAnything(marker) {
-        if (this._token.type !== 14 ) {
+        if (this._token.type !== TokenType.EOF) {
             marker.appendChild(( new Text(this._scanner.tokenText(this._token))));
             this._accept(undefined);
             return true;
@@ -898,4 +917,4 @@ class SnippetParser {
         return false;
     }
 }
-export { Choice, FormatString, Marker, Placeholder, Scanner, SnippetParser, Text, TextmateSnippet, Transform, TransformableMarker, Variable };
+export { Choice, FormatString, Marker, Placeholder, Scanner, SnippetParser, Text, TextmateSnippet, TokenType, Transform, TransformableMarker, Variable };

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

@@ -1,12 +1,15 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { groupBy } from '../../../../base/common/arrays.js';
+import { CharCode } from '../../../../base/common/charCode.js';
 import { dispose } from '../../../../base/common/lifecycle.js';
 import { getLeadingWhitespace } from '../../../../base/common/strings.js';
 import './snippetSession.css.js';
+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 { TrackedRangeStickiness } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
@@ -15,10 +18,10 @@ import { ModelBasedVariableResolver, CompositeSnippetVariableResolver, Clipboard
 var SnippetSession_1;
 class OneSnippet {
     static { this._decor = {
-        active: ModelDecorationOptions.register({ description: 'snippet-placeholder-1', stickiness: 0 , className: 'snippet-placeholder' }),
-        inactive: ModelDecorationOptions.register({ description: 'snippet-placeholder-2', stickiness: 1 , className: 'snippet-placeholder' }),
-        activeFinal: ModelDecorationOptions.register({ description: 'snippet-placeholder-3', stickiness: 1 , className: 'finish-snippet-placeholder' }),
-        inactiveFinal: ModelDecorationOptions.register({ description: 'snippet-placeholder-4', stickiness: 1 , className: 'finish-snippet-placeholder' }),
+        active: ModelDecorationOptions.register({ description: 'snippet-placeholder-1', stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, className: 'snippet-placeholder' }),
+        inactive: ModelDecorationOptions.register({ description: 'snippet-placeholder-2', stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, className: 'snippet-placeholder' }),
+        activeFinal: ModelDecorationOptions.register({ description: 'snippet-placeholder-3', stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, className: 'finish-snippet-placeholder' }),
+        inactiveFinal: ModelDecorationOptions.register({ description: 'snippet-placeholder-4', stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, className: 'finish-snippet-placeholder' }),
     }; }
     constructor(_editor, _snippet, _snippetLineLeadingWhitespace) {
         this._editor = _editor;
@@ -282,7 +285,7 @@ let SnippetSession = SnippetSession_1 = class SnippetSession {
                 else {
                     snippetTextString = snippetTextString ?? ( snippet.toString());
                     const prevChar = snippetTextString.charCodeAt(offset - 1);
-                    if (prevChar === 10  || prevChar === 13 ) {
+                    if (prevChar === CharCode.LineFeed || prevChar === CharCode.CarriageReturn) {
                         lines[0] = model.normalizeIndentation(lineLeadingWhitespace + lines[0]);
                     }
                 }
@@ -351,7 +354,7 @@ let SnippetSession = SnippetSession_1 = class SnippetSession {
                     readClipboardText,
                     idx,
                     indexedSelections.length,
-                    editor.getOption(79 ) === 'spread'
+                    editor.getOption(EditorOption.multiCursorPaste) === 'spread'
                 )),
                 ( new SelectionBasedVariableResolver(model, selection, idx, overtypingCapturer)),
                 ( new CommentBasedVariableResolver(model, selection, languageConfigurationService)),
@@ -380,7 +383,7 @@ let SnippetSession = SnippetSession_1 = class SnippetSession {
                 () => clipboardText,
                 0,
                 editor.getSelections().length,
-                editor.getOption(79 ) === 'spread'
+                editor.getOption(EditorOption.multiCursorPaste) === 'spread'
             )),
             ( new SelectionBasedVariableResolver(model, editor.getSelection(), 0, overtypingCapturer)),
             ( new CommentBasedVariableResolver(model, editor.getSelection(), languageConfigurationService)),