diff --git a/.gitignore b/.gitignore index 22a1810f5..6a6486db1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ node_modules *.tsbuildinfo .angular __screenshots__ +.vscode/profile diff --git a/.vscode/launch.json b/.vscode/launch.json index f544d7909..e3d4f6cad 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -27,7 +27,8 @@ "type": "chrome", "request": "launch", "url": "http://localhost:20001", - "webRoot": "${workspaceFolder}" + "webRoot": "${workspaceFolder}", + "userDataDir": "${workspaceFolder}/.vscode/profile" } ] } diff --git a/packages/examples/src/bare/client.ts b/packages/examples/src/bare/client.ts index 7ffe222c2..37c2d5c7d 100644 --- a/packages/examples/src/bare/client.ts +++ b/packages/examples/src/bare/client.ts @@ -32,7 +32,7 @@ export const runClient = async () => { }); updateUserConfiguration(JSON.stringify({ - 'editor.experimental.asyncTokenization': false + 'editor.experimental.asyncTokenization': true })); // register the JSON language with Monaco diff --git a/packages/examples/src/browser/main.ts b/packages/examples/src/browser/main.ts index 1d05772be..794f16251 100644 --- a/packages/examples/src/browser/main.ts +++ b/packages/examples/src/browser/main.ts @@ -49,7 +49,7 @@ export const runBrowserEditor = async () => { 'workbench.colorTheme': 'Default Dark Modern', 'editor.guides.bracketPairsHorizontal': 'active', 'editor.lightbulb.enabled': 'On', - 'editor.experimental.asyncTokenization': false + 'editor.experimental.asyncTokenization': true }) }, monacoWorkerFactory: configureMonacoWorkers diff --git a/packages/examples/src/eclipse.jdt.ls/client/main.ts b/packages/examples/src/eclipse.jdt.ls/client/main.ts index fae83ec82..46da20fb6 100644 --- a/packages/examples/src/eclipse.jdt.ls/client/main.ts +++ b/packages/examples/src/eclipse.jdt.ls/client/main.ts @@ -41,7 +41,7 @@ export const runEclipseJdtLsClient = () => { 'workbench.colorTheme': 'Default Dark Modern', 'editor.guides.bracketPairsHorizontal': 'active', 'editor.wordBasedSuggestions': 'off', - 'editor.experimental.asyncTokenization': false + 'editor.experimental.asyncTokenization': true }) }, monacoWorkerFactory: configureMonacoWorkers diff --git a/packages/examples/src/groovy/client/main.ts b/packages/examples/src/groovy/client/main.ts index 515564828..7b86068be 100644 --- a/packages/examples/src/groovy/client/main.ts +++ b/packages/examples/src/groovy/client/main.ts @@ -37,7 +37,7 @@ const userConfig: WrapperConfig = { 'workbench.colorTheme': 'Default Dark Modern', 'editor.guides.bracketPairsHorizontal': 'active', 'editor.wordBasedSuggestions': 'off', - 'editor.experimental.asyncTokenization': false + 'editor.experimental.asyncTokenization': true }) }, monacoWorkerFactory: configureMonacoWorkers diff --git a/packages/examples/src/json/client/wrapperWs.ts b/packages/examples/src/json/client/wrapperWs.ts index c3293c192..e2cacdcb4 100644 --- a/packages/examples/src/json/client/wrapperWs.ts +++ b/packages/examples/src/json/client/wrapperWs.ts @@ -37,7 +37,7 @@ export const jsonClientUserConfig: WrapperConfig = { 'editor.guides.bracketPairsHorizontal': 'active', 'editor.lightbulb.enabled': 'On', 'editor.wordBasedSuggestions': 'off', - 'editor.experimental.asyncTokenization': false + 'editor.experimental.asyncTokenization': true }) }, monacoWorkerFactory: configureMonacoWorkers diff --git a/packages/examples/src/langium/langium-dsl/config/extendedConfig.ts b/packages/examples/src/langium/langium-dsl/config/extendedConfig.ts index 4955c29f0..28c635adb 100644 --- a/packages/examples/src/langium/langium-dsl/config/extendedConfig.ts +++ b/packages/examples/src/langium/langium-dsl/config/extendedConfig.ts @@ -73,7 +73,7 @@ export const setupLangiumClientExtended = async (): Promise => { 'workbench.colorTheme': 'GitHub Dark High Contrast', 'editor.guides.bracketPairsHorizontal': 'active', 'editor.wordBasedSuggestions': 'off', - 'editor.experimental.asyncTokenization': false + 'editor.experimental.asyncTokenization': true }) }, monacoWorkerFactory: configureMonacoWorkers diff --git a/packages/examples/src/langium/statemachine/config/wrapperStatemachineConfig.ts b/packages/examples/src/langium/statemachine/config/wrapperStatemachineConfig.ts index c0a50fdd2..a9234ef54 100644 --- a/packages/examples/src/langium/statemachine/config/wrapperStatemachineConfig.ts +++ b/packages/examples/src/langium/statemachine/config/wrapperStatemachineConfig.ts @@ -93,7 +93,7 @@ export const createLangiumGlobalConfig = async (params: { 'workbench.colorTheme': 'Default Dark Modern', 'editor.guides.bracketPairsHorizontal': 'active', 'editor.wordBasedSuggestions': 'off', - 'editor.experimental.asyncTokenization': false + 'editor.experimental.asyncTokenization': true }) }, monacoWorkerFactory: configureMonacoWorkers diff --git a/packages/examples/src/multi/twoLanguageClients.ts b/packages/examples/src/multi/twoLanguageClients.ts index 1e9545750..705befed3 100644 --- a/packages/examples/src/multi/twoLanguageClients.ts +++ b/packages/examples/src/multi/twoLanguageClients.ts @@ -51,7 +51,7 @@ print("Hello Moon!") json: JSON.stringify({ 'workbench.colorTheme': 'Default Dark Modern', 'editor.wordBasedSuggestions': 'off', - 'editor.experimental.asyncTokenization': false + 'editor.experimental.asyncTokenization': true }) }, monacoWorkerFactory: configureMonacoWorkers diff --git a/packages/examples/src/python/client/config.ts b/packages/examples/src/python/client/config.ts index 4d1c0d6ae..2dd5ae6ee 100644 --- a/packages/examples/src/python/client/config.ts +++ b/packages/examples/src/python/client/config.ts @@ -83,7 +83,7 @@ export const createUserConfig = (workspaceRoot: string, code: string, codeUri: s 'workbench.colorTheme': 'Default Dark Modern', 'editor.guides.bracketPairsHorizontal': 'active', 'editor.wordBasedSuggestions': 'off', - 'editor.experimental.asyncTokenization': false + 'editor.experimental.asyncTokenization': true }) }, useDiffEditor: false, diff --git a/packages/examples/src/ts/wrapperTs.ts b/packages/examples/src/ts/wrapperTs.ts index 0b00027b8..537f472e0 100644 --- a/packages/examples/src/ts/wrapperTs.ts +++ b/packages/examples/src/ts/wrapperTs.ts @@ -53,7 +53,7 @@ export const runTsWrapper = async () => { 'editor.lightbulb.enabled': 'on', 'editor.glyphMargin': true, 'editor.guides.bracketPairsHorizontal': true, - 'editor.experimental.asyncTokenization': false + 'editor.experimental.asyncTokenization': true }) }, monacoWorkerFactory: configureMonacoWorkers diff --git a/vite.config.ts b/vite.config.ts index 4036ab918..b94de5e43 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -59,7 +59,11 @@ const viteConfig = defineViteConfig({ plugins: [ importMetaUrlPlugin ] - } + }, + include: [ + 'vscode-textmate', + 'vscode-oniguruma' + ] }, plugins: [ vsixPlugin(),