remove launch.WorkingDirectory

Author: DaanDeMeyer

package.json

@@ -151,11 +151,6 @@
       "type": "object",
       "title": "cquery",
       "properties": {
-        "cquery.launch.workingDirectory": {
-          "type": "string",
-          "default": "",
-          "description": "Path to the directory which contains the cquery binary (ie, if cquery is checkout out at /work/cquery/ then this directory is /work/cquery/build/)"
-        },
         "cquery.launch.command": {
           "type": "string",
           "default": "release/bin/cquery",

src/extension.ts

@@ -86,7 +86,6 @@ function getClientConfig(context: ExtensionContext) {
 
   // Read prefs; this map goes from `cquery/js name` => `vscode prefs name`.
   let configMapping = [
-    ['launchWorkingDirectory', 'launch.workingDirectory'],
     ['launchCommand', 'launch.command'],
     ['launchArgs', 'launch.args'],
     ['cacheDirectory', kCacheDirPrefName],
@@ -112,7 +111,6 @@ function getClientConfig(context: ExtensionContext) {
     ['client.snippetSupport', 'completion.enableSnippetInsertion']
   ];
   let clientConfig = {
-    launchWorkingDirectory: '',
     launchCommand: '',
     cacheDirectory: '',
     workspaceSymbol: {
@@ -135,18 +133,6 @@ function getClientConfig(context: ExtensionContext) {
     }
   }
 
-  // Verify that there is a working directory. If not, exit.
-  if (!clientConfig.launchWorkingDirectory) {
-    const kOpenSettings = 'Open Settings';
-    const kErrorMessage =
-        'Please specify the "cquery.launch.workingDirectory" setting and reload vscode';
-    window.showErrorMessage(kErrorMessage, kOpenSettings).then(selected => {
-      if (selected == kOpenSettings)
-        commands.executeCommand('workbench.action.openWorkspaceSettings');
-    });
-    return;
-  }
-
   // Set up a cache directory if there is not one.
   if (!clientConfig.cacheDirectory) {
     if (!context.storagePath) {
@@ -231,7 +217,6 @@ export function activate(context: ExtensionContext) {
       command: clientConfig.launchCommand,
       args: args,
       options: {
-        cwd: clientConfig.launchWorkingDirectory,
         env: env
       }
     };