1- import { stat } from 'fs' ;
2- import { basename } from 'path' ;
1+ import * as fs from 'fs' ;
2+ import * as path from 'path' ;
33import { promisify } from 'util' ;
44import { spawnSync } from 'child_process' ;
55import deepEqual from 'deep-equal' ;
66import WebRequest from 'web-request' ;
7+ import deepmerge from 'deepmerge' ;
78import vscode , { ExtensionContext } from 'vscode' ;
89import { LanguageClient , CloseAction , ErrorAction , InitializeError , Message , RevealOutputChannelOn } from 'vscode-languageclient' ;
910
@@ -80,7 +81,7 @@ async function startDebug(_: ExtensionContext, config: DebugConfig): Promise<boo
8081 if ( ! rawStdout ) {
8182 if ( rawStdErr ) {
8283 if ( rawStdErr . indexOf ( 'compiled sketch not found in' ) !== - 1 ) {
83- vscode . window . showErrorMessage ( `Sketch '${ basename ( config . sketchPath ) } ) ;
84+ vscode . window . showErrorMessage ( `Sketch '${ path . basename ( config . sketchPath ) } ) ;
8485 } else {
8586 vscode . window . showErrorMessage ( rawStdErr ) ;
8687 }
@@ -95,7 +96,7 @@ async function startDebug(_: ExtensionContext, config: DebugConfig): Promise<boo
9596 if ( ! info ) {
9697 return false ;
9798 }
98- const debugConfig = {
99+ const defaultDebugConfig = {
99100 cwd : '${workspaceRoot}' ,
100101 name : 'Arduino' ,
101102 request : 'launch' ,
@@ -108,18 +109,26 @@ async function startDebug(_: ExtensionContext, config: DebugConfig): Promise<boo
108109 info . server_configuration . script
109110 ]
110111 } ;
112+ 113+ let customDebugConfig = { } ;
114+ try {
115+ const raw = await promisify ( fs . readFile ) ( path . join ( config . sketchPath , 'debug_custom.json' ) , { encoding : 'utf8' } ) ;
116+ customDebugConfig = JSON . parse ( raw ) ;
117+ } catch { }
118+ const mergedDebugConfig = deepmerge ( defaultDebugConfig , customDebugConfig ) ;
119+ 111120 // Create the `launch.json` if it does not exist. Otherwise, update the existing.
112121 const configuration = vscode . workspace . getConfiguration ( ) ;
113122 const launchConfig = {
114123 version : '0.2.0' ,
115124 'configurations' : [
116125 {
117- ...debugConfig
126+ ...mergedDebugConfig
118127 }
119128 ]
120129 } ;
121130 await configuration . update ( 'launch' , launchConfig , false ) ;
122- return vscode . debug . startDebugging ( undefined , debugConfig ) ;
131+ return vscode . debug . startDebugging ( undefined , mergedDebugConfig ) ;
123132}
124133
125134async function startLanguageServer ( context : ExtensionContext , config : LanguageServerConfig ) : Promise < void > {
@@ -162,7 +171,7 @@ async function buildLanguageClient(config: LanguageServerConfig): Promise<Langua
162171 let logPath : string | undefined = undefined ;
163172 if ( typeof log === 'string' ) {
164173 try {
165- const stats = await promisify ( stat ) ( log ) ;
174+ const stats = await promisify ( fs . stat ) ( log ) ;
166175 if ( stats . isDirectory ( ) ) {
167176 logPath = log ;
168177 }
0 commit comments