Revert "Revert "Fix inlay-hint not shown issue (#341)""

This reverts commit fc750f1.

It's now (presumed) safe to bump languageclient to 8.x after suppressing
commit characters.

Author: sam-mccall

package-lock.json

@@ -48,7 +48,7 @@
     "dependencies": {
         "@clangd/install": "0.1.4",
         "abort-controller": "^3.0.0",
-        "vscode-languageclient": "7.1.0-next.1"
+        "vscode-languageclient": "8.0.1"
     },
     "devDependencies": {
         "@types/glob": "^7.1.1",
@@ -60,7 +60,7 @@
         "glob": "^7.1.4",
         "mocha": "^9.2.0",
         "ovsx": "^0.3.0",
-        "typescript": "^3.8.3",
+        "typescript": "^4.5.5",
         "vsce": "^2.7.0",
         "vscode-test": "^1.3.0"
     },
@@ -243,7 +243,8 @@
             {
                 "command": "clangd.inlayHints.toggle",
                 "category": "clangd",
-                "title": "Toggle inlay hints"
+                "title": "Toggle inlay hints",
+                "enablement": "clangd.inlayHints.supported"
             }
         ],
         "keybindings": [

package.json

@@ -79,6 +79,7 @@ class ASTFeature implements vscodelc.StaticFeature {
     vscode.commands.executeCommand('setContext', 'clangd.ast.supported',
                                    'astProvider' in capabilities);
   }
+  getState(): vscodelc.FeatureState { return {kind: 'static'}; }
   dispose() {}
 }
 

src/ast.ts

@@ -51,6 +51,7 @@ class EnableEditsNearCursorFeature implements vscodelc.StaticFeature {
         capabilities.textDocument?.completion;
     extendedCompletionCapabilities.editsNearCursor = true;
   }
+  getState(): vscodelc.FeatureState { return {kind: 'static'}; }
   dispose() {}
 }
 
@@ -162,7 +163,7 @@ export class ClangdContext implements vscode.Disposable {
     memoryUsage.activate(this);
     ast.activate(this);
     openConfig.activate(this);
-    this.subscriptions.push(this.client.start());
+    await this.client.start();
     console.log('Clang Language Server is now active!');
     fileStatus.activate(this);
     switchSourceHeader.activate(this);
@@ -176,6 +177,7 @@ export class ClangdContext implements vscode.Disposable {
 
   dispose() {
     this.subscriptions.forEach((d) => { d.dispose(); });
+    this.client.stop();
     this.subscriptions = []
   }
 }

src/clangd-context.ts

@@ -26,6 +26,7 @@ class ConfigFileWatcherFeature implements vscodelc.StaticFeature {
       return;
     this.context.subscriptions.push(new ConfigFileWatcher(this.context));
   }
+  getState(): vscodelc.FeatureState { return {kind: 'static'}; }
   dispose() {}
 }
 

src/config-file-watcher.ts

@@ -53,11 +53,10 @@ class InlayHintsFeature implements vscodelc.StaticFeature {
     const serverCapabilities: vscodelc.ServerCapabilities&
         {clangdInlayHintsProvider?: boolean, inlayHintProvider?: any} =
         capabilities;
-    // If the clangd server supports LSP 3.17 inlay hints, these are handled by
-    // the vscode-languageclient library - don't send custom requests too!
-    if (!serverCapabilities.clangdInlayHintsProvider ||
-        serverCapabilities.inlayHintProvider)
-      return;
+    vscode.commands.executeCommand(
+        'setContext', 'clangd.inlayHints.supported',
+        serverCapabilities.clangdInlayHintsProvider ||
+            serverCapabilities.inlayHintProvider);
     if (!this.commandRegistered) {
       // The command provides a quick way to toggle inlay hints
       // (key-bindable).
@@ -74,10 +73,15 @@ class InlayHintsFeature implements vscodelc.StaticFeature {
                 enabledSetting, !current, vscode.ConfigurationTarget.Global);
           }));
     }
+    // If the clangd server supports LSP 3.17 inlay hints, these are handled by
+    // the vscode-languageclient library - don't send custom requests too!
+    if (!serverCapabilities.clangdInlayHintsProvider ||
+        serverCapabilities.inlayHintProvider)
+      return;
     this.context.subscriptions.push(vscode.languages.registerInlayHintsProvider(
         clangdDocumentSelector, new Provider(this.context)));
   }
-
+  getState(): vscodelc.FeatureState { return {kind: 'static'}; }
   dispose() {}
 }
 

src/inlay-hints.ts

@@ -74,6 +74,7 @@ class MemoryUsageFeature implements vscodelc.StaticFeature {
     vscode.commands.executeCommand('setContext', 'clangd.memoryUsage.supported',
                                    'memoryUsageProvider' in capabilities);
   }
+  getState(): vscodelc.FeatureState { return {kind: 'static'}; }
   dispose() {}
 }
 

src/memory-usage.ts

@@ -116,12 +116,13 @@ class TypeHierarchyFeature implements vscodelc.StaticFeature {
   initialize(capabilities: vscodelc.ServerCapabilities,
              documentSelector: vscodelc.DocumentSelector|undefined) {
     const serverCapabilities: vscodelc.ServerCapabilities&
-        {typeHierarchyProvider?: boolean} = capabilities;
+        {typeHierarchyProvider?: any} = capabilities;
     if (serverCapabilities.typeHierarchyProvider) {
       this.serverSupportsTypeHierarchy = true;
       this.recomputeEnableTypeHierarchy();
     }
   }
+  getState(): vscodelc.FeatureState { return {kind: 'static'}; }
   dispose() {}
 
   private recomputeEnableTypeHierarchy() {