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
13 changes: 13 additions & 0 deletions src/apiManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class ApiManager {
private traceEventEmitter: Emitter<any> = new Emitter<any>();
private sourceInvalidatedEventEmitter: Emitter<SourceInvalidatedEvent> = new Emitter<SourceInvalidatedEvent>();
private serverReadyPromiseResolve: (result: boolean) => void;
private serverRunningPromiseResolve: (result: boolean) => void;

public initialize(requirements: RequirementsData, serverMode: ServerMode): void {
// if it's manual import mode, set the server mode to lightweight, so that the
Expand Down Expand Up @@ -57,6 +58,13 @@ class ApiManager {
return serverReadyPromise;
};

const serverRunningPromise: Promise<boolean> = new Promise<boolean>((resolve) => {
this.serverRunningPromiseResolve = resolve;
});
const serverRunning = async () => {
return serverRunningPromise;
};

this.api = {
apiVersion: extensionApiVersion,
javaRequirement: requirements,
Expand All @@ -73,6 +81,7 @@ class ApiManager {
onDidProjectsImport,
onDidProjectsDelete,
serverReady,
serverRunning,
onWillRequestStart,
onDidRequestEnd,
trackEvent: traceEvent,
Expand Down Expand Up @@ -123,6 +132,10 @@ class ApiManager {
public resolveServerReadyPromise(): void {
this.serverReadyPromiseResolve(true);
}

public resolveServerRunningPromise(): void {
this.serverRunningPromiseResolve?.(true);
}
}

export const apiManager: ApiManager = new ApiManager();
10 changes: 9 additions & 1 deletion src/extension.api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export interface SourceInvalidatedEvent {
affectedEditorDocuments?: Uri[];
}

export const extensionApiVersion = '0.13';
export const extensionApiVersion = '0.14';

export interface ExtensionAPI {
readonly apiVersion: string;
Expand Down Expand Up @@ -167,6 +167,14 @@ export interface ExtensionAPI {
*/
readonly serverReady: () => Promise<boolean>;

/**
* A promise that will be resolved when the language server process is running
* and can accept requests, even if project imports have not yet completed.
* This allows extensions to start querying for projects incrementally during import.
* @since API version 0.14
*/
readonly serverRunning?: () => Promise<boolean>;

/**
* An event that's fired when a request is about to send to language server.
* @since API version 0.12
Expand Down
3 changes: 3 additions & 0 deletions src/standardLanguageClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ export class StandardLanguageClient {
public registerLanguageClientActions(context: ExtensionContext, hasImported: boolean, jdtEventEmitter: EventEmitter<Uri>) {
activationProgressNotification.showProgress();
this.languageClient.onNotification(StatusNotification.type, (report) => {
// Resolve serverRunning on the first status notification from the server,
// indicating the server process is alive and can accept requests.
apiManager.resolveServerRunningPromise();
switch (report.type) {
case 'ServiceReady':
apiManager.updateServerMode(ServerMode.standard);
Expand Down
Loading