Merge branch 'main' of https://github.com/microsoft/vscode-cpptools into dev/garretts/instrumentation

Author: fearthecowboy

Extension/.scripts/common.ts

@@ -48,7 +48,7 @@ export const Git = async (...args: Parameters<Awaited<CommandFunction>>) => (awa
 export const GitClean = async (...args: Parameters<Awaited<CommandFunction>>) => (await new Command(await git, 'clean'))(...args);
 
 export async function getModifiedIgnoredFiles() {
-    const {code, error, stdio } = await GitClean('-Xd', '-n');
+    const { code, error, stdio } = await GitClean('-Xd', '-n');
     if (code) {
         throw new Error(`\n${error.all().join('\n')}`);
     }
@@ -65,11 +65,11 @@ export async function rimraf(...paths: string[]) {
         }
         if (await filepath.isFolder(each)) {
             verbose(`Removing folder ${red(each)}`);
-            all.push(rm(each, {recursive: true, force: true}));
+            all.push(rm(each, { recursive: true, force: true }));
             continue;
         }
         verbose(`Removing file ${red(each)}`);
-        all.push(rm(each, {force: true}));
+        all.push(rm(each, { force: true }));
     }
     await Promise.all(all);
 }
@@ -345,3 +345,15 @@ export async function checkBinaries() {
     }
     return failing;
 }
+
+export async function checkProposals() {
+    let failing = false;
+
+    await rm(`${$root}/vscode.proposed.chatParticipantAdditions.d.ts`);
+    failing = await assertAnyFile('vscode.proposed.chatParticipantAdditions.d.ts') && (quiet || warn(`The VSCode import file '${$root}/vscode.proposed.chatParticipantAdditions.d.ts' should not be present.`)) || failing;
+
+    if (!failing) {
+        verbose('VSCode proposals appear to be in place.');
+    }
+    return failing;
+}

Extension/.scripts/verify.ts

@@ -3,7 +3,7 @@
  * See 'LICENSE' in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
 
-import { checkBinaries, checkCompiled, checkDTS, checkPrep, error, green } from './common';
+import { checkBinaries, checkCompiled, checkDTS, checkPrep, checkProposals, error, green } from './common';
 const quiet = process.argv.includes('--quiet');
 
 export async function main() {
@@ -50,3 +50,12 @@ export async function dts() {
         process.exit(1);
     }
 }
+
+export async function proposals() {
+    let failing = false;
+    failing = (await checkProposals() && (quiet || error(`Issue with VSCode proposals. Run ${green('yarn prep')} to fix it.`))) || failing;
+
+    if (failing) {
+        process.exit(1);
+    }
+}

Extension/CHANGELOG.md

@@ -1,12 +1,20 @@
 # C/C++ for Visual Studio Code Changelog
 
-## Version 1.23.3: January 9, 2025
-### New Feature
-* Enable setting multiple compile commands. [#7029](https://github.com/microsoft/vscode-cpptools/issues/7029)
-  * Thank you for the contribution. [@yiftahw](https://github.com/yiftahw) [PR #12960](https://github.com/microsoft/vscode-cpptools/pull/12960)
+## Version 1.23.4: January 16, 2025
+### Bug Fixes
+* Fix a couple bugs with `.editorConfig` handling. [PR #13140](https://github.com/microsoft/vscode-cpptools/pull/13140)
+* Fix a bug when processing a file with invalid multi-byte sequences. [#13150](https://github.com/microsoft/vscode-cpptools/issues/13150)
+* Fix a potential telemetry issue with Copilot hover. [PR #13158](https://github.com/microsoft/vscode-cpptools/pull/13158)
+* Fix a crash when Copilot hover is used on code with no definition file (e.g. literals).
+* Update clang-format and clang-tidy from 19.1.6 to 19.1.7.
+* Update vsdbg from 17.12.10729.1 to 17.13.20115.1.
+* Fix `libiconv.dll` not being signed on Windows.
 
+## Version 1.23.3: January 9, 2025
 ### Enhancements
 * Modifications to the snippet completions to more closely match the snippets provided by TypeScript. [#4482](https://github.com/microsoft/vscode-cpptools/issues/4482)
+* Enable setting multiple compile commands. [#7029](https://github.com/microsoft/vscode-cpptools/issues/7029)
+  * Thank you for the contribution. [@yiftahw](https://github.com/yiftahw) [PR #12960](https://github.com/microsoft/vscode-cpptools/pull/12960)
 * Update clang path setting descriptions. [PR #13071](https://github.com/microsoft/vscode-cpptools/pull/13071)
 * Update clang-format and clang-tidy from 19.1.5 to 19.1.6.
 * IntelliSense parser updates.

Extension/package.json

@@ -2,7 +2,7 @@
     "name": "cpptools",
     "displayName": "C/C++",
     "description": "C/C++ IntelliSense, debugging, and code browsing.",
-    "version": "1.23.3-main",
+    "version": "1.23.4-main",
     "publisher": "ms-vscode",
     "icon": "LanguageCCPP_color_128x.png",
     "readme": "README.md",
@@ -38,7 +38,8 @@
         "Snippets"
     ],
     "enabledApiProposals": [
-        "terminalDataWriteEvent"
+        "terminalDataWriteEvent",
+        "chatParticipantAdditions"
     ],
     "capabilities": {
         "untrustedWorkspaces": {
@@ -6537,7 +6538,7 @@
         "translations-generate": "set NODE_OPTIONS=--no-experimental-fetch && gulp translations-generate",
         "translations-import": "gulp translations-import",
         "import-edge-strings": "ts-node -T ./.scripts/import_edge_strings.ts",
-        "prep:dts": "yarn verify dts --quiet || (npx @vscode/dts dev && npx @vscode/dts main)",
+        "prep:dts": "yarn verify dts --quiet || (npx @vscode/dts main && npx @vscode/dts dev && yarn verify proposals)",
         "build": "yarn prep:dts && echo [Building TypeScript code] && tsc --build tsconfig.json"
     },
     "devDependencies": {

Extension/src/LanguageServer/Providers/CopilotHoverProvider.ts

@@ -5,7 +5,7 @@
 import * as vscode from 'vscode';
 import { Position, ResponseError } from 'vscode-languageclient';
 import * as nls from 'vscode-nls';
-import { DefaultClient, GetCopilotHoverInfoParams, GetCopilotHoverInfoRequest } from '../client';
+import { DefaultClient, GetCopilotHoverInfoParams, GetCopilotHoverInfoRequest, GetCopilotHoverInfoResult } from '../client';
 import { RequestCancelled, ServerCancelled } from '../protocolFilter';
 import { CppSettings } from '../settings';
 
@@ -92,8 +92,8 @@ export class CopilotHoverProvider implements vscode.HoverProvider {
         return this.currentCancellationToken;
     }
 
-    public async getRequestInfo(document: vscode.TextDocument, position: vscode.Position): Promise<string> {
-        let requestInfo = "";
+    public async getRequestInfo(document: vscode.TextDocument, position: vscode.Position): Promise<GetCopilotHoverInfoResult> {
+        let response: GetCopilotHoverInfoResult;
         const params: GetCopilotHoverInfoParams = {
             textDocument: { uri: document.uri.toString() },
             position: Position.create(position.line, position.character)
@@ -105,16 +105,15 @@ export class CopilotHoverProvider implements vscode.HoverProvider {
         }
 
         try {
-            const response = await this.client.languageClient.sendRequest(GetCopilotHoverInfoRequest, params, this.currentCancellationToken);
-            requestInfo = response.content;
+            response = await this.client.languageClient.sendRequest(GetCopilotHoverInfoRequest, params, this.currentCancellationToken);
         } catch (e: any) {
             if (e instanceof ResponseError && (e.code === RequestCancelled || e.code === ServerCancelled)) {
                 throw new vscode.CancellationError();
             }
             throw e;
         }
 
-        return requestInfo;
+        return response;
     }
 
     public isCancelled(document: vscode.TextDocument, position: vscode.Position): boolean {

Extension/src/LanguageServer/client.ts

@@ -541,8 +541,9 @@ export interface GetCopilotHoverInfoParams {
     position: Position;
 }
 
-interface GetCopilotHoverInfoResult {
+export interface GetCopilotHoverInfoResult {
     content: string;
+    files: string[];
 }
 
 export interface ChatContextResult {

Extension/src/LanguageServer/copilotProviders.ts

@@ -48,7 +48,7 @@ export async function registerRelatedFilesProvider(): Promise<void> {
                         try {
                             const getIncludesHandler = async () => (await getIncludes(uri, 1))?.includedFiles.map(file => vscode.Uri.file(file)) ?? [];
                             const getTraitsHandler = async () => {
-                                const projectContext = await getProjectContext(uri, context);
+                                const projectContext = await getProjectContext(uri, context, telemetryProperties, telemetryMetrics);
 
                                 if (!projectContext) {
                                     return undefined;

Extension/src/LanguageServer/extension.ts

@@ -11,7 +11,7 @@ import * as StreamZip from 'node-stream-zip';
 import * as os from 'os';
 import * as path from 'path';
 import * as vscode from 'vscode';
-import { Range } from 'vscode-languageclient';
+import { CancellationToken, Range } from 'vscode-languageclient';
 import * as nls from 'vscode-nls';
 import { TargetPopulation } from 'vscode-tas-client';
 import * as which from 'which';
@@ -1428,18 +1428,34 @@ async function onCopilotHover(): Promise<void> {
 
     // Gather the content for the query from the client.
     const requestInfo = await copilotHoverProvider.getRequestInfo(hoverDocument, hoverPosition);
-    if (requestInfo.length === 0) {
+    try {
+        for (const file of requestInfo.files) {
+            const fileUri = vscode.Uri.file(file);
+            if (await vscodelm.fileIsIgnored(fileUri, copilotHoverProvider.getCurrentHoverCancellationToken() ?? CancellationToken.None)) {
+                telemetry.logLanguageServerEvent("CopilotHover", { "Message": "Copilot summary is not available due to content exclusion." });
+                await showCopilotContent(copilotHoverProvider, hoverDocument, hoverPosition, localize("copilot.hover.unavailable", "Copilot summary is not available.") + "\n\n" +
+                    localize("copilot.hover.excluded", "The file containing this symbol's definition or declaration has been excluded from use with Copilot."));
+                return;
+            }
+        }
+    } catch (err) {
+        if (err instanceof Error) {
+            await reportCopilotFailure(copilotHoverProvider, hoverDocument, hoverPosition, err.name);
+        }
+        return;
+    }
+    if (requestInfo.content.length === 0) {
         // Context is not available for this symbol.
         telemetry.logLanguageServerEvent("CopilotHover", { "Message": "Copilot summary is not available for this symbol." });
-        await showCopilotContent(copilotHoverProvider, hoverDocument, hoverPosition, localize("copilot.hover.unavailable", "Copilot summary is not available for this symbol."));
+        await showCopilotContent(copilotHoverProvider, hoverDocument, hoverPosition, localize("copilot.hover.unavailable.symbol", "Copilot summary is not available for this symbol."));
         return;
     }
 
     const locale = getLocaleId();
 
     const messages = [
         vscode.LanguageModelChatMessage
-            .User(requestInfo + locale)];
+            .User(requestInfo.content + locale)];
 
     const [model] = await vscodelm.selectChatModels(modelSelector);
 
@@ -1453,7 +1469,7 @@ async function onCopilotHover(): Promise<void> {
     } catch (err) {
         if (err instanceof vscode.LanguageModelError) {
             console.log(err.message, err.code, err.cause);
-            await reportCopilotFailure(copilotHoverProvider, hoverDocument, hoverPosition, err.message);
+            await reportCopilotFailure(copilotHoverProvider, hoverDocument, hoverPosition, err.code);
         } else {
             throw err;
         }
@@ -1473,9 +1489,12 @@ async function onCopilotHover(): Promise<void> {
             content += fragment;
         }
     } catch (err) {
-        if (err instanceof Error) {
+        if (err instanceof vscode.LanguageModelError) {
+            console.log(err.message, err.code, err.cause);
+            await reportCopilotFailure(copilotHoverProvider, hoverDocument, hoverPosition, err.code);
+        } else if (err instanceof Error) {
             console.log(err.message, err.cause);
-            await reportCopilotFailure(copilotHoverProvider, hoverDocument, hoverPosition, err.message);
+            await reportCopilotFailure(copilotHoverProvider, hoverDocument, hoverPosition, err.name);
         }
         return;
     }

Extension/src/LanguageServer/lmTool.ts

@@ -124,18 +124,20 @@ function filterCompilerArguments(compiler: string, compilerArguments: string[],
     if (filteredCompilerArguments.length > 0) {
         // Telemetry to learn about the argument distribution. The filtered arguments are expected to be non-PII.
         telemetryProperties["filteredCompilerArguments"] = filteredCompilerArguments.join(',');
-        telemetryProperties["filters"] = Object.keys(filterMap).filter(filter => !!filter).join(',');
+    }
+
+    const filters = Object.keys(filterMap).filter(filter => !!filter).join(',');
+    if (filters) {
+        telemetryProperties["filters"] = filters;
     }
 
     return result;
 }
 
-export async function getProjectContext(uri: vscode.Uri, context: { flags: Record<string, unknown> }): Promise<ProjectContext | undefined> {
-    const telemetryProperties: Record<string, string> = {};
-    const telemetryMetrics: Record<string, number> = {};
+export async function getProjectContext(uri: vscode.Uri, context: { flags: Record<string, unknown> }, telemetryProperties: Record<string, string>, telemetryMetrics: Record<string, number>): Promise<ProjectContext | undefined> {
     try {
         const projectContext = await checkDuration<ProjectContextResult | undefined>(async () => await getClients()?.ActiveClient?.getProjectContext(uri) ?? undefined);
-        telemetryMetrics["duration"] = projectContext.duration;
+        telemetryMetrics["projectContextDuration"] = projectContext.duration;
         if (!projectContext.result) {
             return undefined;
         }
@@ -186,10 +188,8 @@ export async function getProjectContext(uri: vscode.Uri, context: { flags: Recor
         catch {
             // Intentionally swallow any exception.
         }
-        telemetryProperties["error"] = "true";
+        telemetryProperties["projectContextError"] = "true";
         throw exception; // Throw the exception for auto-retry.
-    } finally {
-        telemetry.logCopilotEvent('ProjectContext', telemetryProperties, telemetryMetrics);
     }
 }