Skip to content
Merged
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
24 changes: 22 additions & 2 deletions src/standardLanguageClient.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
'use strict';

import { ExtensionContext, window, workspace, commands, Uri, ProgressLocation, ViewColumn, EventEmitter, extensions, Location, languages, CodeActionKind, CancellationToken } from "vscode";
import { ExtensionContext, window, workspace, commands, Uri, ProgressLocation, ViewColumn, EventEmitter, extensions, Location, languages, CodeActionKind, TextEditor, CancellationToken } from "vscode";
import { Commands } from "./commands";
import { serverStatus, ServerStatusKind } from "./serverStatus";
import { prepareExecutable, awaitServerConnection } from "./javaServerStarter";
import { getJavaConfig, applyWorkspaceEdit } from "./extension";
import { StreamInfo, LanguageClient, LanguageClientOptions, Position as LSPosition, Location as LSLocation, MessageType, TextDocumentPositionParams } from "vscode-languageclient";
import { StreamInfo, LanguageClient, LanguageClientOptions, Position as LSPosition, Location as LSLocation, MessageType, TextDocumentPositionParams, ConfigurationRequest, ConfigurationParams } from "vscode-languageclient";
import { CompileWorkspaceRequest, CompileWorkspaceStatus, SourceAttachmentRequest, SourceAttachmentResult, SourceAttachmentAttribute, ProjectConfigurationUpdateRequest, FeatureStatus, StatusNotification, ProgressReportNotification, ActionableNotification, ExecuteClientCommandRequest, ServerNotification, EventNotification, EventType, LinkLocation, FindLinks } from "./protocol";
import { setGradleWrapperChecksum, excludeProjectSettingsFiles, ServerMode } from "./settings";
import { onExtensionChange } from "./plugin";
Expand Down Expand Up @@ -175,6 +175,26 @@ export class StandardLanguageClient {
this.languageClient.onNotification(ServerNotification.type, (params) => {
commands.executeCommand(params.command, ...params.arguments);
});

this.languageClient.onRequest(ConfigurationRequest.type, (params: ConfigurationParams) => {
const result: any[] = [];
const activeEditor: TextEditor | undefined = window.activeTextEditor;
for (const item of params.items) {
const scopeUri: Uri | undefined = item.scopeUri && Uri.parse(item.scopeUri);
if (scopeUri && scopeUri.toString() === activeEditor?.document.uri.toString()) {
if (item.section === "java.format.insertSpaces") {
result.push(activeEditor.options.insertSpaces);
} else if (item.section === "java.format.tabSize") {
result.push(activeEditor.options.tabSize);
} else {
result.push(null);
}
} else {
result.push(workspace.getConfiguration(null, scopeUri).get(item.section, null /*defaultValue*/));
}
}
return result;
});
});

this.registerCommandsForStandardServer(context, jdtEventEmitter);
Expand Down