Skip to content

#2906 Refactor activate() #4434

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

Open
MeherSru wants to merge 1 commit into
base: main
Choose a base branch
from
+37 −15
Open

#2906 Refactor activate() #4434

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
52 changes: 37 additions & 15 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,11 @@ export async function activate(context: ExtensionContext): Promise<ExtensionAPI>
}
}

return requirements.resolveRequirements(context).catch(error => {
let requirementsData: requirements.RequirementsData;

try {
requirementsData = await requirements.resolveRequirements(context);
} catch (error) {

@datho7561 datho7561 Jun 23, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The indentation from here to the end of the method is at different levels; could you please reformat it to be consistent?

// show error
window.showErrorMessage(error.message, error.label).then((selection) => {
if (error.label && error.label === selection && error.command) {
Expand All @@ -204,9 +208,8 @@ export async function activate(context: ExtensionContext): Promise<ExtensionAPI>
});
// rethrow to disrupt the chain.
throw error;
}).then(async (requirements) => {
}
const triggerFiles = await getTriggerFiles();
return new Promise<ExtensionAPI>(async (resolve) => {
const syntaxServerWorkspacePath = path.resolve(`${storagePath}/ss_ws`);

let serverMode = getJavaServerMode();
Expand All @@ -217,10 +220,10 @@ export async function activate(context: ExtensionContext): Promise<ExtensionAPI>
commands.executeCommand('setContext', 'java:serverMode', serverMode);
const isDebugModeByClientPort = !!process.env['SYNTAXLS_CLIENT_PORT'] || !!process.env['JDTLS_CLIENT_PORT'];
const requireSyntaxServer = (serverMode !== ServerMode.standard) && (!isDebugModeByClientPort || !!process.env['SYNTAXLS_CLIENT_PORT']);
let requireStandardServer = (serverMode !== ServerMode.lightWeight) && (!isDebugModeByClientPort || !!process.env['JDTLS_CLIENT_PORT']);
const requireStandardServer = (serverMode !== ServerMode.lightWeight) && (!isDebugModeByClientPort || !!process.env['JDTLS_CLIENT_PORT']);
let initFailureReported: boolean = false;

const javaConfig = await getJavaConfig(requirements.java_home);
const javaConfig = await getJavaConfig(requirementsData.java_home);
javaConfigDeferred.resolve(javaConfig);

// Options to control the language client
Expand Down Expand Up @@ -274,7 +277,7 @@ export async function activate(context: ExtensionContext): Promise<ExtensionAPI>
didChangeConfiguration: async () => {
await standardClient.getClient().sendNotification(DidChangeConfigurationNotification.type, {
settings: {
java: await getJavaConfig(requirements.java_home),
java: await getJavaConfig(requirementsData.java_home),
}
});
}
Expand Down Expand Up @@ -424,13 +427,35 @@ export async function activate(context: ExtensionContext): Promise<ExtensionAPI>
outputChannelName: extensionName
};

apiManager.initialize(requirements, serverMode);
apiManager.initialize(requirementsData, serverMode);
registerCodeCompletionTelemetryListener();
resolve(apiManager.getApiInstance());
// the promise is resolved
// no need to pass `resolve` into any code past this point,
// since `resolve` is a no-op from now on
if (requireSyntaxServer) {
void postExtensionStartInit(
context,
requirementsData,
clientOptions,
workspacePath,
syntaxServerWorkspacePath,
serverMode,
requireSyntaxServer,
requireStandardServer,
cleanWorkspaceExists
);

return apiManager.getApiInstance();
}

async function postExtensionStartInit(
context: ExtensionContext,
requirements: requirements.RequirementsData,
clientOptions: LanguageClientOptions,
workspacePath: string,
syntaxServerWorkspacePath: string,
serverMode: ServerMode,
requireSyntaxServer: boolean,
requireStandardServer: boolean,
cleanWorkspaceExists: boolean
): Promise<void> {
if (requireSyntaxServer) {
const serverOptions = prepareExecutable(requirements, syntaxServerWorkspacePath, context, true);

@datho7561 datho7561 Jun 23, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment about reformatting but for this method

excutable.resolve(serverOptions);
if (process.env['SYNTAXLS_CLIENT_PORT']) {
Expand Down Expand Up @@ -699,10 +724,7 @@ export async function activate(context: ExtensionContext): Promise<ExtensionAPI>
}));
}
context.subscriptions.push(workspace.onDidChangeTextDocument(event => handleTextDocumentChanges(event.document, event.contentChanges)));
});
});
}

async function startStandardServer(context: ExtensionContext, requirements: requirements.RequirementsData, clientOptions: LanguageClientOptions, workspacePath: string, triggeredByCommand: boolean = false) {
if (standardClient.getClientStatus() !== ClientStatus.uninitialized) {
return;
Expand Down
Loading