Skip to content

Commit fe9cfe3

Browse files
sean-mcmanussean-mcmanus
authored
Merge pull request #9518 from microsoft/seanmcm/1_10_8_release
1.10.8 release
2 parents 3263fab + 2080e28 commit fe9cfe3

File tree

7 files changed

+3147
-2843
lines changed

7 files changed

+3147
-2843
lines changed

‎Extension/CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# C/C++ for Visual Studio Code Change Log
22

3+
## Version 1.10.8: July 7, 2022
4+
### Enhancements
5+
* Allow breakpoints for Rust debugging. [PR #9484](https://github.com/microsoft/vscode-cpptools/pull/9484)
6+
* Make `C_Cpp.debugShortcut` settable per-workspace folder. [PR #9514](https://github.com/microsoft/vscode-cpptools/pull/9514)
7+
8+
### Bug Fixes
9+
* Fix crash if clang-tidy returns a replacement with an empty FilePath. [#9437](https://github.com/microsoft/vscode-cpptools/issues/9437)
10+
* Fix skipping the compiler argument after `-c`. [#9453](https://github.com/microsoft/vscode-cpptools/issues/9453)
11+
* Fix `-std:c++20` not being handled with cl.exe. [#9458](https://github.com/microsoft/vscode-cpptools/issues/9458)
12+
* Fix bug with the environment being incorrect when compiler querying. [#9472](https://github.com/microsoft/vscode-cpptools/issues/9472)
13+
* Fix duplicate compiler args in compiler query with custom configuration providers using cpptools-api prior to v6. [#9531](https://github.com/microsoft/vscode-cpptools/issues/9531)
14+
* Fix process launching concurrency issues on Windows.
15+
316
## Version 1.10.7: June 15, 2022
417
### Bug Fixes
518
* Fix bugs with process creation on Windows (which caused IntelliSense to fail). [#9431](https://github.com/microsoft/vscode-cpptools/issues/9431)

‎Extension/ThirdPartyNotices.txt

Lines changed: 3067 additions & 2822 deletions
Large diffs are not rendered by default.

‎Extension/package.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "cpptools",
33
"displayName": "C/C++",
44
"description": "C/C++ IntelliSense, debugging, and code browsing.",
5-
"version": "1.10.7-main",
5+
"version": "1.10.8-main",
66
"publisher": "ms-vscode",
77
"icon": "LanguageCCPP_color_128x.png",
88
"readme": "README.md",
@@ -2664,7 +2664,7 @@
26642664
"type": "boolean",
26652665
"default": true,
26662666
"description": "%c_cpp.configuration.debugShortcut.description%",
2667-
"scope": "application"
2667+
"scope": "resource"
26682668
},
26692669
"C_Cpp.legacyCompilerArgsBehavior": {
26702670
"type": "boolean",
@@ -2841,7 +2841,8 @@
28412841
"languages": [
28422842
"c",
28432843
"cpp",
2844-
"cuda-cpp"
2844+
"cuda-cpp",
2845+
"rust"
28452846
],
28462847
"_aiKeyComment": "Ignore 'Property aiKey is not allowed'. See https://github.com/microsoft/vscode/issues/76493",
28472848
"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
@@ -3519,7 +3520,8 @@
35193520
"languages": [
35203521
"c",
35213522
"cpp",
3522-
"cuda-cpp"
3523+
"cuda-cpp",
3524+
"rust"
35233525
],
35243526
"_aiKeyComment": "Ignore 'Property aiKey is not allowed'. See https://github.com/microsoft/vscode/issues/76493",
35253527
"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
@@ -3923,6 +3925,9 @@
39233925
},
39243926
{
39253927
"language": "cuda"
3928+
},
3929+
{
3930+
"language": "rust"
39263931
}
39273932
],
39283933
"jsonValidation": [
@@ -4528,7 +4533,7 @@
45284533
"plist": "^3.0.5",
45294534
"tmp": "^0.2.1",
45304535
"vscode-cpptools": "^6.1.0",
4531-
"vscode-extension-telemetry": "^0.4.4",
4536+
"@vscode/extension-telemetry": "^0.6.2",
45324537
"vscode-languageclient": "^5.2.1",
45334538
"vscode-nls": "^5.0.0",
45344539
"vscode-tas-client": "^0.1.27",
@@ -4549,4 +4554,4 @@
45494554
"y18n": "^5.0.5",
45504555
"minimist": "^1.2.6"
45514556
}
4552-
}
4557+
}

‎Extension/src/Debugger/configurationProvider.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
9595

9696
const selection: ConfigMenu | undefined = await vscode.window.showQuickPick(this.localizeConfigDetail(items), {placeHolder: localize("select.configuration", "Select a configuration")});
9797
if (!selection) {
98-
Telemetry.logDebuggerEvent(DebuggerEvent.debugPanel, { "debugType": "debug", "configSource": ConfigSource.unknown, "configMode": ConfigMode.unknown, "cancelled": "true", "success": "true" });
98+
Telemetry.logDebuggerEvent(DebuggerEvent.debugPanel, { "debugType": "debug", "configSource": ConfigSource.unknown, "configMode": ConfigMode.unknown, "cancelled": "true", "succeeded": "true" });
9999
return []; // User canceled it.
100100
}
101101

@@ -119,7 +119,7 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
119119
// resolveDebugConfiguration will be automatically called after calling provideDebugConfigurations.
120120
const configs: CppDebugConfiguration[]= await this.provideDebugConfigurations(folder);
121121
if (!configs || configs.length === 0) {
122-
Telemetry.logDebuggerEvent(DebuggerEvent.debugPanel, { "debugType": DebugType.debug, "configSource": folder ? ConfigSource.workspaceFolder : ConfigSource.singleFile, "configMode": ConfigMode.noLaunchConfig, "cancelled": "true", "success": "true" });
122+
Telemetry.logDebuggerEvent(DebuggerEvent.debugPanel, { "debugType": DebugType.debug, "configSource": folder ? ConfigSource.workspaceFolder : ConfigSource.singleFile, "configMode": ConfigMode.noLaunchConfig, "cancelled": "true", "succeeded": "true" });
123123
return undefined; // aborts debugging silently
124124
} else {
125125
// Currently, we expect only one debug config to be selected.
@@ -153,9 +153,9 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
153153
try {
154154
await cppBuildTaskProvider.runBuildTask(config.preLaunchTask);
155155
config.preLaunchTask = undefined;
156-
Telemetry.logDebuggerEvent(DebuggerEvent.debugPanel, { "debugType": DebugType.debug, "configSource": config.configSource || ConfigSource.unknown, "configMode": ConfigMode.launchConfig, "cancelled": "false", "success": "true" });
156+
Telemetry.logDebuggerEvent(DebuggerEvent.debugPanel, { "debugType": DebugType.debug, "configSource": config.configSource || ConfigSource.unknown, "configMode": ConfigMode.launchConfig, "cancelled": "false", "succeeded": "true" });
157157
} catch (err) {
158-
Telemetry.logDebuggerEvent(DebuggerEvent.debugPanel, { "debugType": DebugType.debug, "configSource": config.configSource || ConfigSource.unknown, "configMode": ConfigMode.launchConfig, "cancelled": "false", "success": "false" });
158+
Telemetry.logDebuggerEvent(DebuggerEvent.debugPanel, { "debugType": DebugType.debug, "configSource": config.configSource || ConfigSource.unknown, "configMode": ConfigMode.launchConfig, "cancelled": "false", "succeeded": "false" });
159159
}
160160
return config;
161161
}
@@ -180,7 +180,7 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
180180
config.debugType = config.debugType ? config.debugType : DebugType.debug;
181181
const configMode: ConfigMode = isExistingConfig ? ConfigMode.launchConfig : ConfigMode.noLaunchConfig;
182182
// if configuration.debuggerEvent === undefined, it means this configuration is already defined in launch.json and is shown in debugPanel.
183-
Telemetry.logDebuggerEvent(config.debuggerEvent || DebuggerEvent.debugPanel, { "debugType": config.debugType || DebugType.debug, "configSource": config.configSource || ConfigSource.unknown, "configMode": configMode, "cancelled": "false", "success": "true" });
183+
Telemetry.logDebuggerEvent(config.debuggerEvent || DebuggerEvent.debugPanel, { "debugType": config.debugType || DebugType.debug, "configSource": config.configSource || ConfigSource.unknown, "configMode": configMode, "cancelled": "false", "succeeded": "true" });
184184

185185
if (!resolveByVsCode) {
186186
if ((singleFile || (isDebugPanel && !folder && isExistingTask))) {
@@ -763,7 +763,7 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
763763
}
764764
const selectedConfig: vscode.DebugConfiguration | undefined = await this.selectConfiguration(textEditor, false, true);
765765
if (!selectedConfig) {
766-
Telemetry.logDebuggerEvent(DebuggerEvent.addConfigGear, { "configSource": ConfigSource.workspaceFolder, "configMode": ConfigMode.launchConfig, "cancelled": "true", "success": "true" });
766+
Telemetry.logDebuggerEvent(DebuggerEvent.addConfigGear, { "configSource": ConfigSource.workspaceFolder, "configMode": ConfigMode.launchConfig, "cancelled": "true", "succeeded": "true" });
767767
return; // User canceled it.
768768
}
769769

@@ -780,7 +780,7 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
780780
selectedConfig.debuggerEvent = undefined;
781781
// Write debug configuration in launch.json file.
782782
await this.writeDebugConfig(selectedConfig, isExistingConfig, folder);
783-
Telemetry.logDebuggerEvent(DebuggerEvent.addConfigGear, { "configSource": ConfigSource.workspaceFolder, "configMode": ConfigMode.launchConfig, "cancelled": "false", "success": "true" });
783+
Telemetry.logDebuggerEvent(DebuggerEvent.addConfigGear, { "configSource": ConfigSource.workspaceFolder, "configMode": ConfigMode.launchConfig, "cancelled": "false", "succeeded": "true" });
784784
}
785785

786786
public async buildAndRun(textEditor: vscode.TextEditor): Promise<void> {
@@ -792,7 +792,7 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
792792
let folder: vscode.WorkspaceFolder | undefined = vscode.workspace.getWorkspaceFolder(textEditor.document.uri);
793793
const selectedConfig: CppDebugConfiguration | undefined = await this.selectConfiguration(textEditor);
794794
if (!selectedConfig) {
795-
Telemetry.logDebuggerEvent(DebuggerEvent.playButton, { "debugType": debugModeOn ? DebugType.debug : DebugType.run, "configSource": ConfigSource.unknown, "cancelled": "true", "success": "true" });
795+
Telemetry.logDebuggerEvent(DebuggerEvent.playButton, { "debugType": debugModeOn ? DebugType.debug : DebugType.run, "configSource": ConfigSource.unknown, "cancelled": "true", "succeeded": "true" });
796796
return; // User canceled it.
797797
}
798798

@@ -870,7 +870,7 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
870870
if (e && e.message === util.failedToParseJson) {
871871
vscode.window.showErrorMessage(util.failedToParseJson);
872872
}
873-
Telemetry.logDebuggerEvent(config.debuggerEvent || DebuggerEvent.debugPanel, { "debugType": config.debugType || DebugType.debug, "configSource": config.configSource || ConfigSource.unknown, "configMode": configMode, "cancelled": "false", "success": "false" });
873+
Telemetry.logDebuggerEvent(config.debuggerEvent || DebuggerEvent.debugPanel, { "debugType": config.debugType || DebugType.debug, "configSource": config.configSource || ConfigSource.unknown, "configMode": configMode, "cancelled": "false", "succeeded": "false" });
874874
}
875875
}
876876
}

‎Extension/src/LanguageServer/client.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3215,6 +3215,7 @@ export class DefaultClient implements Client {
32153215
itemConfig.compilerPath = compilerPathAndArgs.compilerPath;
32163216
if (providerVersion < Version.v6) {
32173217
itemConfig.compilerArgsLegacy = compilerPathAndArgs.allCompilerArgs;
3218+
itemConfig.compilerArgs = undefined;
32183219
} else {
32193220
itemConfig.compilerArgs = compilerPathAndArgs.allCompilerArgs;
32203221
}
@@ -3306,6 +3307,7 @@ export class DefaultClient implements Client {
33063307
sanitized.compilerPath = compilerPathAndArgs.compilerPath;
33073308
if (providerVersion < Version.v6) {
33083309
sanitized.compilerArgsLegacy = compilerPathAndArgs.allCompilerArgs;
3310+
sanitized.compilerArgs = undefined;
33093311
} else {
33103312
sanitized.compilerArgs = compilerPathAndArgs.allCompilerArgs;
33113313
}

‎Extension/src/telemetry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* ------------------------------------------------------------------------------------------ */
55
'use strict';
66

7-
import TelemetryReporter from 'vscode-extension-telemetry';
7+
import TelemetryReporter from '@vscode/extension-telemetry';
88
import { getExperimentationServiceAsync, IExperimentationService, IExperimentationTelemetry, TargetPopulation } from 'vscode-tas-client';
99
import * as util from './common';
1010

‎Extension/yarn.lock

Lines changed: 44 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,42 @@
101101
resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
102102
integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
103103

104+
"@microsoft/[email protected]", "@microsoft/1ds-core-js@^3.2.3":
105+
version "3.2.3"
106+
resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.3.tgz#2217d92ec8b073caa4577a13f40ea3a5c4c4d4e7"
107+
integrity sha512-796A8fd90oUKDRO7UXUT9BwZ3G+a9XzJj5v012FcCN/2qRhEsIV3x/0wkx2S08T4FiQEUPkB2uoYHpEjEneM7g==
108+
dependencies:
109+
"@microsoft/applicationinsights-core-js" "2.8.4"
110+
"@microsoft/applicationinsights-shims" "^2.0.1"
111+
"@microsoft/dynamicproto-js" "^1.1.6"
112+
113+
"@microsoft/1ds-post-js@^3.2.3":
114+
version "3.2.3"
115+
resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.3.tgz#1fa7d51615a44f289632ae8c588007ba943db216"
116+
integrity sha512-tcGJQXXr2LYoBbIXPoUVe1KCF3OtBsuKDFL7BXfmNtuSGtWF0yejm6H83DrR8/cUIGMRMUP9lqNlqFGwDYiwAQ==
117+
dependencies:
118+
"@microsoft/1ds-core-js" "3.2.3"
119+
"@microsoft/applicationinsights-shims" "^2.0.1"
120+
"@microsoft/dynamicproto-js" "^1.1.6"
121+
122+
"@microsoft/[email protected]":
123+
version "2.8.4"
124+
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.4.tgz#607e531bb241a8920d43960f68a7c76a6f9af596"
125+
integrity sha512-FoA0FNOsFbJnLyTyQlYs6+HR7HMEa6nAOE6WOm9WVejBHMHQ/Bdb+hfVFi6slxwCimr/ner90jchi4/sIYdnyQ==
126+
dependencies:
127+
"@microsoft/applicationinsights-shims" "2.0.1"
128+
"@microsoft/dynamicproto-js" "^1.1.6"
129+
130+
"@microsoft/[email protected]", "@microsoft/applicationinsights-shims@^2.0.1":
131+
version "2.0.1"
132+
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.1.tgz#5d72fb7aaf4056c4fda54f9d7c93ccf8ca9bcbfd"
133+
integrity sha512-G0MXf6R6HndRbDy9BbEj0zrLeuhwt2nsXk2zKtF0TnYo39KgYqhYC2ayIzKPTm2KAE+xzD7rgyLdZnrcRvt9WQ==
134+
135+
"@microsoft/dynamicproto-js@^1.1.6":
136+
version "1.1.6"
137+
resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.6.tgz#6fe03468862861f5f88ac4c3959a652b3797f1bc"
138+
integrity sha512-D1Oivw1A4bIXhzBIy3/BBPn3p2On+kpO2NiYt9shICDK7L/w+cR6FFBUsBZ05l6iqzTeL+Jm8lAYn0g6G7DmDg==
139+
104140
"@nodelib/[email protected]":
105141
version "2.1.4"
106142
resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
@@ -415,6 +451,14 @@
415451
resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
416452
integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
417453

454+
"@vscode/extension-telemetry@^0.6.2":
455+
version "0.6.2"
456+
resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.6.2.tgz#b86814ee680615730da94220c2b03ea9c3c14a8e"
457+
integrity sha512-yb/wxLuaaCRcBAZtDCjNYSisAXz3FWsSqAha5nhHcYxx2ZPdQdWuZqVXGKq0ZpHVndBWWtK6XqtpCN2/HB4S1w==
458+
dependencies:
459+
"@microsoft/1ds-core-js" "^3.2.3"
460+
"@microsoft/1ds-post-js" "^3.2.3"
461+
418462
"@vscode/test-electron@^1.6.1":
419463
version "1.6.1"
420464
resolved "https://registry.yarnpkg.com/@vscode/test-electron/-/test-electron-1.6.1.tgz#2b282154097e250ee9b94b6a284eb5804e53a3d7"
@@ -5790,11 +5834,6 @@ [email protected], vscode-debugprotocol@^1.35.0:
57905834
resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.38.0.tgz#7a9bcd457e6642f48fabef114c0fa1c25a2fb1e7"
57915835
integrity sha512-oam9iSjNfXSn71a8bmNsXv8k/rIKSOcllIPrFnNgxd1EMBpfnum+gb7lmRpcH0zSjGb+OH8Ncn8B5tv8srWbNQ==
57925836

5793-
vscode-extension-telemetry@^0.4.4:
5794-
version "0.4.4"
5795-
resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.4.4.tgz#e5d5ac90ea7d07ec054f5310893d95d43d5984b0"
5796-
integrity sha512-LzirNf2GnykXCAqqWrvj+snYqgkPVyjwM72tYOHgcZiG/ZRuNjmqlgvs+SomEJdmD8cutduitPmhoyIuzOrVfA==
5797-
57985837
vscode-jsonrpc@^4.0.0:
57995838
version "4.0.0"
58005839
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9"

0 commit comments

Comments
 (0)