Move to vscode-languageclient 8.0.2 for Qute LS

Fixes #505

Signed-off-by: azerr <[email protected]>

Author: angelozerr

package-lock.json

@@ -480,8 +480,8 @@
     "lodash": "^4.17.21",
     "request": "^2.88.0",
     "request-promise": "^4.2.4",
-    "vscode-languageclient": "^7.0.0",
-    "vscode-languageserver-protocol": "^3.17.1",
+    "vscode-languageclient": "^8.0.2",
+    "vscode-languageserver-protocol": "^3.17.2",
     "which": "^2.0.2",
     "yauzl": "^2.10.0"
   }

package.json

@@ -2,18 +2,17 @@ import * as requirements from './requirements';
 
 import { DidChangeConfigurationNotification, LanguageClientOptions } from 'vscode-languageclient';
 import { LanguageClient } from 'vscode-languageclient/node';
-import { ExtensionContext, commands, workspace, window, ConfigurationTarget, languages } from 'vscode';
+import { ExtensionContext, commands, workspace, window, ConfigurationTarget} from 'vscode';
 import { prepareExecutable } from './quteServerStarter';
 import { registerQuteExecuteWorkspaceCommand, registerVSCodeQuteCommands, synchronizeQuteValidationButton } from '../commands/registerCommands';
 import { QuteClientCommandConstants } from '../commands/commandConstants';
 import { QuteSettings } from './settings';
 import { JavaExtensionAPI } from '../../extension';
-import { QuteInlayHintsProvider } from './inlayHintsProvider';
 
-export function connectToQuteLS(context: ExtensionContext, api: JavaExtensionAPI) {
+export async function connectToQuteLS(context: ExtensionContext, api: JavaExtensionAPI) {
   registerVSCodeQuteCommands(context);
 
-  return requirements.resolveRequirements(api).then(requirements => {
+  return requirements.resolveRequirements(api).then(async requirements => {
     const clientOptions: LanguageClientOptions = {
       documentSelector: [
         { scheme: 'file', language: 'qute-html' },
@@ -36,8 +35,7 @@ export function connectToQuteLS(context: ExtensionContext, api: JavaExtensionAPI
                 QuteClientCommandConstants.COMMAND_CONFIGURATION_UPDATE
               ]
             }
-          },
-          shouldLanguageServerExitOnShutdown: true
+          }
         }
       },
       synchronize: {
@@ -49,9 +47,10 @@ export function connectToQuteLS(context: ExtensionContext, api: JavaExtensionAPI
           didChangeConfiguration: async () => {
             // A settings.json is updated:
             // 1. send the new Quet settings to the Qute language server
-            quteLanguageClient.sendNotification(DidChangeConfigurationNotification.type, { settings: getQuteSettings() });
+            const result = quteLanguageClient.sendNotification(DidChangeConfigurationNotification.type, { settings: getQuteSettings() });
             // 2. synchronize the Qute toggle button for validation
             await synchronizeQuteValidationButton(window.activeTextEditor);
+            return result;
           }
         }
       }
@@ -71,59 +70,50 @@ export function connectToQuteLS(context: ExtensionContext, api: JavaExtensionAPI
 
     const serverOptions = prepareExecutable(requirements);
     const quteLanguageClient = new LanguageClient('qute', 'Qute Support', serverOptions, clientOptions);
-    context.subscriptions.push(quteLanguageClient.start());
-
-    return quteLanguageClient.onReady().then(async () => {
-      bindQuteRequest('qute/template/project');
-      bindQuteRequest('qute/template/projectDataModel');
-      bindQuteRequest('qute/template/userTags');
-      bindQuteRequest('qute/template/javaTypes');
-      bindQuteRequest('qute/template/resolvedJavaType');
-      bindQuteRequest('qute/template/javaDefinition');
-      bindQuteRequest('qute/template/javadoc');
-      bindQuteRequest('qute/template/generateMissingJavaMember');
-      bindQuteRequest('qute/java/codeLens');
-      bindQuteRequest('qute/java/diagnostics');
-      bindQuteRequest('qute/java/documentLink');
-      bindQuteNotification('qute/dataModelChanged');
-
-      registerQuteExecuteWorkspaceCommand(context, quteLanguageClient);
-      // Refresh the Qute context when editor tab has the focus
-      context.subscriptions.push(
-        window.onDidChangeActiveTextEditor(async editor => {
-          await synchronizeQuteValidationButton(editor);
-        })
-      );
-      // Refresh the Qute context when the language id changed (HTML -> Qute HTML or Qute HTML -> HTML)
-      context.subscriptions.push(
-        workspace.onDidOpenTextDocument(async (document) => {
-          // when settings.json is updated, onDidOpenTextDocument is called,
-          // the Qute context must be refreshed only for the activate text editor.
-          if (window.activeTextEditor?.document === document) {
-            await synchronizeQuteValidationButton(window.activeTextEditor);
-          }
-          // Display the experimental Qute validation pop-up if it hasn't been displayed and a Qute file is open
-          if (!hasShownQuteValidationPopUp(context) && document.languageId.includes('qute')) {
-            showQuteValidationPopUp(context);
-          }
-        })
-      );
-      // Display the experimental Qute validation pop-up if it hasn't been displayed and a Qute file is open
-      if (!hasShownQuteValidationPopUp(context)) {
-        for (const textDocument of workspace.textDocuments) {
-          if (textDocument.languageId.includes('qute')) {
-            showQuteValidationPopUp(context);
-          }
+    await quteLanguageClient.start();
+
+    bindQuteRequest('qute/template/project');
+    bindQuteRequest('qute/template/projectDataModel');
+    bindQuteRequest('qute/template/userTags');
+    bindQuteRequest('qute/template/javaTypes');
+    bindQuteRequest('qute/template/resolvedJavaType');
+    bindQuteRequest('qute/template/javaDefinition');
+    bindQuteRequest('qute/java/codeLens');
+    bindQuteRequest('qute/java/diagnostics');
+    bindQuteRequest('qute/java/documentLink');
+    bindQuteNotification('qute/dataModelChanged');
+
+    registerQuteExecuteWorkspaceCommand(context, quteLanguageClient);
+    // Refresh the Qute context when editor tab has the focus
+    context.subscriptions.push(
+      window.onDidChangeActiveTextEditor(async editor => {
+        await synchronizeQuteValidationButton(editor);
+      })
+    );
+    // Refresh the Qute context when the language id changed (HTML -> Qute HTML or Qute HTML -> HTML)
+    context.subscriptions.push(
+      workspace.onDidOpenTextDocument(async (document) => {
+        // when settings.json is updated, onDidOpenTextDocument is called,
+        // the Qute context must be refreshed only for the activate text editor.
+        if (window.activeTextEditor?.document === document) {
+          await synchronizeQuteValidationButton(window.activeTextEditor);
+        }
+        // Display the experimental Qute validation pop-up if it hasn't been displayed and a Qute file is open
+        if (!hasShownQuteValidationPopUp(context) && document.languageId.includes('qute')) {
+          showQuteValidationPopUp(context);
+        }
+      })
+    );
+    // Display the experimental Qute validation pop-up if it hasn't been displayed and a Qute file is open
+    if (!hasShownQuteValidationPopUp(context)) {
+      for (const textDocument of workspace.textDocuments) {
+        if (textDocument.languageId.includes('qute')) {
+          showQuteValidationPopUp(context);
         }
       }
-      await setQuteValidationEnabledContext();
-      await synchronizeQuteValidationButton(window.activeTextEditor);
-
-      const supportRegisterInlayHintsProvider = (languages as any).registerInlayHintsProvider;
-      if (supportRegisterInlayHintsProvider) {
-        context.subscriptions.push(languages.registerInlayHintsProvider(clientOptions.documentSelector, new QuteInlayHintsProvider(quteLanguageClient)));
-      }
-    });
+    }
+    await setQuteValidationEnabledContext();
+    await synchronizeQuteValidationButton(window.activeTextEditor);
   });
 }