@codingame/monaco-vscode-editor-api 19.1.4 → 20.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-editor-api",
-  "version": "19.1.4",
+  "version": "20.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - monaco-editor compatible api",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common": "19.1.4",
-    "@codingame/monaco-vscode-api": "19.1.4"
+    "@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common": "20.0.1",
+    "@codingame/monaco-vscode-api": "20.0.1"
   },
   "exports": {
     ".": "./esm/vs/editor/editor.api.js",

package/vscode/src/vs/editor/standalone/browser/colorizer.js

@@ -69,7 +69,9 @@ class Colorizer {
             'none',
             false,
             false,
-            null
+            null,
+            null,
+            0
         )));
         return renderResult.html;
     }
@@ -130,7 +132,9 @@ function _fakeColorize(lines, tabSize, languageIdCodec) {
             'none',
             false,
             false,
-            null
+            null,
+            null,
+            0
         )));
         html = html.concat(renderResult.html);
         html.push('<br/>');
@@ -166,7 +170,9 @@ function _actualColorize(lines, tabSize, tokenizationSupport, languageIdCodec) {
             'none',
             false,
             false,
-            null
+            null,
+            null,
+            0
         )));
         html = html.concat(renderResult.html);
         html.push('<br/>');

package/vscode/src/vs/editor/standalone/browser/standaloneEditor.js

@@ -19,7 +19,7 @@ import { PLAINTEXT_LANGUAGE_ID } from '@codingame/monaco-vscode-api/vscode/vs/ed
 import { nullTokenize, NullState } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/nullTokenize';
 import { FindMatch, TextModelResolvedOptions } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
-import { ShowLightbulbIconMode, PositionAffinity, InjectedTextCursorStops, WrappingIndent, TrackedRangeStickiness, TextEditorCursorStyle, TextEditorCursorBlinkingStyle, ScrollType, ScrollbarVisibility, RenderMinimap, RenderLineNumbersType, GlyphMarginLane, OverviewRulerLane, OverlayWidgetPositionPreference, MouseTargetType, MinimapSectionHeaderStyle, MinimapPosition, EndOfLineSequence, EndOfLinePreference, EditorOption, EditorAutoIndentStrategy, DefaultEndOfLine, CursorChangeReason, ContentWidgetPositionPreference, AccessibilitySupport } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/standalone/standaloneEnums';
+import { TextDirection, ShowLightbulbIconMode, PositionAffinity, InjectedTextCursorStops, WrappingIndent, TrackedRangeStickiness, TextEditorCursorStyle, TextEditorCursorBlinkingStyle, ScrollType, ScrollbarVisibility, RenderMinimap, RenderLineNumbersType, GlyphMarginLane, OverviewRulerLane, OverlayWidgetPositionPreference, MouseTargetType, MinimapSectionHeaderStyle, MinimapPosition, EndOfLineSequence, EndOfLinePreference, EditorOption, EditorAutoIndentStrategy, DefaultEndOfLine, CursorChangeReason, ContentWidgetPositionPreference, AccessibilitySupport } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/standalone/standaloneEnums';
 import { Colorizer } from './colorizer.js';
 import { StandaloneEditor, StandaloneDiffEditor2, createTextModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneCodeEditor';
 import { StandaloneServices, StandaloneKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices';
@@ -333,6 +333,7 @@ function createMonacoEditorAPI() {
         InjectedTextCursorStops: InjectedTextCursorStops,
         PositionAffinity: PositionAffinity,
         ShowLightbulbIconMode: ShowLightbulbIconMode,
+        TextDirection: TextDirection,
         ConfigurationChangedEvent: ConfigurationChangedEvent,
         BareFontInfo: BareFontInfo,
         FontInfo: FontInfo,

package/vscode/src/vs/editor/standalone/browser/standaloneWebWorker.d.ts

@@ -7,7 +7,7 @@ export interface MonacoWebWorker<T> {
     withSyncedResources(resources: URI[]): Promise<T>;
 }
 export interface IInternalWebWorkerOptions {
-    worker: Worker;
+    worker: Worker | Promise<Worker>;
     host?: any;
     keepIdleModels?: boolean;
 }

package/vscode/src/vs/editor/standalone/browser/standaloneWebWorker.js

@@ -11,6 +11,9 @@ class MonacoWebWorkerImpl extends EditorWorkerClient {
         this._foreignProxy = this._getProxy().then(proxy => {
             return ( new Proxy({}, {
                 get(target, prop, receiver) {
+                    if (prop === 'then') {
+                        return undefined;
+                    }
                     if (typeof prop !== 'string') {
                         throw ( new Error(`Not supported`));
                     }

package/vscode/src/vs/editor/standalone/common/monarch/monarchCommon.d.ts

@@ -45,6 +45,7 @@ export interface IRule {
 }
 export interface IAction {
     group?: FuzzyAction[];
+    hasEmbeddedEndInCases?: boolean;
     test?: (id: string, matches: string[], state: string, eos: boolean) => FuzzyAction;
     token?: string;
     tokenSubst?: boolean;

package/vscode/src/vs/editor/standalone/common/monarch/monarchCommon.js

@@ -1,4 +1,5 @@
 
+import { escapeRegExpCharacters } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 
 var MonarchBracket;
 (function (MonarchBracket) {
@@ -68,7 +69,7 @@ function substituteMatchesRe(lexer, str, state) {
             stateMatches.unshift(state);
         }
         if (!empty(s) && s < stateMatches.length) {
-            return fixCase(lexer, stateMatches[s]);
+            return escapeRegExpCharacters(fixCase(lexer, stateMatches[s]));
         }
         return '';
     });

package/vscode/src/vs/editor/standalone/common/monarch/monarchCompile.js

@@ -1,4 +1,5 @@
 
+import { isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { createError, empty, substituteMatchesRe, substituteMatches, fixCase, MonarchBracket, stateExists } from './monarchCommon.js';
 
 function isArrayOf(elemType, obj) {
@@ -270,6 +271,7 @@ function compileAction(lexer, ruleName, action) {
     }
     else if (action.cases) {
         const cases = [];
+        let hasEmbeddedEndInCases = false;
         for (const tkey in action.cases) {
             if (action.cases.hasOwnProperty(tkey)) {
                 const val = compileAction(lexer, ruleName, action.cases[tkey]);
@@ -282,10 +284,14 @@ function compileAction(lexer, ruleName, action) {
                 else {
                     cases.push(createGuard(lexer, ruleName, tkey, val));
                 }
+                if (!hasEmbeddedEndInCases) {
+                    hasEmbeddedEndInCases = !isString(val) && (val.hasEmbeddedEndInCases || ['@pop', '@popall'].includes(val.nextEmbedded || ''));
+                }
             }
         }
         const def = lexer.defaultToken;
         return {
+            hasEmbeddedEndInCases,
             test: function (id, matches, state, eos) {
                 for (const _case of cases) {
                     const didmatch = (!_case.test || _case.test(id, matches, state, eos));

package/vscode/src/vs/editor/standalone/common/monarch/monarchLexer.js

@@ -385,7 +385,7 @@ let MonarchTokenizer = MonarchTokenizer_1 = class MonarchTokenizer extends Dispo
         let popOffset = -1;
         let hasEmbeddedPopRule = false;
         for (const rule of rules) {
-            if (!isIAction(rule.action) || rule.action.nextEmbedded !== '@pop') {
+            if (!isIAction(rule.action) || !(rule.action.nextEmbedded === '@pop' || rule.action.hasEmbeddedEndInCases)) {
                 continue;
             }
             hasEmbeddedPopRule = true;