Skip to content

Commit b68f025

Browse files
committed
consistency in commands and user-visible text
1 parent 98f430e commit b68f025

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

Extension/package.nls.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1034,7 +1034,7 @@
10341034
]
10351035
},
10361036
"c_cpp.walkthrough.command.prompt.description": {
1037-
"message": "When using the Microsoft Visual Studio C++ compiler, the Visual Studio Developer Environment must be present.\n\nFollow the instructions on the right to relaunch or click the button below.\n[Set Developer Environment](command:C_Cpp.SetVsDeveloperEnvironment?%22walkthrough%22)",
1037+
"message": "When using the Microsoft Visual Studio C++ compiler, the Visual Studio developer environment must be present.\n\nFollow the instructions on the right to relaunch or click the button below.\n[Set Developer Environment](command:C_Cpp.SetVsDeveloperEnvironment?%22walkthrough%22)",
10381038
"comment": [
10391039
"{Locked=\"Visual Studio\"} {Locked=\"C++\"} {Locked=\"\\\n[\"} {Locked=\"](C_Cpp.SetVsDeveloperEnvironment?%22walkthrough%22)\"}"
10401040
]

Extension/src/Debugger/configurationProvider.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,8 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
586586
}
587587

588588
/**
589-
* @returns `true` if the Developer Environment is not available and an error was shown to the user, `false` if the Developer Environment is available or the user chose to apply it.
589+
* @returns `true` if the VS developer environment is not available and an error was shown to the user,
590+
* `false` if the VS developer environment is available or the user chose to apply it.
590591
*/
591592
private async showErrorIfClNotAvailable(_configurationLabel: string): Promise<boolean> {
592593
if (util.hasMsvcEnvironment()) {
@@ -599,7 +600,7 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
599600
localize({
600601
key: "cl.exe.not.available",
601602
comment: ["{0} is a command option in a menu."]
602-
}, "{0} requires the Visual Studio Developer Environment.", `cl.exe ${this.buildAndDebugActiveFileStr()}`),
603+
}, "{0} requires the Visual Studio developer environment.", `cl.exe ${this.buildAndDebugActiveFileStr()}`),
603604
applyDevEnv,
604605
cancel);
605606
if (response === applyDevEnv) {
@@ -618,7 +619,7 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
618619
return false;
619620
}
620621
void vscode.window.showErrorMessage(
621-
localize('dev.env.not.applied', 'The source code could not be built because the Visual Studio Developer Environment was not applied.'));
622+
localize('dev.env.not.applied', 'The source code could not be built because the Visual Studio developer environment was not applied.'));
622623
return true;
623624
}
624625

Extension/src/LanguageServer/cppBuildTaskProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ class CustomBuildTaskTerminal implements Pseudoterminal {
432432
}
433433

434434
if (isEnvironmentOverrideApplied(util.extensionContext)) {
435-
// If the user has applied the Developer Environment to this workspace, it should apply to all newly opened terminals.
435+
// If the user has applied the developer environment to this workspace, it should apply to all newly opened terminals.
436436
// However, this does not apply to processes that we spawn ourselves in the Pseudoterminal, so we need to specify the
437437
// correct environment in order to emulate the terminal behavior properly.
438438
const env = { ...process.env };

Extension/walkthrough/devcommandprompt/open-developer-command-prompt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ul>
44
<li><p data-loc-id="walkthrough.windows.start.from.dev.command">Start VS Code from the <span>Developer Command Prompt for VS</span></p>
55
</li>
6-
<li><p data-loc-id="walkthrough.windows.run.dev.command">Run the <code data-loc-id="walkthrough.windows.set.dev.environment">C/C++: Set Developer Environment</code> command.</p>
6+
<li><p data-loc-id="walkthrough.windows.run.dev.command">Run the <code data-loc-id="walkthrough.windows.set.dev.environment">C/C++: Set Visual Studio Developer Environment</code> command.</p>
77
</li>
88
</ul>
99
<h3 data-loc-id="walkthrough.windows.relaunch.command.prompt">To relaunch VS Code using the <span>Developer Command Prompt for VS</span></h3>

0 commit comments

Comments
 (0)