Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions client-node-tests/src/integration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -894,6 +894,32 @@ 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 params = await client.sendRequest(
new lsclient.ProtocolRequestType<any, any, never, any, any>('testing/lastFormattingRequest'),
{},
tokenSource.token
);
assert.deepStrictEqual(params, {
textDocument: { uri: document.uri.toString() },
options: {
tabSize: 4,
insertSpaces: false,
trimTrailingWhitespace: true,
customSetting: 'customValue'
}
});
});

test('Document Range Formatting', async () => {
const provider = client.getFeature(lsclient.DocumentRangeFormattingRequest.method).getProvider(document);
isDefined(provider);
Expand Down
13 changes: 11 additions & 2 deletions client-node-tests/src/servers/testServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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, DocumentFormattingParams
} from 'vscode-languageserver/node';

import { URI } from 'vscode-uri';
Expand Down Expand Up @@ -265,12 +265,21 @@ connection.onCodeActionResolve((codeAction) => {
return codeAction;
});

connection.onDocumentFormatting((_params) => {
let lastFormattingRequest: DocumentFormattingParams | undefined;
connection.onDocumentFormatting((params) => {
lastFormattingRequest = params;
return [
TextEdit.insert(Position.create(0, 0), 'insert')
];
});

connection.onRequest(
new ProtocolRequestType<null, unknown, never, any, any>('testing/lastFormattingRequest'),
() => {
return lastFormattingRequest;
},
);

connection.onDocumentRangeFormatting((_params) => {
return [
TextEdit.del(Range.create(1, 1, 1, 2))
Expand Down
2 changes: 1 addition & 1 deletion client/src/common/codeConverter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Loading