Switch to monaco-vscode-api 1.80.1-next.0

- Simplify enableQuickaccessService
TypeFox · Jul 28, 2023 · 0186abb · 0186abb
1 parent b7548e9
commit 0186abb
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 39 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient",
-  "version": "6.3.0-next.0",
+  "version": "6.3.0-next.1",
   "description": "Monaco Language client implementation",
   "author": {
     "name": "TypeFox GmbH",
@@ -49,13 +49,13 @@
   ],
   "dependencies": {
     "monaco-editor": "~0.40.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.6",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.80.1-next.0",
     "vscode-jsonrpc": "~8.1.0",
     "vscode-languageclient": "~8.1.0"
   },
   "peerDependencies": {
     "monaco-editor": "~0.40.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.6"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.80.1-next.0"
   },
   "peerDependenciesMeta": {
     "monaco-editor": {

diff --git a/packages/client/src/monaco-vscode-api-services.ts b/packages/client/src/monaco-vscode-api-services.ts
@@ -35,10 +35,7 @@ export type InitializeServiceConfig = {
     enableDebugService?: boolean;
     enablePreferencesService?: boolean;
     enableSnippetsService?: boolean;
-    configureQuickaccessService?: {
-        isKeybindingConfigurationVisible: boolean,
-        shouldUseGlobalPicker: boolean
-    };
+    enableQuickaccessService?: boolean;
     enableOutputService?: boolean;
     configureTerminalServiceConfig?: {
         backendImpl: SimpleTerminalBackend | ITerminalBackend
@@ -48,6 +45,7 @@ export type InitializeServiceConfig = {
     enableAccessibilityService?: boolean;
     enableEnvironmentService?: boolean;
     enableLayoutService?: boolean;
+    enableLanguageDetectionWorkerService?: boolean;
     userServices?: editor.IEditorOverrideServices;
     debugLogging?: boolean;
     logLevel?: LogLevel
@@ -141,7 +139,7 @@ const importAllServices = async (config?: InitializeServiceConfig) => {
     if (lc.enableSnippetsService === true) {
         addService('snippets', import('vscode/service-override/snippets'));
     }
-    if (lc.configureQuickaccessService !== undefined) {
+    if (lc.enableQuickaccessService === true) {
         addService('quickaccess', import('vscode/service-override/quickaccess'));
     }
     if (lc.enableOutputService === true) {
@@ -165,6 +163,9 @@ const importAllServices = async (config?: InitializeServiceConfig) => {
     if (lc.enableLayoutService === true) {
         addService('layout', import('vscode/service-override/layout'));
     }
+    if (lc.enableLanguageDetectionWorkerService === true) {
+        addService('languageDetectionWorker', import('vscode/service-override/languageDetectionWorker'));
+    }
 
     const reportServiceLoading = (services: editor.IEditorOverrideServices, debugLogging: boolean, origin?: string) => {
         for (const serviceName of Object.keys(services)) {
@@ -238,11 +239,6 @@ const importAllServices = async (config?: InitializeServiceConfig) => {
             if (lc.configureTerminalServiceConfig?.backendImpl) {
                 services = loadedImport.default(lc.configureTerminalServiceConfig.backendImpl);
             }
-        } else if (serviceName === 'quickaccess') {
-            services = loadedImport.default({
-                isKeybindingConfigurationVisible: lc.configureQuickaccessService?.isKeybindingConfigurationVisible,
-                shouldUseGlobalPicker: lc.configureQuickaccessService?.shouldUseGlobalPicker
-            });
         } else {
             services = loadedImport.default();
         }

diff --git a/packages/examples/main/package.json b/packages/examples/main/package.json
@@ -23,7 +23,7 @@
     "langium": "~1.2.1",
     "langium-statemachine-dsl": "~1.2.0",
     "monaco-editor-workers": "0.39.1",
-    "monaco-languageclient": "6.3.0-next.0",
+    "monaco-languageclient": "6.3.0-next.1",
     "normalize-url": "~8.0.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",

diff --git a/packages/examples/main/src/common.ts b/packages/examples/main/src/common.ts
@@ -88,10 +88,7 @@ export const createJsonEditor = async (config: {
             },
             enableKeybindingsService: true,
             enableLanguagesService: true,
-            configureQuickaccessService: {
-                isKeybindingConfigurationVisible: true,
-                shouldUseGlobalPicker: true
-            },
+            enableQuickaccessService: true,
             enableOutputService: true,
             enableAccessibilityService: true,
             debugLogging: true

diff --git a/packages/examples/main/src/langium/statemachineClient.ts b/packages/examples/main/src/langium/statemachineClient.ts
@@ -135,16 +135,14 @@ try {
         enableNotificationService: true,
         enablePreferencesService: true,
         enableSnippetsService: true,
-        configureQuickaccessService: {
-            isKeybindingConfigurationVisible: true,
-            shouldUseGlobalPicker: true
-        },
+        enableQuickaccessService: true,
         enableOutputService: true,
         enableSearchService: true,
         enableMarkersService: false,
         // don't enable files and extensions services. They will be enabled automatically
         enableFilesService: false,
         enableExtensionsService: false,
+        enableLanguageDetectionWorkerService: true,
         // This should demonstrate that you can chose to not use the built-in loading mechanism,
         // but do it manually, see below
         enableAccessibilityService: false,

diff --git a/packages/verify/pnpm/package.json b/packages/verify/pnpm/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0",
   "private": "true",
   "dependencies": {
-    "monaco-languageclient": "6.3.0-next.0",
+    "monaco-languageclient": "6.3.0-next.1",
     "monaco-editor": "~0.40.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@~1.80.0-next.6"
+    "vscode": "npm:@codingame/monaco-vscode-api@~1.80.1-next.0"
   },
   "devDependencies": {
     "shx": "~0.3.4"

diff --git a/packages/verify/vite/package.json b/packages/verify/vite/package.json
@@ -5,7 +5,7 @@
   "type": "module",
   "dependencies": {
     "monaco-editor-workers": "0.39.1",
-    "monaco-languageclient": "6.3.0-next.0",
+    "monaco-languageclient": "6.3.0-next.1",
     "vscode-ws-jsonrpc": "3.0.0",
     "normalize-url": "~8.0.0"
   },

diff --git a/packages/verify/vite/vite.config.ts b/packages/verify/vite/vite.config.ts
@@ -6,6 +6,5 @@ export default defineConfig({
         alias: {
             path: 'path-browserify'
         }
-    },
-    assetsInclude: ['**/*.wasm']
+    }
 });
diff --git a/packages/verify/webpack/package.json b/packages/verify/webpack/package.json
@@ -5,7 +5,7 @@
   "type": "module",
   "dependencies": {
     "monaco-editor-workers": "0.39.1",
-    "monaco-languageclient": "6.3.0-next.0",
+    "monaco-languageclient": "6.3.0-next.1",
     "vscode-ws-jsonrpc": "3.0.0",
     "normalize-url": "~8.0.0"
   },

diff --git a/packages/verify/yarn/package.json b/packages/verify/yarn/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": "true",
   "dependencies": {
-    "monaco-languageclient": "6.3.0-next.0"
+    "monaco-languageclient": "6.3.0-next.1"
   },
   "devDependencies": {
     "shx": "~0.3.4"

diff --git a/vite.config.ts b/vite.config.ts
@@ -25,7 +25,6 @@ export default defineConfig(() => {
             port: 8080,
             origin: 'http://localhost:8080'
         },
-        assetsInclude: ['**/*.wasm'],
         optimizeDeps: {
             esbuildOptions: {
                 plugins: [