diff options
author | vsrs <[email protected]> | 2020-04-30 16:41:48 +0100 |
---|---|---|
committer | vsrs <[email protected]> | 2020-04-30 16:41:48 +0100 |
commit | 10836543d693675a9a2fd90130b1a816ede90fea (patch) | |
tree | eeec3b5ab836bd65082c09ab0d38c94dfa1c1fb4 /editors/code/src/commands | |
parent | eb6f9c23e19eae9015bd859941c5e8cbf4622cba (diff) |
Fixed tsfmt and eslint errors.
Diffstat (limited to 'editors/code/src/commands')
-rw-r--r-- | editors/code/src/commands/runnables.ts | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/editors/code/src/commands/runnables.ts b/editors/code/src/commands/runnables.ts index e8035c7d2..36d309334 100644 --- a/editors/code/src/commands/runnables.ts +++ b/editors/code/src/commands/runnables.ts | |||
@@ -82,9 +82,9 @@ const debugOutput = vscode.window.createOutputChannel("Debug"); | |||
82 | 82 | ||
83 | async function getCppvsDebugConfig(config: ra.Runnable, sourceFileMap: Record<string, string>): Promise<vscode.DebugConfiguration> { | 83 | async function getCppvsDebugConfig(config: ra.Runnable, sourceFileMap: Record<string, string>): Promise<vscode.DebugConfiguration> { |
84 | debugOutput.clear(); | 84 | debugOutput.clear(); |
85 | 85 | ||
86 | let cargo = new Cargo(config.cwd || '.', debugOutput); | 86 | const cargo = new Cargo(config.cwd || '.', debugOutput); |
87 | let executable = await cargo.executableFromArgs(config.args, config.extraArgs); | 87 | const executable = await cargo.executableFromArgs(config.args, config.extraArgs); |
88 | 88 | ||
89 | // if we are here, there were no compilation errors. | 89 | // if we are here, there were no compilation errors. |
90 | return { | 90 | return { |
@@ -106,9 +106,9 @@ export function debugSingle(ctx: Ctx): Cmd { | |||
106 | const lldbId = "vadimcn.vscode-lldb"; | 106 | const lldbId = "vadimcn.vscode-lldb"; |
107 | const cpptoolsId = "ms-vscode.cpptools"; | 107 | const cpptoolsId = "ms-vscode.cpptools"; |
108 | 108 | ||
109 | let debugEngineId = ctx.config.debug.engine; | 109 | const debugEngineId = ctx.config.debug.engine; |
110 | let debugEngine = null; | 110 | let debugEngine = null; |
111 | if ( debugEngineId === "auto" ) { | 111 | if (debugEngineId === "auto") { |
112 | debugEngine = vscode.extensions.getExtension(lldbId); | 112 | debugEngine = vscode.extensions.getExtension(lldbId); |
113 | if (!debugEngine) { | 113 | if (!debugEngine) { |
114 | debugEngine = vscode.extensions.getExtension(cpptoolsId); | 114 | debugEngine = vscode.extensions.getExtension(cpptoolsId); |
@@ -120,11 +120,11 @@ export function debugSingle(ctx: Ctx): Cmd { | |||
120 | 120 | ||
121 | if (!debugEngine) { | 121 | if (!debugEngine) { |
122 | vscode.window.showErrorMessage(`Install [CodeLLDB](https://marketplace.visualstudio.com/items?itemName=${lldbId})` | 122 | vscode.window.showErrorMessage(`Install [CodeLLDB](https://marketplace.visualstudio.com/items?itemName=${lldbId})` |
123 | + ` or [MS C++ tools](https://marketplace.visualstudio.com/items?itemName=${cpptoolsId}) extension for debugging.`); | 123 | + ` or [MS C++ tools](https://marketplace.visualstudio.com/items?itemName=${cpptoolsId}) extension for debugging.`); |
124 | return; | 124 | return; |
125 | } | 125 | } |
126 | 126 | ||
127 | const debugConfig = lldbId == debugEngine.id | 127 | const debugConfig = lldbId === debugEngine.id |
128 | ? getLldbDebugConfig(config, ctx.config.debug.sourceFileMap) | 128 | ? getLldbDebugConfig(config, ctx.config.debug.sourceFileMap) |
129 | : await getCppvsDebugConfig(config, ctx.config.debug.sourceFileMap); | 129 | : await getCppvsDebugConfig(config, ctx.config.debug.sourceFileMap); |
130 | 130 | ||