From d2df5d92852991d31bd7190d2eacc609bc48d189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20St=C3=B6hr?= Date: Wed, 28 Oct 2026 16:38:25 +0100 Subject: [PATCH 1/4] Preserve additional formatting options --- client-node-tests/src/integration.test.ts | 21 +++++++++++++++++++++ client-node-tests/src/servers/testServer.ts | 10 +++++++--- client/src/common/codeConverter.ts | 2 +- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/client-node-tests/src/integration.test.ts b/client-node-tests/src/integration.test.ts index c90d91cbf..e0b5e8b95 100644 --- a/client-node-tests/src/integration.test.ts +++ b/client-node-tests/src/integration.test.ts @@ -894,6 +894,27 @@ suite('Client integration', () => { assert.ok(middlewareCalled); }); + test('Document Formatting passes through additional formatting options', async () => { + const provider = client.getFeature(lsclient.DocumentFormattingRequest.method).getProvider(document); + isDefined(provider); + const result = await provider.provideDocumentFormattingEdits(document, { + tabSize: 4, + insertSpaces: false, + trimTrailingWhitespace: true, + customSetting: 'customValue' + }, tokenSource.token); + isArray(result, vscode.TextEdit); + const options = await client.sendRequest( + new lsclient.ProtocolRequestType('testing/lastFormattingOptions'), + null, + tokenSource.token + ); + assert.strictEqual(options?.tabSize, 4); + assert.strictEqual(options?.insertSpaces, false); + assert.strictEqual(options?.trimTrailingWhitespace, true); + assert.strictEqual(options?.customSetting, 'customValue'); + }); + test('Document Range Formatting', async () => { const provider = client.getFeature(lsclient.DocumentRangeFormattingRequest.method).getProvider(document); isDefined(provider); diff --git a/client-node-tests/src/servers/testServer.ts b/client-node-tests/src/servers/testServer.ts index 6f3fc32a2..cd9c9d853 100644 --- a/client-node-tests/src/servers/testServer.ts +++ b/client-node-tests/src/servers/testServer.ts @@ -11,7 +11,7 @@ import { ColorInformation, Color, ColorPresentation, FoldingRange, SelectionRange, SymbolKind, ProtocolRequestType, WorkDoneProgress, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, WorkDoneProgressCreateRequest, WillCreateFilesRequest, WillRenameFilesRequest, WillDeleteFilesRequest, DidDeleteFilesNotification, DidRenameFilesNotification, DidCreateFilesNotification, - ProposedFeatures, Diagnostic, DiagnosticSeverity, TypeHierarchyItem, InlayHint, InlayHintLabelPart, InlayHintKind, DocumentDiagnosticReportKind, DocumentSymbol, InlineCompletionItem, ApplyWorkspaceEditRequest, ApplyWorkspaceEditParams + ProposedFeatures, Diagnostic, DiagnosticSeverity, TypeHierarchyItem, InlayHint, InlayHintLabelPart, InlayHintKind, DocumentDiagnosticReportKind, DocumentSymbol, InlineCompletionItem, ApplyWorkspaceEditRequest, ApplyWorkspaceEditParams, FormattingOptions } from 'vscode-languageserver/node'; import { URI } from 'vscode-uri'; @@ -265,12 +265,16 @@ connection.onCodeActionResolve((codeAction) => { return codeAction; }); -connection.onDocumentFormatting((_params) => { +let lastFormattingOptions: FormattingOptions | undefined; +connection.onDocumentFormatting((params) => { + lastFormattingOptions = params.options; return [ TextEdit.insert(Position.create(0, 0), 'insert') ]; }); +connection.onRequest(new ProtocolRequestType('testing/lastFormattingOptions'), () => lastFormattingOptions); + connection.onDocumentRangeFormatting((_params) => { return [ TextEdit.del(Range.create(1, 1, 1, 2)) @@ -588,4 +592,4 @@ connection.onRequest( ); // Listen on the connection -connection.listen(); \ No newline at end of file +connection.listen(); diff --git a/client/src/common/codeConverter.ts b/client/src/common/codeConverter.ts index b8401e964..53a9e81c0 100644 --- a/client/src/common/codeConverter.ts +++ b/client/src/common/codeConverter.ts @@ -859,7 +859,7 @@ export function createConverter(uriConverter?: URIConverter): Converter { } function asFormattingOptions(options: code.FormattingOptions, fileOptions: FileFormattingOptions): proto.FormattingOptions { - const result: proto.FormattingOptions = { tabSize: options.tabSize, insertSpaces: options.insertSpaces }; + const result: proto.FormattingOptions = { ...options }; if (fileOptions.trimTrailingWhitespace) { result.trimTrailingWhitespace = true; } From b030c82ffa4b2620e905fb7120a3f487faa24dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20St=C3=B6hr?= Date: Wed, 28 Oct 2026 16:38:25 +0100 Subject: [PATCH 2/4] Preserve additional formatting options --- client-node-tests/src/integration.test.ts | 21 +++++++++++++++++++++ client-node-tests/src/servers/testServer.ts | 10 +++++++--- client/src/common/codeConverter.ts | 2 +- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/client-node-tests/src/integration.test.ts b/client-node-tests/src/integration.test.ts index c90d91cbf..e0b5e8b95 100644 --- a/client-node-tests/src/integration.test.ts +++ b/client-node-tests/src/integration.test.ts @@ -894,6 +894,27 @@ suite('Client integration', () => { assert.ok(middlewareCalled); }); + test('Document Formatting passes through additional formatting options', async () => { + const provider = client.getFeature(lsclient.DocumentFormattingRequest.method).getProvider(document); + isDefined(provider); + const result = await provider.provideDocumentFormattingEdits(document, { + tabSize: 4, + insertSpaces: false, + trimTrailingWhitespace: true, + customSetting: 'customValue' + }, tokenSource.token); + isArray(result, vscode.TextEdit); + const options = await client.sendRequest( + new lsclient.ProtocolRequestType('testing/lastFormattingOptions'), + null, + tokenSource.token + ); + assert.strictEqual(options?.tabSize, 4); + assert.strictEqual(options?.insertSpaces, false); + assert.strictEqual(options?.trimTrailingWhitespace, true); + assert.strictEqual(options?.customSetting, 'customValue'); + }); + test('Document Range Formatting', async () => { const provider = client.getFeature(lsclient.DocumentRangeFormattingRequest.method).getProvider(document); isDefined(provider); diff --git a/client-node-tests/src/servers/testServer.ts b/client-node-tests/src/servers/testServer.ts index 6f3fc32a2..cd9c9d853 100644 --- a/client-node-tests/src/servers/testServer.ts +++ b/client-node-tests/src/servers/testServer.ts @@ -11,7 +11,7 @@ import { ColorInformation, Color, ColorPresentation, FoldingRange, SelectionRange, SymbolKind, ProtocolRequestType, WorkDoneProgress, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, WorkDoneProgressCreateRequest, WillCreateFilesRequest, WillRenameFilesRequest, WillDeleteFilesRequest, DidDeleteFilesNotification, DidRenameFilesNotification, DidCreateFilesNotification, - ProposedFeatures, Diagnostic, DiagnosticSeverity, TypeHierarchyItem, InlayHint, InlayHintLabelPart, InlayHintKind, DocumentDiagnosticReportKind, DocumentSymbol, InlineCompletionItem, ApplyWorkspaceEditRequest, ApplyWorkspaceEditParams + ProposedFeatures, Diagnostic, DiagnosticSeverity, TypeHierarchyItem, InlayHint, InlayHintLabelPart, InlayHintKind, DocumentDiagnosticReportKind, DocumentSymbol, InlineCompletionItem, ApplyWorkspaceEditRequest, ApplyWorkspaceEditParams, FormattingOptions } from 'vscode-languageserver/node'; import { URI } from 'vscode-uri'; @@ -265,12 +265,16 @@ connection.onCodeActionResolve((codeAction) => { return codeAction; }); -connection.onDocumentFormatting((_params) => { +let lastFormattingOptions: FormattingOptions | undefined; +connection.onDocumentFormatting((params) => { + lastFormattingOptions = params.options; return [ TextEdit.insert(Position.create(0, 0), 'insert') ]; }); +connection.onRequest(new ProtocolRequestType('testing/lastFormattingOptions'), () => lastFormattingOptions); + connection.onDocumentRangeFormatting((_params) => { return [ TextEdit.del(Range.create(1, 1, 1, 2)) @@ -588,4 +592,4 @@ connection.onRequest( ); // Listen on the connection -connection.listen(); \ No newline at end of file +connection.listen(); diff --git a/client/src/common/codeConverter.ts b/client/src/common/codeConverter.ts index b8401e964..53a9e81c0 100644 --- a/client/src/common/codeConverter.ts +++ b/client/src/common/codeConverter.ts @@ -859,7 +859,7 @@ export function createConverter(uriConverter?: URIConverter): Converter { } function asFormattingOptions(options: code.FormattingOptions, fileOptions: FileFormattingOptions): proto.FormattingOptions { - const result: proto.FormattingOptions = { tabSize: options.tabSize, insertSpaces: options.insertSpaces }; + const result: proto.FormattingOptions = { ...options }; if (fileOptions.trimTrailingWhitespace) { result.trimTrailingWhitespace = true; } From 4811e9f61763d094d26aa51e14c9b3cdf6c6501a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20St=C3=B6hr?= Date: Wed, 28 Oct 2026 16:51:26 +0100 Subject: [PATCH 3/4] Fixed trailing newline --- client-node-tests/src/servers/testServer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-node-tests/src/servers/testServer.ts b/client-node-tests/src/servers/testServer.ts index cd9c9d853..19b530124 100644 --- a/client-node-tests/src/servers/testServer.ts +++ b/client-node-tests/src/servers/testServer.ts @@ -592,4 +592,4 @@ connection.onRequest( ); // Listen on the connection -connection.listen(); +connection.listen(); \ No newline at end of file From ba9057ec05ad88b0e5ca4d218cb8bbe2fbc8287a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20St=C3=B6hr?= Date: Fri, 30 Oct 2026 16:47:25 +0100 Subject: [PATCH 4/4] Fix test --- client-node-tests/src/integration.test.ts | 19 ++++++++++++------- client-node-tests/src/servers/testServer.ts | 13 +++++++++---- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/client-node-tests/src/integration.test.ts b/client-node-tests/src/integration.test.ts index e0b5e8b95..fd5e96ff7 100644 --- a/client-node-tests/src/integration.test.ts +++ b/client-node-tests/src/integration.test.ts @@ -904,15 +904,20 @@ suite('Client integration', () => { customSetting: 'customValue' }, tokenSource.token); isArray(result, vscode.TextEdit); - const options = await client.sendRequest( - new lsclient.ProtocolRequestType('testing/lastFormattingOptions'), - null, + const params = await client.sendRequest( + new lsclient.ProtocolRequestType('testing/lastFormattingRequest'), + {}, tokenSource.token ); - assert.strictEqual(options?.tabSize, 4); - assert.strictEqual(options?.insertSpaces, false); - assert.strictEqual(options?.trimTrailingWhitespace, true); - assert.strictEqual(options?.customSetting, 'customValue'); + assert.deepStrictEqual(params, { + textDocument: { uri: document.uri.toString() }, + options: { + tabSize: 4, + insertSpaces: false, + trimTrailingWhitespace: true, + customSetting: 'customValue' + } + }); }); test('Document Range Formatting', async () => { diff --git a/client-node-tests/src/servers/testServer.ts b/client-node-tests/src/servers/testServer.ts index 19b530124..c9bc5673a 100644 --- a/client-node-tests/src/servers/testServer.ts +++ b/client-node-tests/src/servers/testServer.ts @@ -11,7 +11,7 @@ import { ColorInformation, Color, ColorPresentation, FoldingRange, SelectionRange, SymbolKind, ProtocolRequestType, WorkDoneProgress, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, WorkDoneProgressCreateRequest, WillCreateFilesRequest, WillRenameFilesRequest, WillDeleteFilesRequest, DidDeleteFilesNotification, DidRenameFilesNotification, DidCreateFilesNotification, - ProposedFeatures, Diagnostic, DiagnosticSeverity, TypeHierarchyItem, InlayHint, InlayHintLabelPart, InlayHintKind, DocumentDiagnosticReportKind, DocumentSymbol, InlineCompletionItem, ApplyWorkspaceEditRequest, ApplyWorkspaceEditParams, FormattingOptions + ProposedFeatures, Diagnostic, DiagnosticSeverity, TypeHierarchyItem, InlayHint, InlayHintLabelPart, InlayHintKind, DocumentDiagnosticReportKind, DocumentSymbol, InlineCompletionItem, ApplyWorkspaceEditRequest, ApplyWorkspaceEditParams, DocumentFormattingParams } from 'vscode-languageserver/node'; import { URI } from 'vscode-uri'; @@ -265,15 +265,20 @@ connection.onCodeActionResolve((codeAction) => { return codeAction; }); -let lastFormattingOptions: FormattingOptions | undefined; +let lastFormattingRequest: DocumentFormattingParams | undefined; connection.onDocumentFormatting((params) => { - lastFormattingOptions = params.options; + lastFormattingRequest = params; return [ TextEdit.insert(Position.create(0, 0), 'insert') ]; }); -connection.onRequest(new ProtocolRequestType('testing/lastFormattingOptions'), () => lastFormattingOptions); +connection.onRequest( + new ProtocolRequestType('testing/lastFormattingRequest'), + () => { + return lastFormattingRequest; + }, +); connection.onDocumentRangeFormatting((_params) => { return [