@codingame/monaco-vscode-editor-api 3.2.2 → 4.0.0

package/esm/vs/editor/editor.api.js

@@ -18,7 +18,7 @@ import { PLAINTEXT_LANGUAGE_ID, ModesRegistry } from 'vscode/vscode/vs/editor/co
 import { nullTokenize, nullTokenizeEncoded, NullState } from 'vscode/vscode/vs/editor/common/languages/nullTokenize';
 import { TextModelResolvedOptions, FindMatch } from 'vscode/vscode/vs/editor/common/model';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
-import { AccessibilitySupport, ContentWidgetPositionPreference, CursorChangeReason, DefaultEndOfLine, EditorAutoIndentStrategy, EditorOption, EndOfLinePreference, EndOfLineSequence, MinimapPosition, MouseTargetType, OverlayWidgetPositionPreference, OverviewRulerLane, GlyphMarginLane, RenderLineNumbersType, RenderMinimap, ScrollbarVisibility, ScrollType, TextEditorCursorBlinkingStyle, TextEditorCursorStyle, TrackedRangeStickiness, WrappingIndent, InjectedTextCursorStops, PositionAffinity, ShowLightbulbIconMode, DocumentHighlightKind, CompletionItemKind, CompletionItemTag, CompletionItemInsertTextRule, SymbolKind, SymbolTag, IndentAction, CompletionTriggerKind, SignatureHelpTriggerKind, InlayHintKind, InlineCompletionTriggerKind, InlineEditTriggerKind, CodeActionTriggerType, NewSymbolNameTag } from 'vscode/vscode/vs/editor/common/standalone/standaloneEnums';
+import { AccessibilitySupport, ContentWidgetPositionPreference, CursorChangeReason, DefaultEndOfLine, EditorAutoIndentStrategy, EditorOption, EndOfLinePreference, EndOfLineSequence, MinimapPosition, MinimapSectionHeaderStyle, MouseTargetType, OverlayWidgetPositionPreference, OverviewRulerLane, GlyphMarginLane, RenderLineNumbersType, RenderMinimap, ScrollbarVisibility, ScrollType, TextEditorCursorBlinkingStyle, TextEditorCursorStyle, TrackedRangeStickiness, WrappingIndent, InjectedTextCursorStops, PositionAffinity, ShowLightbulbIconMode, DocumentHighlightKind, CompletionItemKind, CompletionItemTag, CompletionItemInsertTextRule, SymbolKind, SymbolTag, IndentAction, CompletionTriggerKind, SignatureHelpTriggerKind, InlayHintKind, InlineCompletionTriggerKind, InlineEditTriggerKind, CodeActionTriggerType, NewSymbolNameTag, PartialAcceptTriggerKind } from 'vscode/vscode/vs/editor/common/standalone/standaloneEnums';
 import { createTrustedTypesPolicy } from 'vscode/vscode/vs/base/browser/trustedTypes';
 import { LineTokens } from 'vscode/vscode/vs/editor/common/tokens/lineTokens';
 import { renderViewLine2, RenderLineInput } from 'vscode/vscode/vs/editor/common/viewLayout/viewLineRenderer';
@@ -33,7 +33,7 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
 import { IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
-import { MultiDiffEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorWidget';
+import { MultiDiffEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget';
 import { Color } from 'vscode/vscode/vs/base/common/color';
 import { Range as Range$1 } from 'vscode/vscode/vs/editor/common/core/range';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
@@ -109,6 +109,20 @@ function substituteMatches(lexer, str, id, matches, state) {
         return '';
     });
 }
+function substituteMatchesRe(lexer, str, state) {
+    const re = /\$[sS](\d\d?)/g;
+    let stateMatches = null;
+    return str.replace(re, function (full, s) {
+        if (stateMatches === null) {
+            stateMatches = state.split('.');
+            stateMatches.unshift(state);
+        }
+        if (!empty(s) && s < stateMatches.length) {
+            return fixCase(lexer, stateMatches[s]);
+        }
+        return '';
+    });
+}
 function findRules(lexer, inState) {
     let state = inState;
     while (state && state.length > 0) {
@@ -526,8 +540,8 @@ let MonarchTokenizer = MonarchTokenizer_1 = class MonarchTokenizer extends Dispo
                 continue;
             }
             hasEmbeddedPopRule = true;
-            let regex = rule.regex;
-            const regexSource = rule.regex.source;
+            let regex = rule.resolveRegex(state.stack.state);
+            const regexSource = regex.source;
             if (regexSource.substr(0, 4) === '^(?:' && regexSource.substr(regexSource.length - 1, 1) === ')') {
                 const flags = (regex.ignoreCase ? 'i' : '') + (regex.unicode ? 'u' : '');
                 regex = ( new RegExp(regexSource.substr(4, regexSource.length - 5), flags));
@@ -609,7 +623,7 @@ let MonarchTokenizer = MonarchTokenizer_1 = class MonarchTokenizer extends Dispo
                 const restOfLine = line.substr(pos);
                 for (const rule of rules) {
                     if (pos === 0 || !rule.matchOnlyAtLineStart) {
-                        matches = restOfLine.match(rule.regex);
+                        matches = restOfLine.match(rule.resolveRegex(state));
                         if (matches) {
                             matched = matches[0];
                             action = rule.action;
@@ -1290,6 +1304,7 @@ function createMonacoEditorAPI() {
         EndOfLinePreference: EndOfLinePreference,
         EndOfLineSequence: EndOfLineSequence,
         MinimapPosition: MinimapPosition,
+        MinimapSectionHeaderStyle: MinimapSectionHeaderStyle,
         MouseTargetType: MouseTargetType,
         OverlayWidgetPositionPreference: OverlayWidgetPositionPreference,
         OverviewRulerLane: OverviewRulerLane,
@@ -1367,7 +1382,7 @@ function createKeywordMatcher(arr, caseInsensitive = false) {
         };
     }
 }
-function compileRegExp(lexer, str) {
+function compileRegExp(lexer, str, handleSn) {
     str = str.replace(/@@/g, `\x01`);
     let n = 0;
     let hadExpansion;
@@ -1396,6 +1411,21 @@ function compileRegExp(lexer, str) {
     } while (hadExpansion && n < 5);
     str = str.replace(/\x01/g, '@');
     const flags = (lexer.ignoreCase ? 'i' : '') + (lexer.unicode ? 'u' : '');
+    if (handleSn) {
+        const match = str.match(/\$[sS](\d\d?)/g);
+        if (match) {
+            let lastState = null;
+            let lastRegEx = null;
+            return (state) => {
+                if (lastRegEx && lastState === state) {
+                    return lastRegEx;
+                }
+                lastState = state;
+                lastRegEx = ( new RegExp(substituteMatchesRe(lexer, str, state), flags));
+                return lastRegEx;
+            };
+        }
+    }
     return ( new RegExp(str, flags));
 }
 function selectScrutinee(id, matches, state, num) {
@@ -1462,12 +1492,12 @@ function createGuard(lexer, ruleName, tkey, val) {
     }
     else if (op === '~' || op === '!~') {
         if (pat.indexOf('$') < 0) {
-            const re = compileRegExp(lexer, '^' + pat + '$');
+            const re = compileRegExp(lexer, '^' + pat + '$', false);
             tester = function (s) { return (op === '~' ? re.test(s) : !re.test(s)); };
         }
         else {
             tester = function (s, id, matches, state) {
-                const re = compileRegExp(lexer, '^' + substituteMatches(lexer, pat, id, matches, state) + '$');
+                const re = compileRegExp(lexer, '^' + substituteMatches(lexer, pat, id, matches, state) + '$', false);
                 return re.test(s);
             };
         }
@@ -1624,11 +1654,19 @@ class Rule {
         }
         this.matchOnlyAtLineStart = (sregex.length > 0 && sregex[0] === '^');
         this.name = this.name + ': ' + sregex;
-        this.regex = compileRegExp(lexer, '^(?:' + (this.matchOnlyAtLineStart ? sregex.substr(1) : sregex) + ')');
+        this.regex = compileRegExp(lexer, '^(?:' + (this.matchOnlyAtLineStart ? sregex.substr(1) : sregex) + ')', true);
     }
     setAction(lexer, act) {
         this.action = compileAction(lexer, this.name, act);
     }
+    resolveRegex(state) {
+        if (this.regex instanceof RegExp) {
+            return this.regex;
+        }
+        else {
+            return this.regex(state);
+        }
+    }
 }
 function compile(languageId, json) {
     if (!json || typeof (json) !== 'object') {
@@ -2181,6 +2219,7 @@ function createMonacoLanguagesAPI() {
         InlineEditTriggerKind: InlineEditTriggerKind,
         CodeActionTriggerType: CodeActionTriggerType,
         NewSymbolNameTag: NewSymbolNameTag,
+        PartialAcceptTriggerKind: PartialAcceptTriggerKind,
         FoldingRangeKind: FoldingRangeKind,
         SelectedSuggestionInfo: SelectedSuggestionInfo,
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-editor-api",
-  "version": "3.2.2",
+  "version": "4.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,6 +18,6 @@
   "module": "esm/vs/editor/editor.api.js",
   "types": "esm/vs/editor/editor.api.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@3.2.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.0.0"
   }
 }