@theia/monaco 1.28.0-next.9 → 1.29.0-next.10

package/lib/browser/textmate/monaco-theme-types.d.ts

@@ -1,4 +1,15 @@
 import * as monaco from '@theia/monaco-editor-core';
+import { IStandaloneTheme } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
+import { IOnigLib, IRawTheme, Registry } from 'vscode-textmate';
+export interface ThemeMix extends IRawTheme, monaco.editor.IStandaloneThemeData {
+}
+export interface MixStandaloneTheme extends IStandaloneTheme {
+    themeData: ThemeMix;
+}
+export declare const OnigasmPromise: unique symbol;
+export declare type OnigasmPromise = Promise<IOnigLib>;
+export declare const TextmateRegistryFactory: unique symbol;
+export declare type TextmateRegistryFactory = (currentTheme?: ThemeMix) => Registry;
 export declare type MonacoThemeColor = monaco.editor.IColors;
 export interface MonacoTokenRule extends monaco.editor.ITokenThemeRule {
 }

package/lib/browser/textmate/monaco-theme-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-theme-types.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-theme-types.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD,oBAAY,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;AACrD,MAAM,WAAW,eAAgB,SAAQ,MAAM,CAAC,MAAM,CAAC,eAAe;CAAI;AAC1E,oBAAY,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;AAC5D,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,MAAM,CAAC,oBAAoB;IACnE,IAAI,EAAE,MAAM,CAAC;CAChB"}
+{"version":3,"file":"monaco-theme-types.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-theme-types.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2EAA2E,CAAC;AAC7G,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEhE,MAAM,WAAW,QAAS,SAAQ,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB;CAAI;AACnF,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IACxD,SAAS,EAAE,QAAQ,CAAA;CACtB;AAED,eAAO,MAAM,cAAc,eAA2B,CAAC;AACvD,oBAAY,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/C,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AACzE,oBAAY,uBAAuB,GAAG,CAAC,YAAY,CAAC,EAAE,QAAQ,KAAK,QAAQ,CAAC;AAE5E,oBAAY,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;AACrD,MAAM,WAAW,eAAgB,SAAQ,MAAM,CAAC,MAAM,CAAC,eAAe;CAAI;AAC1E,oBAAY,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;AAC5D,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,MAAM,CAAC,oBAAoB;IACnE,IAAI,EAAE,MAAM,CAAC;CAChB"}

package/lib/browser/textmate/monaco-theme-types.js

@@ -15,5 +15,8 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.TextmateRegistryFactory = exports.OnigasmPromise = void 0;
+exports.OnigasmPromise = Symbol('OnigasmPromise');
+exports.TextmateRegistryFactory = Symbol('TextmateRegistryFactory');
 ;
 //# sourceMappingURL=monaco-theme-types.js.map

package/lib/browser/textmate/monaco-theme-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-theme-types.js","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-theme-types.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;AAKN,CAAC"}
+{"version":3,"file":"monaco-theme-types.js","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-theme-types.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAWnE,QAAA,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAE1C,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AAIC,CAAC"}

package/lib/browser/textmate/textmate-tokenizer.d.ts

@@ -19,13 +19,5 @@ export interface TokenizerOption {
      */
     lineLimit?: number;
 }
-export declare namespace TokenizerOption {
-    /**
-     * The default TextMate tokenizer option.
-     *
-     * @deprecated Use the current value of `editor.maxTokenizationLineLength` preference instead.
-     */
-    const DEFAULT: TokenizerOption;
-}
 export declare function createTextmateTokenizer(grammar: IGrammar, options: TokenizerOption): monaco.languages.EncodedTokensProvider & monaco.languages.TokensProvider;
 //# sourceMappingURL=textmate-tokenizer.d.ts.map

package/lib/browser/textmate/textmate-tokenizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"textmate-tokenizer.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-tokenizer.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAW,YAAY,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD,qBAAa,cAAe,YAAW,MAAM,CAAC,SAAS,CAAC,MAAM;aAGtC,SAAS,EAAE,YAAY;gBAAvB,SAAS,EAAE,YAAY;IAG3C,KAAK,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM;IAIhC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,OAAO;CAIlD;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAE5B;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CAEtB;AAED,yBAAiB,eAAe,CAAC;IAC7B;;;;OAIG;IACI,MAAM,OAAO,EAAE,eAErB,CAAC;CACL;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,qBAAqB,GAAG,MAAM,CAAC,SAAS,CAAC,cAAc,CAkC7J"}
+{"version":3,"file":"textmate-tokenizer.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-tokenizer.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAW,YAAY,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD,qBAAa,cAAe,YAAW,MAAM,CAAC,SAAS,CAAC,MAAM;aAGtC,SAAS,EAAE,YAAY;gBAAvB,SAAS,EAAE,YAAY;IAG3C,KAAK,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM;IAIhC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,OAAO;CAIlD;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAE5B;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CAEtB;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,qBAAqB,GAAG,MAAM,CAAC,SAAS,CAAC,cAAc,CAgC7J"}

package/lib/browser/textmate/textmate-tokenizer.js

@@ -15,7 +15,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTextmateTokenizer = exports.TokenizerOption = exports.TokenizerState = void 0;
+exports.createTextmateTokenizer = exports.TokenizerState = void 0;
 const vscode_textmate_1 = require("vscode-textmate");
 class TokenizerState {
     constructor(ruleStack) {
@@ -29,17 +29,6 @@ class TokenizerState {
     }
 }
 exports.TokenizerState = TokenizerState;
-var TokenizerOption;
-(function (TokenizerOption) {
-    /**
-     * The default TextMate tokenizer option.
-     *
-     * @deprecated Use the current value of `editor.maxTokenizationLineLength` preference instead.
-     */
-    TokenizerOption.DEFAULT = {
-        lineLimit: 400
-    };
-})(TokenizerOption = exports.TokenizerOption || (exports.TokenizerOption = {}));
 function createTextmateTokenizer(grammar, options) {
     if (options.lineLimit !== undefined && (options.lineLimit <= 0 || !Number.isInteger(options.lineLimit))) {
         throw new Error(`The 'lineLimit' must be a positive integer. It was ${options.lineLimit}.`);
@@ -47,24 +36,22 @@ function createTextmateTokenizer(grammar, options) {
     return {
         getInitialState: () => new TokenizerState(vscode_textmate_1.INITIAL),
         tokenizeEncoded(line, state) {
-            let processedLine = line;
             if (options.lineLimit !== undefined && line.length > options.lineLimit) {
-                // Line is too long to be tokenized
-                processedLine = line.substring(0, options.lineLimit);
+                // Skip tokenizing the line if it exceeds the line limit.
+                return { endState: state.ruleStack, tokens: new Uint32Array() };
             }
-            const result = grammar.tokenizeLine2(processedLine, state.ruleStack);
+            const result = grammar.tokenizeLine2(line, state.ruleStack, 500);
             return {
                 endState: new TokenizerState(result.ruleStack),
                 tokens: result.tokens
             };
         },
         tokenize(line, state) {
-            let processedLine = line;
             if (options.lineLimit !== undefined && line.length > options.lineLimit) {
-                // Line is too long to be tokenized
-                processedLine = line.substring(0, options.lineLimit);
+                // Skip tokenizing the line if it exceeds the line limit.
+                return { endState: state.ruleStack, tokens: [] };
             }
-            const result = grammar.tokenizeLine(processedLine, state.ruleStack);
+            const result = grammar.tokenizeLine(line, state.ruleStack, 500);
             return {
                 endState: new TokenizerState(result.ruleStack),
                 tokens: result.tokens.map(t => ({

package/lib/browser/textmate/textmate-tokenizer.js.map

@@ -1 +1 @@
-{"version":3,"file":"textmate-tokenizer.js","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-tokenizer.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAEhF,qDAAkE;AAGlE,MAAa,cAAc;IAEvB,YACoB,SAAuB;QAAvB,cAAS,GAAT,SAAS,CAAc;IACvC,CAAC;IAEL,KAAK;QACD,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,CAAC,KAA8B;QACjC,OAAO,KAAK,YAAY,cAAc,IAAI,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC;IACrG,CAAC;CAEJ;AAdD,wCAcC;AAkBD,IAAiB,eAAe,CAS/B;AATD,WAAiB,eAAe;IAC5B;;;;OAIG;IACU,uBAAO,GAAoB;QACpC,SAAS,EAAE,GAAG;KACjB,CAAC;AACN,CAAC,EATgB,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAS/B;AAED,SAAgB,uBAAuB,CAAC,OAAiB,EAAE,OAAwB;IAC/E,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE;QACrG,MAAM,IAAI,KAAK,CAAC,sDAAsD,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC;KAC/F;IACD,OAAO;QACH,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,cAAc,CAAC,yBAAO,CAAC;QAClD,eAAe,CAAC,IAAY,EAAE,KAAqB;YAC/C,IAAI,aAAa,GAAG,IAAI,CAAC;YACzB,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE;gBACpE,mCAAmC;gBACnC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;aACxD;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;YACrE,OAAO;gBACH,QAAQ,EAAE,IAAI,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC9C,MAAM,EAAE,MAAM,CAAC,MAAM;aACxB,CAAC;QACN,CAAC;QACD,QAAQ,CAAC,IAAY,EAAE,KAAqB;YACxC,IAAI,aAAa,GAAG,IAAI,CAAC;YACzB,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE;gBACpE,mCAAmC;gBACnC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;aACxD;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;YACpE,OAAO;gBACH,QAAQ,EAAE,IAAI,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC9C,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBAC5B,UAAU,EAAE,CAAC,CAAC,UAAU;oBACxB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;iBACvC,CAAC,CAAC;aACN,CAAC;QACN,CAAC;KACJ,CAAC;AACN,CAAC;AAlCD,0DAkCC"}
+{"version":3,"file":"textmate-tokenizer.js","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-tokenizer.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAEhF,qDAAkE;AAGlE,MAAa,cAAc;IAEvB,YACoB,SAAuB;QAAvB,cAAS,GAAT,SAAS,CAAc;IACvC,CAAC;IAEL,KAAK;QACD,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,CAAC,KAA8B;QACjC,OAAO,KAAK,YAAY,cAAc,IAAI,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC;IACrG,CAAC;CAEJ;AAdD,wCAcC;AAkBD,SAAgB,uBAAuB,CAAC,OAAiB,EAAE,OAAwB;IAC/E,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE;QACrG,MAAM,IAAI,KAAK,CAAC,sDAAsD,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC;KAC/F;IACD,OAAO;QACH,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,cAAc,CAAC,yBAAO,CAAC;QAClD,eAAe,CAAC,IAAY,EAAE,KAAqB;YAC/C,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE;gBACpE,yDAAyD;gBACzD,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,WAAW,EAAE,EAAE,CAAC;aACnE;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;YACjE,OAAO;gBACH,QAAQ,EAAE,IAAI,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC9C,MAAM,EAAE,MAAM,CAAC,MAAM;aACxB,CAAC;QACN,CAAC;QACD,QAAQ,CAAC,IAAY,EAAE,KAAqB;YACxC,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE;gBACpE,yDAAyD;gBACzD,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;aACpD;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;YAChE,OAAO;gBACH,QAAQ,EAAE,IAAI,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC9C,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBAC5B,UAAU,EAAE,CAAC,CAAC,UAAU;oBACxB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;iBACvC,CAAC,CAAC;aACN,CAAC;QACN,CAAC;KACJ,CAAC;AACN,CAAC;AAhCD,0DAgCC"}

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@theia/monaco",
-  "version": "1.28.0-next.9+c0ee4dcf6bb",
+  "version": "1.29.0-next.10+c617a60355d",
   "description": "Theia - Monaco Extension",
   "dependencies": {
-    "@theia/core": "1.28.0-next.9+c0ee4dcf6bb",
-    "@theia/editor": "1.28.0-next.9+c0ee4dcf6bb",
-    "@theia/filesystem": "1.28.0-next.9+c0ee4dcf6bb",
-    "@theia/markers": "1.28.0-next.9+c0ee4dcf6bb",
-    "@theia/monaco-editor-core": "1.65.2",
-    "@theia/outline-view": "1.28.0-next.9+c0ee4dcf6bb",
+    "@theia/core": "1.29.0-next.10+c617a60355d",
+    "@theia/editor": "1.29.0-next.10+c617a60355d",
+    "@theia/filesystem": "1.29.0-next.10+c617a60355d",
+    "@theia/markers": "1.29.0-next.10+c617a60355d",
+    "@theia/monaco-editor-core": "1.67.2",
+    "@theia/outline-view": "1.29.0-next.10+c617a60355d",
     "fast-plist": "^0.1.2",
     "idb": "^4.0.5",
     "jsonc-parser": "^2.2.0",
-    "onigasm": "^2.2.0",
-    "vscode-textmate": "^4.4.0"
+    "vscode-oniguruma": "1.6.1",
+    "vscode-textmate": "^7.0.1"
   },
   "publishConfig": {
     "access": "public"
@@ -49,10 +49,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.27.0"
+    "@theia/ext-scripts": "1.28.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "c0ee4dcf6bb10be905cc5a58d04b10faa3800d67"
+  "gitHead": "c617a60355d5cbfaf1fecb3554cda9329eeeb1f9"
 }

package/src/browser/monaco-color-registry.ts

@@ -38,14 +38,15 @@ export class MonacoColorRegistry extends ColorRegistry {
 
     override getCurrentColor(id: string): string | undefined {
         const color = this.monacoThemeService.getColorTheme().getColor(id);
-        return color && color.toString();
+        return color?.toString();
     }
 
     protected override doRegister(definition: ColorDefinition): Disposable {
         const defaults: ColorDefaults = {
             dark: this.toColor(definition.defaults?.dark),
             light: this.toColor(definition.defaults?.light),
-            hc: this.toColor(definition.defaults?.hc),
+            hcDark: this.toColor(definition.defaults?.hcDark ?? definition.defaults?.hc),
+            hcLight: this.toColor(definition.defaults?.hcLight),
         };
         const identifier = this.monacoColorRegistry.registerColor(definition.id, defaults, definition.description);
         return Disposable.create(() => this.monacoColorRegistry.deregisterColor(identifier));

package/src/browser/monaco-command.ts

@@ -135,7 +135,7 @@ export class MonacoEditorCommandHandlers implements CommandContribution {
      * and execute them using the instantiation service of the current editor.
      */
     protected registerMonacoCommands(): void {
-        const editorActions = new Map(EditorExtensionsRegistry.getEditorActions().map(({ id, label }) => [id, label]));
+        const editorActions = new Map(EditorExtensionsRegistry.getEditorActions().map(({ id, label, alias }) => [id, { label, alias }]));
 
         const { codeEditorService } = this;
         const globalInstantiationService = StandaloneServices.initialize({});
@@ -179,8 +179,8 @@ export class MonacoEditorCommandHandlers implements CommandContribution {
                     return true;
                 }
             };
-            const label = editorActions.get(id);
-            this.commandRegistry.registerCommand({ id, label }, handler);
+            const commandAction = editorActions.get(id);
+            this.commandRegistry.registerCommand({ id, label: commandAction?.label, originalLabel: commandAction?.alias }, handler);
             const coreCommand = MonacoCommands.COMMON_ACTIONS.get(id);
             if (coreCommand) {
                 this.commandRegistry.registerHandler(coreCommand, handler);

package/src/browser/monaco-diff-editor.ts

@@ -63,6 +63,10 @@ export class MonacoDiffEditor extends MonacoEditor {
 
     protected override create(options?: IDiffEditorConstructionOptions, override?: EditorServiceOverrides): Disposable {
         const instantiator = this.getInstantiatorWithOverrides(override);
+        /**
+         *  @monaco-uplift. Should be guaranteed to work.
+         *  Incomparable enums prevent TypeScript from believing that public IStandaloneDiffEditor is satisfied by private StandaloneDiffEditor
+         */
         this._diffEditor = instantiator
             .createInstance(StandaloneDiffEditor, this.node, { ...options, fixedOverflowWidgets: true }) as unknown as monaco.editor.IStandaloneDiffEditor;
         this.editor = this._diffEditor.getModifiedEditor();

package/src/browser/monaco-editor.ts

@@ -142,7 +142,10 @@ export class MonacoEditor extends MonacoEditorServices implements TextEditor {
             }
         } as IStandaloneEditorConstructionOptions;
         const instantiator = this.getInstantiatorWithOverrides(override);
-        // Incomparability of internal and external interfaces.
+        /**
+         * @monaco-uplift. Should be guaranteed to work.
+         * Incomparable enums prevent TypeScript from believing that public IStandaloneCodeEditor is satisfied by private StandaloneCodeEditor
+         */
         return this.editor = instantiator.createInstance(StandaloneEditor, this.node, combinedOptions) as unknown as monaco.editor.IStandaloneCodeEditor;
     }
 

package/src/browser/monaco-frontend-application-contribution.ts

@@ -35,6 +35,16 @@ import { editorOptionsRegistry, IEditorOption } from '@theia/monaco-editor-core/
 import { MAX_SAFE_INTEGER } from '@theia/core';
 import { editorGeneratedPreferenceProperties } from '@theia/editor/lib/browser/editor-generated-preference-schema';
 
+let theiaDidInitialize = false;
+const originalInitialize = StandaloneServices.initialize;
+StandaloneServices.initialize = overrides => {
+    if (!theiaDidInitialize) {
+        console.warn('Monaco was initialized before overrides were installed by Theia\'s initialization.'
+            + ' Please check the lifecycle of services that use Monaco and ensure that Monaco entities are not instantiated before Theia is initialized.', new Error());
+    }
+    return originalInitialize(overrides);
+};
+
 @injectable()
 export class MonacoFrontendApplicationContribution implements FrontendApplicationContribution, StylingParticipant {
 
@@ -65,6 +75,7 @@ export class MonacoFrontendApplicationContribution implements FrontendApplicatio
     protected init(): void {
         this.addAdditionalPreferenceValidations();
         const { codeEditorService, textModelService, contextKeyService, contextMenuService } = this;
+        theiaDidInitialize = true;
         StandaloneServices.initialize({
             [ICodeEditorService.toString()]: codeEditorService,
             [ITextModelService.toString()]: textModelService,
@@ -74,7 +85,10 @@ export class MonacoFrontendApplicationContribution implements FrontendApplicatio
         // Monaco registers certain quick access providers (e.g. QuickCommandAccess) at import time, but we want to use our own.
         this.quickAccessRegistry.clear();
 
-        // Incomparability of enum types between public and private API's
+        /**
+         * @monaco-uplift.Should be guaranteed to work.
+         * Incomparable enums prevent TypeScript from believing that public ITextModel satisfied private ITextModel
+         */
         setSnippetSuggestSupport(this.snippetSuggestProvider as unknown as CompletionItemProvider);
 
         for (const language of monaco.languages.getLanguages()) {
@@ -167,7 +181,7 @@ export class MonacoFrontendApplicationContribution implements FrontendApplicatio
                 new editorBoolConstructor(id++, 'wordBasedSuggestions', true, editorGeneratedPreferenceProperties['editor.wordBasedSuggestions']),
                 new editorStringEnumConstructor(id++, 'wordBasedSuggestionsMode', 'matchingDocuments', editorGeneratedPreferenceProperties['editor.wordBasedSuggestionsMode'].enum, editorGeneratedPreferenceProperties['editor.wordBasedSuggestionsMode']),
                 new editorBoolConstructor(id++, 'stablePeek', false, editorGeneratedPreferenceProperties['editor.stablePeek']),
-                new editorIntConstructor(id++, 'maxTokenizationLength', 20000, 1, MAX_SAFE_INTEGER, editorGeneratedPreferenceProperties['editor.maxTokenizationLength']),
+                new editorIntConstructor(id++, 'maxTokenizationLineLength', 20000, 1, MAX_SAFE_INTEGER, editorGeneratedPreferenceProperties['editor.maxTokenizationLineLength']),
             );
         }
     }

package/src/browser/monaco-indexed-db.ts

@@ -19,8 +19,9 @@ import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposa
 import { ThemeService } from '@theia/core/lib/browser/theming';
 import * as monaco from '@theia/monaco-editor-core';
 import { injectable } from '@theia/core/shared/inversify';
-import type { ThemeMix } from './textmate/monaco-theme-registry';
+import type { ThemeMix } from './textmate/monaco-theme-types';
 import { Theme } from '@theia/core/lib/common/theme';
+import { Emitter, Event } from '@theia/core';
 
 let _monacoDB: Promise<idb.IDBPDatabase> | undefined;
 if ('indexedDB' in window) {
@@ -99,25 +100,31 @@ export function stateToTheme(state: MonacoThemeState): Theme {
     };
 }
 
-async function getThemeFromDB(id: string): Promise<Theme | undefined> {
-    const matchingState = (await getThemes()).find(theme => theme.id === id);
-    return matchingState && stateToTheme(matchingState);
-}
-
 @injectable()
 export class ThemeServiceWithDB extends ThemeService {
+    protected onDidRetrieveThemeEmitter = new Emitter<MonacoThemeState>();
+    get onDidRetrieveTheme(): Event<MonacoThemeState> {
+        return this.onDidRetrieveThemeEmitter.event;
+    }
+
     override loadUserTheme(): void {
         this.loadUserThemeWithDB();
     }
 
     protected async loadUserThemeWithDB(): Promise<void> {
-        const themeId = window.localStorage.getItem('theme') || this.defaultTheme.id;
-        const theme = this.themes[themeId] ?? await getThemeFromDB(themeId) ?? this.defaultTheme;
+        const themeId = window.localStorage.getItem(ThemeService.STORAGE_KEY) ?? this.defaultTheme.id;
+        const theme = this.themes[themeId] ?? await getThemes().then(themes => {
+            const matchingTheme = themes.find(candidate => candidate.id === themeId);
+            if (matchingTheme) {
+                this.onDidRetrieveThemeEmitter.fire(matchingTheme);
+                return stateToTheme(matchingTheme);
+            }
+        }) ?? this.getTheme(themeId);
         // In case the theme comes from the DB.
         if (!this.themes[theme.id]) {
             this.themes[theme.id] = theme;
         }
-        this.setCurrentTheme(theme.id);
+        this.setCurrentTheme(theme.id, false);
         this.deferredInitializer.resolve();
     }
 }

package/src/browser/monaco-quick-input-service.ts

@@ -214,7 +214,7 @@ export class MonacoQuickInputService implements QuickInputService {
     }
 
     createInputBox(): InputBox {
-        return this.monacoService.createInputBox() as unknown as InputBox;
+        return this.monacoService.createInputBox();
     }
 
     input(options?: InputOptions, token?: monaco.CancellationToken): Promise<string | undefined> {
@@ -253,6 +253,7 @@ export class MonacoQuickInputService implements QuickInputService {
         return new Promise<T | undefined>((resolve, reject) => {
             const quickPick = this.monacoService.createQuickPick<MonacoQuickPickItem<T>>();
             const wrapped = this.wrapQuickPick(quickPick);
+            wrapped.items = items;
 
             if (options) {
                 wrapped.canSelectMany = !!options.canSelectMany;
@@ -321,8 +322,6 @@ export class MonacoQuickInputService implements QuickInputService {
                     }
                 });
             }
-
-            wrapped.items = items;
             wrapped.show();
         }).then(item => {
             if (item?.execute) {

package/src/browser/monaco-text-model-service.ts

@@ -134,7 +134,9 @@ export class MonacoTextModelService implements ITextModelService {
         switch (editorPreference) {
             case 'editor.tabSize': return 'tabSize';
             case 'editor.insertSpaces': return 'insertSpaces';
-            case 'editor.bracketPairColorization.enabled': return 'bracketColorizationOptions';
+            case 'editor.bracketPairColorization.enabled':
+            case 'editor.bracketPairColorization.independentColorPoolPerBracketType':
+                return 'bracketColorizationOptions';
             case 'editor.trimAutoWhitespace': return 'trimAutoWhitespace';
 
         }
@@ -142,28 +144,21 @@ export class MonacoTextModelService implements ITextModelService {
     }
 
     protected updateModel(model: MonacoEditorModel, change?: EditorPreferenceChange): void {
-        if (change) {
-            if (!change.affects(model.uri, model.languageId)) {
-                return;
-            }
+        if (!change) {
+            model.autoSave = this.editorPreferences.get('files.autoSave', undefined, model.uri);
+            model.autoSaveDelay = this.editorPreferences.get('files.autoSaveDelay', undefined, model.uri);
+            model.textEditorModel.updateOptions(this.getModelOptions(model));
+        } else if (change.affects(model.uri, model.languageId)) {
             if (change.preferenceName === 'files.autoSave') {
                 model.autoSave = this.editorPreferences.get('files.autoSave', undefined, model.uri);
             }
             if (change.preferenceName === 'files.autoSaveDelay') {
                 model.autoSaveDelay = this.editorPreferences.get('files.autoSaveDelay', undefined, model.uri);
             }
-            const modelOption = this.modelOptions[change.preferenceName];
+            const modelOption = this.toModelOption(change.preferenceName);
             if (modelOption) {
-                const options: ITextModelUpdateOptions = {};
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                const newValue = change.newValue as any;
-                options[modelOption] = change.preferenceName === 'editor.bracketPairColorization.enabled' ? { enabled: newValue } : newValue;
-                model.textEditorModel.updateOptions(options);
+                model.textEditorModel.updateOptions(this.getModelOptions(model));
             }
-        } else {
-            model.autoSave = this.editorPreferences.get('files.autoSave', undefined, model.uri);
-            model.autoSaveDelay = this.editorPreferences.get('files.autoSaveDelay', undefined, model.uri);
-            model.textEditorModel.updateOptions(this.getModelOptions(model));
         }
     }
 
@@ -176,7 +171,11 @@ export class MonacoTextModelService implements ITextModelService {
         return {
             tabSize: this.editorPreferences.get({ preferenceName: 'editor.tabSize', overrideIdentifier }, undefined, uri),
             insertSpaces: this.editorPreferences.get({ preferenceName: 'editor.insertSpaces', overrideIdentifier }, undefined, uri),
-            bracketColorizationOptions: { enabled: this.editorPreferences.get({ preferenceName: 'editor.bracketPairColorization.enabled', overrideIdentifier }, undefined, uri) },
+            bracketColorizationOptions: {
+                enabled: this.editorPreferences.get({ preferenceName: 'editor.bracketPairColorization.enabled', overrideIdentifier }, undefined, uri),
+                independentColorPoolPerBracketType: this.editorPreferences.get(
+                    { preferenceName: 'editor.bracketPairColorization.independentColorPoolPerBracketType', overrideIdentifier }, undefined, uri),
+            },
             trimAutoWhitespace: this.editorPreferences.get({ preferenceName: 'editor.trimAutoWhitespace', overrideIdentifier }, undefined, uri),
         };
     }

package/src/browser/monaco-theming-service.ts

@@ -19,11 +19,10 @@
 import { injectable, inject } from '@theia/core/shared/inversify';
 import * as jsoncparser from 'jsonc-parser';
 import * as plistparser from 'fast-plist';
-import { ThemeService } from '@theia/core/lib/browser/theming';
 import URI from '@theia/core/lib/common/uri';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { MonacoThemeRegistry } from './textmate/monaco-theme-registry';
-import { getThemes, putTheme, MonacoThemeState, stateToTheme } from './monaco-indexed-db';
+import { getThemes, putTheme, MonacoThemeState, stateToTheme, ThemeServiceWithDB } from './monaco-indexed-db';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import * as monaco from '@theia/monaco-editor-core';
 
@@ -61,7 +60,7 @@ export class MonacoThemingService {
 
     @inject(FileService) protected readonly fileService: FileService;
     @inject(MonacoThemeRegistry) protected readonly monacoThemeRegistry: MonacoThemeRegistry;
-    @inject(ThemeService) protected readonly themeService: ThemeService;
+    @inject(ThemeServiceWithDB) protected readonly themeService: ThemeServiceWithDB;
 
     /** Register themes whose configuration needs to be loaded */
     register(theme: MonacoTheme, pending: { [uri: string]: Promise<any> } = {}): Disposable {
@@ -143,6 +142,7 @@ export class MonacoThemingService {
         this.monacoThemeRegistry.initializeDefaultThemes();
         this.updateBodyUiTheme();
         this.themeService.onDidColorThemeChange(() => this.updateBodyUiTheme());
+        this.themeService.onDidRetrieveTheme(theme => this.monacoThemeRegistry.setTheme(MonacoThemingService.toCssSelector(theme.id), theme.data));
         this.restore();
     }
 

package/src/browser/textmate/monaco-textmate-frontend-bindings.ts

@@ -19,17 +19,18 @@ import { FrontendApplicationContribution, isBasicWasmSupported } from '@theia/co
 import { bindContributionProvider } from '@theia/core';
 import { TextmateRegistry } from './textmate-registry';
 import { LanguageGrammarDefinitionContribution } from './textmate-contribution';
-import { MonacoTextmateService, OnigasmPromise } from './monaco-textmate-service';
+import { MonacoTextmateService } from './monaco-textmate-service';
 import { MonacoThemeRegistry } from './monaco-theme-registry';
-import { loadWASM, OnigScanner, OnigString } from 'onigasm';
-import { IOnigLib } from 'vscode-textmate';
+import { loadWASM, createOnigScanner, OnigScanner, createOnigString, OnigString } from 'vscode-oniguruma';
+import { IOnigLib, IRawGrammar, parseRawGrammar, Registry } from 'vscode-textmate';
+import { OnigasmPromise, TextmateRegistryFactory, ThemeMix } from './monaco-theme-types';
 
 export class OnigasmLib implements IOnigLib {
     createOnigScanner(sources: string[]): OnigScanner {
-        return new OnigScanner(sources);
+        return createOnigScanner(sources);
     }
     createOnigString(sources: string): OnigString {
-        return new OnigString(sources);
+        return createOnigString(sources);
     }
 }
 
@@ -40,6 +41,35 @@ export default (bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: inter
     bindContributionProvider(bind, LanguageGrammarDefinitionContribution);
     bind(TextmateRegistry).toSelf().inSingletonScope();
     bind(MonacoThemeRegistry).toSelf().inSingletonScope();
+    bind(TextmateRegistryFactory).toFactory(({ container }) => (theme?: ThemeMix) => {
+        const onigLib = container.get<OnigasmPromise>(OnigasmPromise);
+        const textmateRegistry = container.get(TextmateRegistry);
+        return new Registry({
+            onigLib,
+            theme,
+            loadGrammar: async (scopeName: string) => {
+                const provider = textmateRegistry.getProvider(scopeName);
+                if (provider) {
+                    const definition = await provider.getGrammarDefinition();
+                    let rawGrammar: IRawGrammar;
+                    if (typeof definition.content === 'string') {
+                        rawGrammar = parseRawGrammar(definition.content, definition.format === 'json' ? 'grammar.json' : 'grammar.plist');
+                    } else {
+                        rawGrammar = definition.content as IRawGrammar;
+                    }
+                    return rawGrammar;
+                }
+                return undefined;
+            },
+            getInjections: (scopeName: string) => {
+                const provider = textmateRegistry.getProvider(scopeName);
+                if (provider && provider.getInjections) {
+                    return provider.getInjections(scopeName);
+                }
+                return [];
+            }
+        });
+    });
 };
 
 export async function dynamicOnigasmLib(ctx: interfaces.Context): Promise<IOnigLib> {
@@ -57,7 +87,7 @@ export async function createOnigasmLib(): Promise<IOnigLib> {
 
 export async function fetchOnigasm(): Promise<ArrayBuffer> {
     // Using Webpack's wasm loader should give us a URL to fetch the resource from:
-    const onigasmPath: string = require('onigasm/lib/onigasm.wasm');
+    const onigasmPath: string = require('vscode-oniguruma/release/onig.wasm');
     const response = await fetch(onigasmPath, { method: 'GET' });
     return response.arrayBuffer();
 }

package/src/browser/textmate/monaco-textmate-service.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { injectable, inject, named } from '@theia/core/shared/inversify';
-import { Registry, IOnigLib, IRawGrammar, parseRawGrammar } from 'vscode-textmate';
+import { Registry } from 'vscode-textmate';
 import { ILogger, ContributionProvider, DisposableCollection, Disposable } from '@theia/core';
 import { FrontendApplicationContribution, isBasicWasmSupported } from '@theia/core/lib/browser';
 import { ThemeService } from '@theia/core/lib/browser/theming';
@@ -31,9 +31,7 @@ import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/stan
 import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language';
 import { TokenizationSupportAdapter } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneLanguages';
 import { LanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageService';
-
-export const OnigasmPromise = Symbol('OnigasmPromise');
-export type OnigasmPromise = Promise<IOnigLib>;
+import { OnigasmPromise, TextmateRegistryFactory } from './monaco-theme-types';
 
 @injectable()
 export class MonacoTextmateService implements FrontendApplicationContribution {
@@ -67,6 +65,9 @@ export class MonacoTextmateService implements FrontendApplicationContribution {
     @inject(EditorPreferences)
     protected readonly preferences: EditorPreferences;
 
+    @inject(TextmateRegistryFactory)
+    protected readonly registryFactory: TextmateRegistryFactory;
+
     initialize(): void {
         if (!isBasicWasmSupported) {
             console.log('Textmate support deactivated because WebAssembly is not detected.');
@@ -81,31 +82,7 @@ export class MonacoTextmateService implements FrontendApplicationContribution {
             }
         }
 
-        this.grammarRegistry = new Registry({
-            getOnigLib: () => this.onigasmPromise,
-            theme: this.monacoThemeRegistry.getThemeData(this.currentEditorTheme),
-            loadGrammar: async (scopeName: string) => {
-                const provider = this.textmateRegistry.getProvider(scopeName);
-                if (provider) {
-                    const definition = await provider.getGrammarDefinition();
-                    let rawGrammar: IRawGrammar;
-                    if (typeof definition.content === 'string') {
-                        rawGrammar = parseRawGrammar(definition.content, definition.format === 'json' ? 'grammar.json' : 'grammar.plist');
-                    } else {
-                        rawGrammar = definition.content as IRawGrammar;
-                    }
-                    return rawGrammar;
-                }
-                return undefined;
-            },
-            getInjections: (scopeName: string) => {
-                const provider = this.textmateRegistry.getProvider(scopeName);
-                if (provider && provider.getInjections) {
-                    return provider.getInjections(scopeName);
-                }
-                return [];
-            }
-        });
+        this.grammarRegistry = this.registryFactory(this.monacoThemeRegistry.getThemeData(this.currentEditorTheme));
 
         this.tokenizerOption.lineLimit = this.preferences['editor.maxTokenizationLineLength'];
         this.preferences.onPreferenceChanged(e => {

package/src/browser/textmate/monaco-theme-registry.ts

@@ -17,22 +17,20 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { injectable } from '@theia/core/shared/inversify';
-import { IRawTheme, Registry, IRawThemeSetting } from 'vscode-textmate';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { IRawThemeSetting } from 'vscode-textmate';
 import * as monaco from '@theia/monaco-editor-core';
-import { IStandaloneTheme, IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
+import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
 import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 import { StandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneThemeService';
 import { Color } from '@theia/monaco-editor-core/esm/vs/base/common/color';
-
-export interface ThemeMix extends IRawTheme, monaco.editor.IStandaloneThemeData { }
-export interface MixStandaloneTheme extends IStandaloneTheme {
-    themeData: ThemeMix
-}
+import { MixStandaloneTheme, TextmateRegistryFactory, ThemeMix } from './monaco-theme-types';
 
 @injectable()
 export class MonacoThemeRegistry {
 
+    @inject(TextmateRegistryFactory) protected readonly registryFactory: TextmateRegistryFactory;
+
     initializeDefaultThemes(): void {
         this.register(require('../../../data/monaco-themes/vscode/dark_theia.json'), {
             './dark_vs.json': require('../../../data/monaco-themes/vscode/dark_vs.json'),
@@ -129,8 +127,7 @@ export class MonacoThemeRegistry {
                 }
             });
 
-            const reg = new Registry();
-            reg.setTheme(result);
+            const reg = this.registryFactory(result);
             result.encodedTokensColors = reg.getColorMap();
             // index 0 has to be set to null as it is 'undefined' by default, but monaco code expects it to be null
             // eslint-disable-next-line no-null/no-null