[clangd] Add support for vscode extension configuration

[stanionascu]

Summary

Adds vscode workspace level configuration options for path to clangd binary and its arguments.

[krasimir]

clangd/clients/clangd-vscode/package.json

45 ↗

(On Diff #92268)

Maybe prepend a , for example: /usr/bin/clangd to the "description".

clangd/clients/clangd-vscode/src/extension.ts

19 ↗

(On Diff #92268)

I feel that this is too platform-specific and redundant because "clangd.path" already has a default value.

[krasimir]

It looks pretty good! I just have a minor suggestion.

clangd/clients/clangd-vscode/package.json

45 ↗

(On Diff #92268)

meh, it's OK like that.

[stanionascu]

• removed unrelated new line change
• extended the "clang.path" description a bit
• removed defaultValue for getConfig<>, as it's anyway "contributed" by extension package.json

[stanionascu]

clangd/clients/clangd-vscode/package.json

45 ↗

(On Diff #92268)

I still extended the description with the example :)

[krasimir]

Looks good! Sorry for the delay.

[stanionascu]

Thanks for review!
Would be great if somebody would commit it, as I cannot do it myself.

clang-tools-extra/trunk/clangd/clients/clangd-vscode/package.json

"dependencies": {
         "vscode-languageserver": "^2.6.2"
     },
     "devDependencies": {
         "typescript": "^2.0.3",
         "vscode": "^1.0.3",
         "mocha": "^2.3.3",
         "@types/node": "^6.0.40",
         "@types/mocha": "^2.2.32"
-    }
-}
+    },
+    "contributes": {
+        "configuration": {
+            "type": "object",
+            "title": "clangd configuration",
+            "properties": {
+                "clangd.path": {
+                    "type": "string",
+                    "default": "clangd",
+                    "description": "The path to clangd executable, e.g.: /usr/bin/clangd"
+                },
+                "clangd.arguments": {
+                    "type": "array",
+                    "default": [],
+                    "items": {
+                        "type": "string"
+                    },
+                    "description": "Arguments for clangd server"
+                }
+            }
+        }
+    }
 

clang-tools-extra/trunk/clangd/clients/clangd-vscode/src/extension.ts

 import * as vscode from 'vscode';
 import * as vscodelc from 'vscode-languageclient';
 
 /**
+ * Method to get workspace configuration option
+ * @param option name of the option (e.g. for clangd.path should be path)
+ * @param defaultValue default value to return if option is not set
+ */
+function getConfig<T>(option: string, defaultValue?: any) : T {
+    const config = vscode.workspace.getConfiguration('clangd');
+    return config.get<T>(option, defaultValue);
+}
+
+/**
  *  this method is called when your extension is activate
  *  your extension is activated the very first time the command is executed
  */
 export function activate(context: vscode.ExtensionContext) {
-    // TODO: make this configurable
-    const clangdPath = '/usr/bin/clangd';
+    const clangdPath = getConfig<string>('path');
+    const clangdArgs = getConfig<string[]>('arguments');
 
-    const serverOptions: vscodelc.ServerOptions = { command: clangdPath };
+    const serverOptions: vscodelc.ServerOptions = { command: clangdPath, args: clangdArgs };
 
     const clientOptions: vscodelc.LanguageClientOptions = {
         // Register the server for C/C++ files
         documentSelector: ['c', 'cc', 'cpp', 'h', 'hh', 'hpp']
     };
 
     const clangdClient = new vscodelc.LanguageClient('Clang Language Server', serverOptions, clientOptions);
 
function applyTextEdits(uri: string, edits: vscodelc.TextEdit[]) {
         }
     }
 
     console.log('Clang Language Server is now active!');
 
     const disposable = clangdClient.start();
 
     context.subscriptions.push(disposable, vscode.commands.registerCommand('clangd.applyFix', applyTextEdits));
-}
+}