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

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

@@ -15,6 +15,18 @@
 // *****************************************************************************
 
 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 const OnigasmPromise = Symbol('OnigasmPromise');
+export type OnigasmPromise = Promise<IOnigLib>;
+export const TextmateRegistryFactory = Symbol('TextmateRegistryFactory');
+export type TextmateRegistryFactory = (currentTheme?: ThemeMix) => Registry;
 
 export type MonacoThemeColor = monaco.editor.IColors;
 export interface MonacoTokenRule extends monaco.editor.ITokenThemeRule { };

package/src/browser/textmate/textmate-tokenizer.ts

@@ -49,17 +49,6 @@ export interface TokenizerOption {
 
 }
 
-export namespace TokenizerOption {
-    /**
-     * The default TextMate tokenizer option.
-     *
-     * @deprecated Use the current value of `editor.maxTokenizationLineLength` preference instead.
-     */
-    export const DEFAULT: TokenizerOption = {
-        lineLimit: 400
-    };
-}
-
 export function createTextmateTokenizer(grammar: IGrammar, options: TokenizerOption): monaco.languages.EncodedTokensProvider & monaco.languages.TokensProvider {
     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}.`);
@@ -67,24 +56,22 @@ export function createTextmateTokenizer(grammar: IGrammar, options: TokenizerOpt
     return {
         getInitialState: () => new TokenizerState(INITIAL),
         tokenizeEncoded(line: string, state: TokenizerState): monaco.languages.IEncodedLineTokens {
-            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: string, state: TokenizerState): monaco.languages.ILineTokens {
-            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 => ({