Fix #1341 - Make sure initializationOptions is at least empty object

vuejs · May 10, 2020 · 93b7f7f · 93b7f7f
1 parent eddf3c7
commit 93b7f7f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/server/src/config.ts b/server/src/config.ts
@@ -74,7 +74,7 @@ export interface VLSFullConfig extends VLSConfig {
   stylusSupremacy?: any;
 }
 
-export function getDefaultVLSConfig(): VLSConfig {
+export function getDefaultVLSConfig(): VLSFullConfig {
   return {
     vetur: {
       useWorkspaceDependencies: false,
@@ -118,6 +118,18 @@ export function getDefaultVLSConfig(): VLSConfig {
       experimental: {
         templateInterpolationService: false
       }
-    }
+    },
+    css: {},
+    html: {
+      suggest: {}
+    },
+    javascript: {
+      format: {}
+    },
+    typescript: {
+      format: {}
+    },
+    emmet: {},
+    stylusSupremacy: {}
   };
 }
diff --git a/server/src/services/vls.ts b/server/src/services/vls.ts
@@ -83,6 +83,7 @@ export class VLS {
   }
 
   async init(params: InitializeParams) {
+    params.initializationOptions = params.initializationOptions || {};
     const config: VLSFullConfig = params.initializationOptions.config
       ? _.merge(getDefaultVLSConfig(), params.initializationOptions.config)
       : getDefaultVLSConfig();