arduino
diff --git a/‎package.json
Lines changed: 1 addition & 0 deletions b/‎package.json
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/extension.ts
Lines changed: 16 additions & 7 deletions b/‎src/extension.ts
Lines changed: 16 additions & 7 deletions
diff --git a/‎yarn.lock
Lines changed: 5 additions & 0 deletions b/‎yarn.lock
Lines changed: 5 additions & 0 deletions
@@ -41,6 +41,7 @@
   "dependencies": {
     "@types/deep-equal": "^1.0.1",
     "deep-equal": "^2.0.3",
+    "deepmerge": "^4.2.2",
     "path": "^0.12.7",
     "vscode-languageclient": "^6.1.3",
     "web-request": "^1.0.7"
 
@@ -1,9 +1,10 @@
-import { stat } from 'fs';
-import { basename } from 'path';
+import * as fs from 'fs';
+import * as path from 'path';
 import { promisify } from 'util';
 import { spawnSync } from 'child_process';
 import deepEqual from 'deep-equal';
 import WebRequest from 'web-request';
+import deepmerge from 'deepmerge';
 import vscode, { ExtensionContext } from 'vscode';
 import { LanguageClient, CloseAction, ErrorAction, InitializeError, Message, RevealOutputChannelOn } from 'vscode-languageclient';
 
@@ -80,7 +81,7 @@ async function startDebug(_: ExtensionContext, config: DebugConfig): Promise<boo
     if (!rawStdout) {
         if (rawStdErr) {
             if (rawStdErr.indexOf('compiled sketch not found in') !== -1) {
-                vscode.window.showErrorMessage(`Sketch '${basename(config.sketchPath)}' was not compiled. Please compile the sketch and start debugging again.`);
+                vscode.window.showErrorMessage(`Sketch '${path.basename(config.sketchPath)}' was not compiled. Please compile the sketch and start debugging again.`);
             } else {
                 vscode.window.showErrorMessage(rawStdErr);
             }
@@ -95,7 +96,7 @@ async function startDebug(_: ExtensionContext, config: DebugConfig): Promise<boo
     if (!info) {
         return false;
     }
-    const debugConfig = {
+    const defaultDebugConfig = {
         cwd: '${workspaceRoot}',
         name: 'Arduino',
         request: 'launch',
@@ -108,18 +109,26 @@ async function startDebug(_: ExtensionContext, config: DebugConfig): Promise<boo
             info.server_configuration.script
         ]
     };
+
+    let customDebugConfig = {};
+    try {
+        const raw = await promisify(fs.readFile)(path.join(config.sketchPath, 'debug_custom.json'), { encoding: 'utf8' });
+        customDebugConfig = JSON.parse(raw);
+    } catch { }
+    const mergedDebugConfig = deepmerge(defaultDebugConfig, customDebugConfig);
+
     // Create the `launch.json` if it does not exist. Otherwise, update the existing.
     const configuration = vscode.workspace.getConfiguration();
     const launchConfig = {
         version: '0.2.0',
         'configurations': [
             {
-                ...debugConfig
+                ...mergedDebugConfig
             }
         ]
     };
     await configuration.update('launch', launchConfig, false);
-    return vscode.debug.startDebugging(undefined, debugConfig);
+    return vscode.debug.startDebugging(undefined, mergedDebugConfig);
 }
 
 async function startLanguageServer(context: ExtensionContext, config: LanguageServerConfig): Promise<void> {
@@ -162,7 +171,7 @@ async function buildLanguageClient(config: LanguageServerConfig): Promise<Langua
         let logPath: string | undefined = undefined;
         if (typeof log === 'string') {
             try {
-                const stats = await promisify(stat)(log);
+                const stats = await promisify(fs.stat)(log);
                 if (stats.isDirectory()) {
                     logPath = log;
                 }
 
@@ -1050,6 +1050,11 @@ deep-equal@^2.0.3:
     which-collection "^1.0.1"
     which-typed-array "^1.1.2"
 
+deepmerge@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+
 define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"