From 3b91323c8116045a3154336182054203d0183256 Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Mon, 30 Dec 2024 19:13:09 -0800 Subject: [PATCH 1/4] Fix cl.exe.not.available loc. --- Extension/src/Debugger/configurationProvider.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Extension/src/Debugger/configurationProvider.ts b/Extension/src/Debugger/configurationProvider.ts index 067983fea..9bc6fcec7 100644 --- a/Extension/src/Debugger/configurationProvider.ts +++ b/Extension/src/Debugger/configurationProvider.ts @@ -584,7 +584,9 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv private showErrorIfClNotAvailable(_configurationLabel: string): boolean { if (!process.env.DevEnvDir || process.env.DevEnvDir.length === 0) { - void vscode.window.showErrorMessage(localize("cl.exe.not.available", "{0} build and debug is only usable when VS Code is run from the Developer Command Prompt for VS.", "cl.exe")); + void vscode.window.showErrorMessage(localize({ key: "cl.exe.not.available", + comment: ["{0} is a command option in a menu. {1} is the product name \"Developer Command Prompt for VS\"."] }, + "{0} is only usable when VS Code is run from the {1}.", `cl.exe ${this.buildAndDebugActiveFileStr()}`, "Developer Command Prompt for VS")); return true; } return false; From a2991bd480d701fae89dce30348ccfeaba635d4f Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Mon, 30 Dec 2024 19:14:57 -0800 Subject: [PATCH 2/4] Fix formatting. --- Extension/src/Debugger/configurationProvider.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Extension/src/Debugger/configurationProvider.ts b/Extension/src/Debugger/configurationProvider.ts index 9bc6fcec7..1df2ac362 100644 --- a/Extension/src/Debugger/configurationProvider.ts +++ b/Extension/src/Debugger/configurationProvider.ts @@ -584,8 +584,10 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv private showErrorIfClNotAvailable(_configurationLabel: string): boolean { if (!process.env.DevEnvDir || process.env.DevEnvDir.length === 0) { - void vscode.window.showErrorMessage(localize({ key: "cl.exe.not.available", - comment: ["{0} is a command option in a menu. {1} is the product name \"Developer Command Prompt for VS\"."] }, + void vscode.window.showErrorMessage(localize({ + key: "cl.exe.not.available", + comment: ["{0} is a command option in a menu. {1} is the product name \"Developer Command Prompt for VS\"."] + }, "{0} is only usable when VS Code is run from the {1}.", `cl.exe ${this.buildAndDebugActiveFileStr()}`, "Developer Command Prompt for VS")); return true; } From 3ee9bb4cd715ceb67dc0516c307326c95db1d668 Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Tue, 31 Dec 2024 10:31:52 -0800 Subject: [PATCH 3/4] Disabling eslint indent linting. --- Extension/.eslintrc.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Extension/.eslintrc.js b/Extension/.eslintrc.js index 43ce2e76c..4cd07eb8b 100644 --- a/Extension/.eslintrc.js +++ b/Extension/.eslintrc.js @@ -24,17 +24,6 @@ module.exports = { "eslint-plugin-header" ], "rules": { - "indent": [ - "warn", - 4, - { - "SwitchCase": 1, - "ObjectExpression": "first" - } - ], - "@typescript-eslint/indent": [ - "error", 4 - ], "@typescript-eslint/adjacent-overload-signatures": "error", "@typescript-eslint/array-type": "error", "@typescript-eslint/await-thenable": "error", From d3bcb0b37b1e97dc1027301d9d50980d85a5f33c Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Tue, 31 Dec 2024 11:40:12 -0800 Subject: [PATCH 4/4] Adjust formatting. --- Extension/src/Debugger/configurationProvider.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Extension/src/Debugger/configurationProvider.ts b/Extension/src/Debugger/configurationProvider.ts index 1df2ac362..f4f874501 100644 --- a/Extension/src/Debugger/configurationProvider.ts +++ b/Extension/src/Debugger/configurationProvider.ts @@ -587,8 +587,7 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv void vscode.window.showErrorMessage(localize({ key: "cl.exe.not.available", comment: ["{0} is a command option in a menu. {1} is the product name \"Developer Command Prompt for VS\"."] - }, - "{0} is only usable when VS Code is run from the {1}.", `cl.exe ${this.buildAndDebugActiveFileStr()}`, "Developer Command Prompt for VS")); + }, "{0} is only usable when VS Code is run from the {1}.", `cl.exe ${this.buildAndDebugActiveFileStr()}`, "Developer Command Prompt for VS")); return true; } return false;