a few bugfixes related to config handling impacting vim and potential…

…ly other users
graphql · Apr 2, 2022 · efd4595 · efd4595
1 parent e793f88
commit efd4595
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/.changeset/wet-bobcats-chew.md b/.changeset/wet-bobcats-chew.md
@@ -0,0 +1,5 @@
+---
+'graphql-language-service-server': patch
+---
+
+a few bugfixes related to config handling impacting vim and potentially other LSP server users
diff --git a/packages/graphql-language-service-server/src/MessageProcessor.ts b/packages/graphql-language-service-server/src/MessageProcessor.ts
@@ -217,13 +217,13 @@ export class MessageProcessor {
     const rootDir = this._settings?.load?.rootDir || this._rootPath;
     this._rootPath = rootDir;
     this._loadConfigOptions = {
-      ...Object.keys(this._settings.load || []).reduce((agg, key) => {
-        const value = this._settings.load[key];
+      ...Object.keys(this._settings?.load || []).reduce((agg, key) => {
+        const value = this._settings?.load[key];
         if (value === undefined || value === null) {
           delete agg[key];
         }
         return agg;
-      }, this._settings.load),
+      }, this._settings.load ?? {}),
       rootDir,
     };
     // reload the graphql cache
@@ -288,7 +288,7 @@ export class MessageProcessor {
         'graphql.config',
         'graphqlrc',
         'package.json',
-        this._settings.load.fileName,
+        this._settings.load?.fileName,
       ].filter(Boolean);
       if (configMatchers.some(v => uri.match(v)?.length)) {
         this._logger.info('updating graphql config');
@@ -404,7 +404,7 @@ export class MessageProcessor {
     return { uri, diagnostics };
   }
   async handleDidChangeConfiguration(
-    _params?: DidChangeConfigurationParams,
+    _params: DidChangeConfigurationParams,
   ): Promise<DidChangeConfigurationRegistrationOptions> {
     await this._updateGraphQLConfig();
     this._logger.log(

diff --git a/packages/graphql-language-service-server/src/startServer.ts b/packages/graphql-language-service-server/src/startServer.ts
@@ -25,6 +25,7 @@ import {
   DidOpenTextDocumentNotification,
   DidSaveTextDocumentNotification,
   DidChangeTextDocumentNotification,
+  DidChangeConfigurationNotification,
   DidCloseTextDocumentNotification,
   ExitNotification,
   HoverRequest,
@@ -366,7 +367,7 @@ async function addHandlers({
     messageProcessor.handleWorkspaceSymbolRequest(params),
   );
 
-  connection.onDidChangeConfiguration(
-    messageProcessor.handleDidChangeConfiguration,
+  connection.onNotification(DidChangeConfigurationNotification.type, params =>
+    messageProcessor.handleDidChangeConfiguration(params),
   );
 }