Fixes microsoft/vscode-internalbacklog#5705

Author: hediet

src/vs/editor/common/textModelEditSource.ts

@@ -91,10 +91,11 @@ export const EditSources = {
 
 	rename: () => createEditSource({ source: 'rename' } as const),
 
-	chatApplyEdits(data: { modelId: string | undefined; sessionId: string | undefined; requestId: string | undefined }) {
+	chatApplyEdits(data: { modelId: string | undefined; sessionId: string | undefined; requestId: string | undefined; languageId: string }) {
 		return createEditSource({
 			source: 'Chat.applyEdits',
 			$modelId: avoidPathRedaction(data.modelId),
+			$$languageId: data.languageId,
 			$$sessionId: data.sessionId,
 			$$requestId: data.requestId,
 		} as const);
@@ -160,7 +161,7 @@ function toProperties(version: ProviderId | undefined) {
 }
 
 type Values<T> = T[keyof T];
-type ITextModelEditSourceMetadata = Values<{ [TKey in keyof typeof EditSources]: ReturnType<typeof EditSources[TKey]>['metadataT'] }>;
+export type ITextModelEditSourceMetadata = Values<{ [TKey in keyof typeof EditSources]: ReturnType<typeof EditSources[TKey]>['metadataT'] }>;
 type ITextModelEditSourceMetadataKeys = Values<{ [TKey in keyof typeof EditSources]: keyof ReturnType<typeof EditSources[TKey]>['metadataT'] }>;
 
 

src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelChangeService.ts

@@ -162,7 +162,8 @@ export class ChatEditingTextModelChangeService extends Disposable {
 
 		const sessionId = responseModel.session.sessionId;
 		const request = responseModel.session.getRequests().at(-1);
-		const source = EditSources.chatApplyEdits({ modelId: request?.modelId, requestId: request?.id, sessionId: sessionId });
+		const languageId = this.modifiedModel.getLanguageId();
+		const source = EditSources.chatApplyEdits({ modelId: request?.modelId, requestId: request?.id, sessionId: sessionId, languageId });
 
 		if (isAtomicEdits) {
 			// EDIT and DONE

src/vs/workbench/contrib/editTelemetry/browser/telemetry/arcTelemetrySender.ts

@@ -16,6 +16,7 @@ import { ITelemetryService } from '../../../../../platform/telemetry/common/tele
 import { ArcTracker } from './arcTracker.js';
 import { IDocumentWithAnnotatedEdits, EditSourceData, createDocWithJustReason } from '../helpers/documentWithAnnotatedEdits.js';
 import type { ScmRepoBridge } from './editSourceTrackingImpl.js';
+import { ITextModelEditSourceMetadata } from '../../../../../editor/common/textModelEditSource.js';
 
 export class InlineEditArcTelemetrySender extends Disposable {
 	constructor(
@@ -103,7 +104,7 @@ export class ChatArcTelemetrySender extends Disposable {
 		this._register(runOnChange(docWithAnnotatedEdits.value, (_val, _prev, changes) => {
 			const edit = AnnotatedStringEdit.compose(changes.map(c => c.edit));
 
-			const supportedSource = new Set(['Chat.applyEdits']);
+			const supportedSource = new Set(['Chat.applyEdits' as ITextModelEditSourceMetadata['source']]);
 
 			if (!edit.replacements.some(r => supportedSource.has(r.data.editSource.metadata.source))) {
 				return;
@@ -124,6 +125,7 @@ export class ChatArcTelemetrySender extends Disposable {
 					editSessionId: string | undefined;
 					requestId: string | undefined;
 					modelId: string | undefined;
+					languageId: string | undefined;
 
 					didBranchChange: number;
 					timeDelayMs: number;
@@ -144,6 +146,7 @@ export class ChatArcTelemetrySender extends Disposable {
 					editSessionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The session id.' };
 					requestId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The request id.' };
 					modelId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The model id.' };
+					languageId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The language id of the document.' };
 
 					didBranchChange: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Indicates if the branch changed in the meantime. If the branch changed (value is 1); this event should probably be ignored.' };
 					timeDelayMs: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'The time delay between the user accepting the edit and measuring the survival rate.' };
@@ -159,6 +162,7 @@ export class ChatArcTelemetrySender extends Disposable {
 						$$requestUuid: false,
 						$$sessionId: false,
 						$$requestId: false,
+						$$languageId: false,
 						$modelId: false,
 					}),
 					extensionId: data.props.$extensionId,
@@ -167,6 +171,7 @@ export class ChatArcTelemetrySender extends Disposable {
 					editSessionId: data.props.$$sessionId,
 					requestId: data.props.$$requestId,
 					modelId: data.props.$modelId,
+					languageId: data.props.$$languageId,
 
 					didBranchChange: res.didBranchChange ? 1 : 0,
 					timeDelayMs: res.timeDelayMs,