Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-23 11:49:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into hoverlimit

Browse Source
This commit is contained in:
Matt Bierner
2025-05-15 08:31:59 -07:00
committed by GitHub
parent da8633b365 0a135e9cd9
commit 300ecf77f3
632 changed files with 16743 additions and 11602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/typescript-language-features/src/languageFeatures/quickFix.ts
View File

@@ -450,7 +450,7 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider<VsCodeCode
return results;
}
// Make sure there are multiple diagnostics of the same type in the file
// Make sure there are multiple different diagnostics of the same type in the file
if (!this.diagnosticsManager.getDiagnostics(resource).some(x => {
if (x === diagnostic) {
return false;
@@ -479,7 +479,7 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider<VsCodeCode
}
}
// Some fix all actions can actually fix multiple differnt diagnostics. Make sure we still show the fix all action
// Some fix all actions can actually fix multiple different diagnostics. Make sure we still show the fix all action
// in such cases
const fixAllErrorCodes = new Map<number, number>([
// Missing async

8
extensions/typescript-language-features/src/logging/telemetry.ts
View File

@@ -36,10 +36,10 @@ export class VSCodeTelemetryReporter implements TelemetryReporter {
reporter.postEventObj(eventName, properties);
}
public logTraceEvent(point: string, id: string, data?: string): void {
const event: { point: string; id: string; data?: string | undefined } = {
public logTraceEvent(point: string, traceId: string, data?: string): void {
const event: { point: string; traceId: string; data?: string | undefined } = {
point,
id
traceId
};
if (data) {
event.data = data;
@@ -52,7 +52,7 @@ export class VSCodeTelemetryReporter implements TelemetryReporter {
"${TypeScriptCommonProperties}"
],
"point" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The trace point." },
"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The traceId is used to correlate the request with other trace points." },
"traceId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The traceId is used to correlate the request with other trace points." },
"data": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "Additional data" }
}
*/

3
extensions/typescript-language-features/src/tsServer/server.ts
View File

@@ -271,7 +271,8 @@ export class SingleTsServer extends Disposable implements ITypeScriptServer {
this._requestQueue.enqueue(requestInfo);
if (args && typeof (args as any).$traceId === 'string') {
const queueLength = this._requestQueue.length - 1;
this._telemetryReporter.logTraceEvent('TSServer.enqueueRequest', (args as any).$traceId, JSON.stringify({ command, queueLength }));
const pendingResponses = this._pendingResponses.size;
this._telemetryReporter.logTraceEvent('TSServer.enqueueRequest', (args as any).$traceId, JSON.stringify({ command, queueLength, pendingResponses }));
}
this.sendNextRequests();