Skip to content
Open
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
14 changes: 10 additions & 4 deletions src/fileEventHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import * as stringInterpolate from 'fmtr';
import { apiManager } from './apiManager';

let serverReady: boolean = false;
type LanguageClientProvider = LanguageClient | (() => LanguageClient);

const BRACE_POSITION_KEY = "org.eclipse.jdt.core.formatter.brace_position_for_type_declaration";
const END_OF_LINE = "end_of_line";
Expand All @@ -24,7 +25,7 @@ export function setServerStatus(ready: boolean) {
serverReady = ready;
}

export function registerFileEventHandlers(client: LanguageClient, context: ExtensionContext) {
export function registerFileEventHandlers(client: LanguageClientProvider, context: ExtensionContext) {
if (workspace.onDidCreateFiles) {// Theia doesn't support workspace.onDidCreateFiles yet
context.subscriptions.push(workspace.onDidCreateFiles(handleNewJavaFiles));
}
Expand Down Expand Up @@ -188,7 +189,11 @@ async function handleNewJavaFiles(e: FileCreateEvent) {
}, 100);
}

function getWillRenameHandler(client: LanguageClient) {
function getLanguageClient(client: LanguageClientProvider): LanguageClient {
return typeof client === 'function' ? client() : client;
}

function getWillRenameHandler(client: LanguageClientProvider) {
return function handleWillRenameFiles(e: FileWillRenameEvent): void {
if (!serverReady) {
return;
Expand All @@ -213,10 +218,11 @@ function getWillRenameHandler(client: LanguageClient) {
return;
}

const edit = await client.sendRequest(WillRenameFiles.type, {
const languageClient = getLanguageClient(client);
const edit = await languageClient.sendRequest(WillRenameFiles.type, {
files: javaRenameEvents
});
resolve(await client.protocol2CodeConverter.asWorkspaceEdit(edit));
resolve(await languageClient.protocol2CodeConverter.asWorkspaceEdit(edit));
} catch (ex) {
reject(ex);
}
Expand Down
32 changes: 26 additions & 6 deletions src/standardLanguageClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as net from 'net';
import * as path from 'path';
import { CancellationToken, CodeActionKind, commands, ConfigurationTarget, DocumentSelector, EventEmitter, ExtensionContext, extensions, languages, Location, ProgressLocation, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceConfiguration } from "vscode";
import { ConfigurationParams, ConfigurationRequest, LanguageClientOptions, Location as LSLocation, MessageType, Position as LSPosition, TextDocumentPositionParams, WorkspaceEdit, StaticFeature, ClientCapabilities, FeatureState, TelemetryEventNotification } from "vscode-languageclient";
import { LanguageClient, StreamInfo } from "vscode-languageclient/node";
import { LanguageClient, ServerOptions, StreamInfo } from "vscode-languageclient/node";
import { apiManager } from "./apiManager";
import * as buildPath from './buildpath';
import { javaRefactorKinds, RefactorDocumentProvider } from "./codeActionProvider";
Expand Down Expand Up @@ -42,6 +42,7 @@ import { listJdks, sortJdksBySource, sortJdksByVersion } from './jdkUtils';
import { ClientCodeActionProvider } from './clientCodeActionProvider';
import { BuildFileSelector } from './buildFilesSelector';
import { extendedOutlineQuickPick } from "./outline/extendedOutlineQuickPick";
import { startWithStdioFallback } from './standardLanguageClientStart';

const extensionName = 'Language Support for Java';
const GRADLE_CHECKSUM = "gradle/checksum/prompt";
Expand All @@ -50,6 +51,7 @@ const USE_JAVA = "Use Java ";
const AS_GRADLE_JVM = " as Gradle JVM";
const UPGRADE_GRADLE = "Upgrade Gradle to ";
const GRADLE_IMPORT_JVM = "java.import.gradle.java.home";
const PIPE_START_TIMEOUT_MS = 30000;
export const JAVA_SELECTOR: DocumentSelector = [
{ scheme: "file", language: "java", pattern: "**/*.java" },
{ scheme: "jdt", language: "java", pattern: "**/*.class" },
Expand All @@ -59,6 +61,8 @@ export const JAVA_SELECTOR: DocumentSelector = [
export class StandardLanguageClient {

private languageClient: LanguageClient;
private serverOptions: ServerOptions;
private clientOptions: LanguageClientOptions;
private status: ClientStatus = ClientStatus.uninitialized;

public async initialize(context: ExtensionContext, requirements: RequirementsData, clientOptions: LanguageClientOptions, workspacePath: string, jdtEventEmitter: EventEmitter<Uri>): Promise<void> {
Expand All @@ -85,7 +89,7 @@ export class StandardLanguageClient {
}
});

let serverOptions;
let serverOptions: ServerOptions;
const port = process.env['JDTLS_SERVER_PORT'];
if (!port) {
const lsPort = process.env['JDTLS_CLIENT_PORT'];
Expand All @@ -105,19 +109,26 @@ export class StandardLanguageClient {
// used during development
serverOptions = awaitServerConnection.bind(null, port);
}
this.serverOptions = serverOptions;
this.clientOptions = clientOptions;

// Create the language client and start the client.
this.languageClient = new TracingLanguageClient('java', extensionName, serverOptions, clientOptions, DEBUG);
this.languageClient.registerFeature(new DisableWillRenameFeature());
this.languageClient = this.createLanguageClient(serverOptions, clientOptions);

this.registerCommandsForStandardServer(context, jdtEventEmitter);
fileEventHandler.registerFileEventHandlers(this.languageClient, context);
fileEventHandler.registerFileEventHandlers(() => this.languageClient, context);

collectBuildFilePattern(extensions.all);

this.status = ClientStatus.initialized;
}

private createLanguageClient(serverOptions: ServerOptions, clientOptions: LanguageClientOptions): LanguageClient {
const languageClient = new TracingLanguageClient('java', extensionName, serverOptions, clientOptions, DEBUG);
languageClient.registerFeature(new DisableWillRenameFeature());
return languageClient;
}

public registerLanguageClientActions(context: ExtensionContext, hasImported: boolean, jdtEventEmitter: EventEmitter<Uri>) {
activationProgressNotification.showProgress();
this.languageClient.onNotification(StatusNotification.type, (report) => {
Expand Down Expand Up @@ -770,7 +781,16 @@ export class StandardLanguageClient {
public start(): Promise<void> {
if (this.languageClient && this.status === ClientStatus.initialized) {
this.status = ClientStatus.starting;
return this.languageClient.start();
return startWithStdioFallback({
languageClient: this.languageClient,
serverOptions: this.serverOptions,
createLanguageClient: (serverOptions) => this.createLanguageClient(serverOptions, this.clientOptions),
pipeStartTimeout: PIPE_START_TIMEOUT_MS,
onFallback: (error) => logger.warn(`Falling back to 'stdio' (from 'pipe') because starting the pipe transport failed: ${error}`),
}).then(result => {
this.languageClient = result.client;
this.serverOptions = result.serverOptions;
});
}
}

Expand Down
66 changes: 66 additions & 0 deletions src/standardLanguageClientStart.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import { Executable, ServerOptions, TransportKind } from "vscode-languageclient/node";

export interface StartableLanguageClient {
start(): Promise<void>;
}

export interface StartWithStdioFallbackOptions<T extends StartableLanguageClient> {
languageClient: T;
serverOptions: ServerOptions;
createLanguageClient(serverOptions: Executable): T;
pipeStartTimeout: number;
onFallback?(error: any): void;
}

class PipeStartTimeoutError extends Error {
}

export async function startWithStdioFallback<T extends StartableLanguageClient>(options: StartWithStdioFallbackOptions<T>): Promise<{ client: T; serverOptions: ServerOptions }> {
if (!isPipeExecutable(options.serverOptions)) {
await options.languageClient.start();
return { client: options.languageClient, serverOptions: options.serverOptions };
}

try {
await startWithTimeout(options.languageClient, options.pipeStartTimeout);
return { client: options.languageClient, serverOptions: options.serverOptions };
} catch (error) {
if (!(error instanceof PipeStartTimeoutError)) {
throw error;
}
options.onFallback?.(error);
const stdioServerOptions = createStdioServerOptions(options.serverOptions);
const stdioClient = options.createLanguageClient(stdioServerOptions);
await stdioClient.start();
return { client: stdioClient, serverOptions: stdioServerOptions };
}
}

async function startWithTimeout(client: StartableLanguageClient, timeout: number): Promise<void> {
let timeoutHandle: NodeJS.Timeout | undefined;
try {
await Promise.race([
client.start(),
new Promise<void>((_resolve, reject) => {
timeoutHandle = setTimeout(() => reject(new PipeStartTimeoutError(`Starting pipe transport timed out after ${timeout}ms.`)), timeout);
})
]);
} finally {
if (timeoutHandle) {
clearTimeout(timeoutHandle);
}
}
}

function isPipeExecutable(serverOptions: ServerOptions): serverOptions is Executable {
return !!serverOptions && typeof (serverOptions as Executable).command === 'string' && (serverOptions as Executable).transport === TransportKind.pipe;
}

function createStdioServerOptions(serverOptions: Executable): Executable {
return {
...serverOptions,
args: serverOptions.args?.slice(),
options: serverOptions.options ? { ...serverOptions.options } : undefined,
transport: TransportKind.stdio,
};
}
83 changes: 83 additions & 0 deletions test/standard-mode-suite/standardLanguageClient.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
'use strict';

import * as assert from 'assert';
import { Executable, TransportKind } from 'vscode-languageclient/node';
import { startWithStdioFallback, StartableLanguageClient } from '../../src/standardLanguageClientStart';

class TestLanguageClient implements StartableLanguageClient {
public startCount = 0;

constructor(private readonly startResult: Promise<void>) {
}

public start(): Promise<void> {
this.startCount++;
return this.startResult;
}
}

suite('Standard Language Client Test', () => {

test('startWithStdioFallback() - does not fall back when pipe start rejects', async () => {
const pipeClient = new TestLanguageClient(Promise.reject(new Error('pipe failed')));
const stdioClient = new TestLanguageClient(Promise.resolve());
const pipeOptions = createServerOptions(TransportKind.pipe);
let fallbackOptions: Executable | undefined;

await assert.rejects(startWithStdioFallback({
languageClient: pipeClient,
serverOptions: pipeOptions,
createLanguageClient: serverOptions => {
fallbackOptions = serverOptions;
return stdioClient;
},
pipeStartTimeout: 1000,
}), /pipe failed/);

assert.equal(pipeClient.startCount, 1);
assert.equal(stdioClient.startCount, 0);
assert.equal(fallbackOptions, undefined);
});

test('startWithStdioFallback() - falls back when pipe start times out', async () => {
const pipeClient = new TestLanguageClient(new Promise<void>(() => { /* never resolves */ }));
const stdioClient = new TestLanguageClient(Promise.resolve());
let fallbackError: any;

const result = await startWithStdioFallback({
languageClient: pipeClient,
serverOptions: createServerOptions(TransportKind.pipe),
createLanguageClient: () => stdioClient,
pipeStartTimeout: 1,
onFallback: error => fallbackError = error,
});

assert.equal(pipeClient.startCount, 1);
assert.equal(stdioClient.startCount, 1);
assert.equal(result.client, stdioClient);
assert.equal((result.serverOptions as Executable).transport, TransportKind.stdio);
assert.ok(String(fallbackError).includes('timed out'));
});

test('startWithStdioFallback() - does not fall back for stdio start failures', async () => {
const stdioClient = new TestLanguageClient(Promise.reject(new Error('stdio failed')));

await assert.rejects(startWithStdioFallback({
languageClient: stdioClient,
serverOptions: createServerOptions(TransportKind.stdio),
createLanguageClient: () => new TestLanguageClient(Promise.resolve()),
pipeStartTimeout: 1,
}), /stdio failed/);

assert.equal(stdioClient.startCount, 1);
});
});

function createServerOptions(transport: TransportKind): Executable {
return {
command: 'java',
args: ['-version'],
options: { env: { test: 'true' } },
transport,
};
}
Loading