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
2 changes: 1 addition & 1 deletion src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ async function startStandardServer(context: ExtensionContext, requirements: requ
apiManager.getApiInstance().serverMode = ServerMode.HYBRID;
apiManager.fireDidServerModeChange(ServerMode.HYBRID);
}
standardClient.initialize(context, requirements, clientOptions, workspacePath, jdtEventEmitter, resolve);
await standardClient.initialize(context, requirements, clientOptions, workspacePath, jdtEventEmitter, resolve);
standardClient.start();
serverStatusBarProvider.showStandardStatus();
}
Expand Down
9 changes: 7 additions & 2 deletions src/standardLanguageClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { onExtensionChange, collectBuildFilePattern } from "./plugin";
import { activationProgressNotification, serverTaskPresenter } from "./serverTaskPresenter";
import { RequirementsData } from "./requirements";
import * as net from 'net';
import * as fse from 'fs-extra';
import * as path from 'path';
import { getJavaConfiguration } from "./utils";
import { logger } from "./log";
Expand Down Expand Up @@ -40,11 +41,13 @@ export class StandardLanguageClient {
private languageClient: LanguageClient;
private status: ClientStatus = ClientStatus.Uninitialized;

public initialize(context: ExtensionContext, requirements: RequirementsData, clientOptions: LanguageClientOptions, workspacePath: string, jdtEventEmitter: EventEmitter<Uri>, resolve: (value: ExtensionAPI) => void): void {
public async initialize(context: ExtensionContext, requirements: RequirementsData, clientOptions: LanguageClientOptions, workspacePath: string, jdtEventEmitter: EventEmitter<Uri>, resolve: (value: ExtensionAPI) => void): Promise<void> {
if (this.status !== ClientStatus.Uninitialized) {
return;
}

const hasImported: boolean = await fse.pathExists(path.join(workspacePath, ".metadata", ".plugins"));

if (workspace.getConfiguration().get("java.showBuildStatusOnStart.enabled") === "terminal") {
commands.executeCommand(Commands.SHOW_SERVER_TASK_STATUS);
}
Expand Down Expand Up @@ -97,7 +100,9 @@ export class StandardLanguageClient {
apiManager.updateServerMode(ServerMode.STANDARD);
apiManager.fireDidServerModeChange(ServerMode.STANDARD);
activationProgressNotification.hide();
showImportFinishNotification(context);
if (!hasImported) {
showImportFinishNotification(context);
}
break;
case 'Started':
this.status = ClientStatus.Started;
Expand Down