Skip to content

Commit 1656b74

Browse files
Small string updates (#4363)
* fix for 4319 * fix for 4317 * fix for 4312 * changelog updates
1 parent 02f918b commit 1656b74

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Bug Fixes:
1515
- Fix bug that makes `Configure Task` lists only first folder in workspace. [#3232](https//github.com/microsoft/vscode-cmake-tools/issues/3232)
1616
- Fix displaying "Go to Test" in the Test Explorer when the DEF_SOURCE_LINE property is set, but there is no backtrace information present. [4321](https://github.com/microsoft/vscode-cmake-tools/pull/4321) [@rjaegers](https://github.com/rjaegers)
1717
- Fix gnuld error parsing false positive on make errors, false negative due to trailing \r, and false parsing of new "multiple definitions" error [#2864](https://github.com/microsoft/vscode-cmake-tools/issues/2864) [@0xemgy](https://github.com/0xemgy)
18+
- Fixes for small bug string bugs. [#4319](https://github.com/microsoft/vscode-cmake-tools/issues/4319), [#4317](https://github.com/microsoft/vscode-cmake-tools/issues/4317), [#4312](https://github.com/microsoft/vscode-cmake-tools/issues/4312)
1819

1920
## 1.20.53
2021

src/presets/presetsController.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import * as chokidar from 'chokidar';
22
import * as path from 'path';
33
import * as vscode from 'vscode';
44
import * as nls from 'vscode-nls';
5+
import * as lodash from "lodash";
56

67
import { CMakeProject, ConfigureTrigger, ConfigureType } from '@cmt/cmakeProject';
78
import * as logging from '@cmt/logging';
@@ -201,7 +202,7 @@ export class PresetsController implements vscode.Disposable {
201202
}, {
202203
name: SpecialOptions.Custom,
203204
label: localize('custom.config.preset', 'Custom'),
204-
description: localize('description.custom.config.preset', 'Add an custom configure preset')
205+
description: localize('description.custom.config.preset', 'Add a custom configure preset')
205206
}, {
206207
name: SpecialOptions.CreateFromCompilers,
207208
label: localize('create.from.compilers', 'Create from Compilers'),
@@ -463,7 +464,7 @@ export class PresetsController implements vscode.Disposable {
463464
items.push({
464465
name: SpecialOptions.Custom,
465466
label: localize('custom.build.preset', 'Custom'),
466-
description: localize('description.custom.build.preset', 'Add an custom build preset')
467+
description: localize('description.custom.build.preset', 'Add a custom build preset')
467468
});
468469

469470
const chosenItem = await vscode.window.showQuickPick(items,
@@ -540,7 +541,7 @@ export class PresetsController implements vscode.Disposable {
540541
items.push({
541542
name: SpecialOptions.Custom,
542543
label: localize('custom.test.preset', 'Custom'),
543-
description: localize('description.custom.test.preset', 'Add an custom test preset')
544+
description: localize('description.custom.test.preset', 'Add a custom test preset')
544545
});
545546

546547
const chosenItem = await vscode.window.showQuickPick(items,
@@ -698,7 +699,7 @@ export class PresetsController implements vscode.Disposable {
698699
items.push({
699700
name: SpecialOptions.Custom,
700701
label: localize('custom.workflow.preset', 'Custom'),
701-
description: localize('description.custom.workflow.preset', 'Add an custom workflow preset')
702+
description: localize('description.custom.workflow.preset', 'Add a custom workflow preset')
702703
});
703704

704705
const chosenItem = await vscode.window.showQuickPick(items,
@@ -1411,7 +1412,7 @@ export class PresetsController implements vscode.Disposable {
14111412

14121413
preset.expandConfigurePresetForPresets(this.folderPath, 'workflow');
14131414

1414-
const allPresets = await this.getAllWorkflowPresets();
1415+
const allPresets = lodash.cloneDeep(await this.getAllWorkflowPresets());
14151416
allPresets.push(preset.defaultWorkflowPreset);
14161417

14171418
log.debug(localize('start.selection.of.workflow.presets', 'Start selection of workflow presets. Found {0} presets.', allPresets.length));

src/presets/presetsParser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ export class PresetsParser {
139139
log.info(
140140
localize(
141141
"validating.presets.file",
142-
'Reading and validating the presets "file {0}"',
142+
'Reading and validating the presets file "{0}"',
143143
file
144144
)
145145
);

0 commit comments

Comments
 (0)