Skip to content

Fix: bspProxy start sequence #1563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdneo merged 1 commit into from
Aug 7, 2024
Merged

Fix: bspProxy start sequence #1563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 1 addition & 8 deletions extension/src/Extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@ import { instrumentOperation, sendInfo } from "vscode-extension-telemetry-wrappe
import { GradleBuildContentProvider } from "./client/GradleBuildContentProvider";
import { BuildServerController } from "./bs/BuildServerController";
import { GradleTestRunner } from "./bs/GradleTestRunner";
import { BspProxy } from "./bs/BspProxy";

export class Extension {
private readonly bspProxy: BspProxy;
private readonly taskServerClient: TaskServerClient;
private readonly server: GradleServer;
private readonly pinnedTasksStore: PinnedTasksStore;
Expand Down Expand Up @@ -81,16 +79,12 @@ export class Extension {
const serverLogger = new Logger("gradle-server");
serverLogger.setLoggingChannel(loggingChannel);

const bspLogger = new Logger("bspProxy");
bspLogger.setLoggingChannel(loggingChannel);

if (getConfigIsDebugEnabled()) {
Logger.setLogVerbosity(LogVerbosity.DEBUG);
}

const statusBarItem = vscode.window.createStatusBarItem();
this.bspProxy = new BspProxy(this.context, bspLogger);
this.server = new GradleServer({ host: "localhost" }, context, serverLogger, this.bspProxy);
this.server = new GradleServer({ host: "localhost" }, context, serverLogger);
this.taskServerClient = new TaskServerClient(this.server, statusBarItem, clientLogger);
this.pinnedTasksStore = new PinnedTasksStore(context);
this.recentTasksStore = new RecentTasksStore();
Expand Down Expand Up @@ -265,7 +259,6 @@ export class Extension {
}
await vscode.commands.executeCommand("setContext", "gradle:activated", activated);
await vscode.commands.executeCommand("setContext", "gradle:defaultView", true);
await this.bspProxy.start();
}

private registerCommands(): void {
Expand Down
7 changes: 4 additions & 3 deletions extension/src/server/GradleServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@ export class GradleServer {
public readonly onDidStop: vscode.Event<null> = this._onDidStop.event;
private process?: cp.ChildProcessWithoutNullStreams;
private languageServerPipePath: string;
private bspProxy: BspProxy;

constructor(
private readonly opts: ServerOptions,
private readonly context: vscode.ExtensionContext,
private readonly logger: Logger,
private bspProxy: BspProxy
private readonly logger: Logger
) {
this.setLanguageServerPipePath();
this.bspProxy = new BspProxy(this.context, logger);
}

private setLanguageServerPipePath(): void {
Expand All @@ -59,7 +60,7 @@ export class GradleServer {
}
}
this.bspProxy.setBuildServerStarted(startBuildServer);

this.bspProxy.start();
this.taskServerPort = await getPort();
const cwd = this.context.asAbsolutePath("lib");
const cmd = path.join(cwd, getGradleServerCommand());
Expand Down