Skip to content

Commit abde9a3

Browse files
authored
Split format requests into separate messages for telemetry (#6068)
1 parent e8bc0e8 commit abde9a3

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

Extension/src/LanguageServer/client.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,10 @@ const GetDocumentSymbolRequest: RequestType<GetDocumentSymbolRequestParams, Loca
405405
const GetSymbolInfoRequest: RequestType<WorkspaceSymbolParams, LocalizeSymbolInformation[], void, void> = new RequestType<WorkspaceSymbolParams, LocalizeSymbolInformation[], void, void>('cpptools/getWorkspaceSymbols');
406406
const GetFoldingRangesRequest: RequestType<GetFoldingRangesParams, GetFoldingRangesResult, void, void> = new RequestType<GetFoldingRangesParams, GetFoldingRangesResult, void, void>('cpptools/getFoldingRanges');
407407
const GetSemanticTokensRequest: RequestType<GetSemanticTokensParams, GetSemanticTokensResult, void, void> = new RequestType<GetSemanticTokensParams, GetSemanticTokensResult, void, void>('cpptools/getSemanticTokens');
408-
const DocumentFormatRequest: RequestType<FormatParams, TextEdit[], void, void> = new RequestType<FormatParams, TextEdit[], void, void>('cpptools/format');
408+
const FormatDocumentRequest: RequestType<FormatParams, TextEdit[], void, void> = new RequestType<FormatParams, TextEdit[], void, void>('cpptools/formatDocument');
409+
const FormatRangeRequest: RequestType<FormatParams, TextEdit[], void, void> = new RequestType<FormatParams, TextEdit[], void, void>('cpptools/formatRange');
410+
const FormatOnTypeRequest: RequestType<FormatParams, TextEdit[], void, void> = new RequestType<FormatParams, TextEdit[], void, void>('cpptools/formatOnType');
411+
409412
// Notifications to the server
410413
const DidOpenNotification: NotificationType<DidOpenTextDocumentParams, void> = new NotificationType<DidOpenTextDocumentParams, void>('textDocument/didOpen');
411414
const FileCreatedNotification: NotificationType<FileChangedParams, void> = new NotificationType<FileChangedParams, void>('cpptools/fileCreated');
@@ -702,7 +705,7 @@ class DocumentFormattingEditProvider implements vscode.DocumentFormattingEditPro
702705
}
703706
}
704707
};
705-
return this.client.languageClient.sendRequest(DocumentFormatRequest, params)
708+
return this.client.languageClient.sendRequest(FormatDocumentRequest, params)
706709
.then((textEdits) => {
707710
const result: vscode.TextEdit[] = [];
708711
textEdits.forEach((textEdit) => {
@@ -759,7 +762,7 @@ class DocumentRangeFormattingEditProvider implements vscode.DocumentRangeFormatt
759762
}
760763
}
761764
};
762-
return this.client.languageClient.sendRequest(DocumentFormatRequest, params)
765+
return this.client.languageClient.sendRequest(FormatRangeRequest, params)
763766
.then((textEdits) => {
764767
const result: vscode.TextEdit[] = [];
765768
textEdits.forEach((textEdit) => {
@@ -816,7 +819,7 @@ class OnTypeFormattingEditProvider implements vscode.OnTypeFormattingEditProvide
816819
}
817820
}
818821
};
819-
return this.client.languageClient.sendRequest(DocumentFormatRequest, params)
822+
return this.client.languageClient.sendRequest(FormatOnTypeRequest, params)
820823
.then((textEdits) => {
821824
const result: vscode.TextEdit[] = [];
822825
textEdits.forEach((textEdit) => {

0 commit comments

Comments
 (0)