arduino
diff --git a/‎configs/webpack.config.js
Copy file name to clipboardExpand all lines: configs/webpack.config.js
+25-1Lines changed: 25 additions & 1 deletion b/‎configs/webpack.config.js
Copy file name to clipboardExpand all lines: configs/webpack.config.js
+25-1Lines changed: 25 additions & 1 deletion
diff --git a/‎package.json
Copy file name to clipboardExpand all lines: package.json
+11-3Lines changed: 11 additions & 3 deletions b/‎package.json
Copy file name to clipboardExpand all lines: package.json
+11-3Lines changed: 11 additions & 3 deletions
diff --git a/‎src/extension.ts
Copy file name to clipboardExpand all lines: src/extension.ts
+8-11Lines changed: 8 additions & 11 deletions b/‎src/extension.ts
Copy file name to clipboardExpand all lines: src/extension.ts
+8-11Lines changed: 8 additions & 11 deletions
@@ -1,12 +1,18 @@
 // @ts-check
 
 const path = require('path');
+const CopyPlugin = require('copy-webpack-plugin');
+const PermissionsOutputPlugin = require('webpack-permissions-plugin');
 
 /**
  * @type {import('webpack').Configuration}
  */
 const config = {
     target: 'node',
+    node: {
+        __dirname: false,
+        __filename: false
+    },
     entry: './lib/extension.js',
     output: {
         path: path.resolve(__dirname, '..', 'dist'),
@@ -21,6 +27,24 @@ const config = {
     },
     resolve: {
         extensions: ['.js']
-    }
+    },
+    plugins: [
+        new CopyPlugin({
+            patterns: [
+                {
+                    from: 'node_modules/vscode-languageclient/lib/utils/terminateProcess.sh',
+                    to: 'terminateProcess.sh'
+                }
+            ]
+        }),
+        new PermissionsOutputPlugin({
+            buildFiles: [
+                {
+                    path: path.resolve(__dirname, '..', 'dist', 'terminateProcess.sh'),
+                    fileMode: '555'
+                }
+            ]
+        })
+    ]
 };
 module.exports = config;
@@ -12,7 +12,7 @@
   },
   "scripts": {
     "prepare": "yarn clean && yarn compile && yarn webpack && yarn package",
-    "clean": "rimraf ./lib && rimraf ./build-artifacts",
+    "clean": "rimraf ./lib ./dist ./build-artifacts",
     "compile": "tsc -p ./",
     "watch": "tsc -w -p ./",
     "webpack": "webpack --config ./configs/webpack.config.js",
@@ -28,13 +28,15 @@
   "devDependencies": {
     "@types/node": "^10.14.9",
     "@types/vscode": "^1.41.0",
+    "copy-webpack-plugin": "^6.1.0",
     "mkdirp": "^1.0.4",
     "rimraf": "^3.0.2",
     "typescript": "^3.8.3",
     "vsce": "^1.66.0",
     "vscode": "^1.1.33",
     "webpack": "^4.39.1",
-    "webpack-cli": "^3.3.6"
+    "webpack-cli": "^3.3.6",
+    "webpack-permissions-plugin": "^1.0.7"
   },
   "dependencies": {
     "@types/deep-equal": "^1.0.1",
@@ -64,7 +66,8 @@
     "theme": "light"
   },
   "activationEvents": [
-    "onCommand:arduino.languageserver.start"
+    "onCommand:arduino.languageserver.start",
+    "onCommand:arduino.languageserver.startWithDefault"
   ],
   "contributes": {
     "languages": [
@@ -93,6 +96,11 @@
         "command": "arduino.languageserver.start",
         "title": "Arduino: Start/Restart Language Server",
         "description": "Start the language server or restart if there is a running instance"
+      },
+      {
+        "command": "arduino.languageserver.startWithDefault",
+        "title": "Arduino: Start/Restart Language Server with Defaults",
+        "description": "Start the language server or restart if there is a running instance with default configs"
       }
     ]
   }
 
@@ -17,7 +17,6 @@ interface LanguageServerConfig {
      * If `true` the LS will be restarted if it's running. Defaults to `false`.
      */
     readonly force?: boolean;
-    readonly outputEnabled?: boolean;
 }
 
 let languageClient: LanguageClient | undefined;
@@ -43,7 +42,7 @@ async function startLanguageServer(context: ExtensionContext, config: LanguageSe
             languageServerDisposable.dispose();
         }
     }
-    if (!languageClient || !deepEqual(latestConfig, config)) {
+    if (!languageClient || !deepEqual(latestConfig, config) || config.force) {
         latestConfig = config;
         languageClient = buildLanguageClient(config);
         crashCount = 0;
@@ -54,15 +53,13 @@ async function startLanguageServer(context: ExtensionContext, config: LanguageSe
 }
 
 function buildLanguageClient(config: LanguageServerConfig): LanguageClient {
-    if (config.outputEnabled) {
-        if (!serverOutputChannel) {
-            serverOutputChannel = vscode.window.createOutputChannel('Arduino Language Server');
-        }
-        if (!serverTraceChannel) {
-            serverTraceChannel = vscode.window.createOutputChannel('Arduino Language Server (trace)');
-        }
+    if (!serverOutputChannel) {
+        serverOutputChannel = vscode.window.createOutputChannel('Arduino Language Server');
+    }
+    if (!serverTraceChannel) {
+        serverTraceChannel = vscode.window.createOutputChannel('Arduino Language Server (trace)');
     }
-    const { lsPath: command, clangdPath, cliPath, board, flags } = config;
+    const { lsPath: command, clangdPath, cliPath, board, flags, env } = config;
     const args = ['-clangd', clangdPath, '-cli', cliPath, '-fqbn', board.fqbn];
     if (board.name) {
         args.push('-board-name', board.name);
@@ -76,7 +73,7 @@ function buildLanguageClient(config: LanguageServerConfig): LanguageClient {
         {
             command,
             args,
-            options: { env: config.env },
+            options: { env: env || {} },
         },
         {
             initializationOptions: {},