Skip to content

fix: Refactor moon installation detection logic #95

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
milesj merged 1 commit into from
Mar 26, 2026
+23 −11
Merged

fix: Refactor moon installation detection logic #95

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
34 changes: 23 additions & 11 deletions packages/vscode-extension/src/workspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,32 +107,45 @@ export class Workspace {

if (workspaceFolder) {
this.folder = workspaceFolder;

this.logger.appendLine(`Found workspace folder ${workspaceFolder.uri.fsPath}`);
this.logger.appendLine('Attempting to find a moon installation');

const rootPrefixes = vscode.workspace
.getConfiguration('moon')
.get('rootPrefixes', [] as string[]);

// Always include "." at the end
rootPrefixes.push('.');

let foundRoot = false;

for (const prefix of rootPrefixes) {
const moonDir = path.join(workspaceFolder.uri.fsPath, prefix, '.moon');
// Moon v1: <workspace>/.moon
const v1Path = path.join(workspaceFolder.uri.fsPath, prefix, '.moon');

// Moon v2: <workspace>/.config/moon
const v2Path = path.join(workspaceFolder.uri.fsPath, prefix, '.config', 'moon');

const candidateDirs = [v1Path, v2Path];

if (fs.existsSync(moonDir)) {
this.root = path.dirname(moonDir);
this.rootPrefix = prefix;
this.binPath = this.findMoonBin();
for (const moonDir of candidateDirs) {
if (fs.existsSync(moonDir)) {
this.root = path.dirname(moonDir);
this.rootPrefix = prefix;
this.binPath = this.findMoonBin();

this.logger.appendLine(`Found moon workspace root at ${this.root}`);
this.logger.appendLine(`Found moon workspace root at ${this.root}`);

if (this.binPath) {
this.logger.appendLine(`Found moon binary at ${this.binPath}`);
if (this.binPath) {
this.logger.appendLine(`Found moon binary at ${this.binPath}`);
}

foundRoot = true;
break;
}
}

foundRoot = true;
if (foundRoot) {
break;
}
}
Expand All @@ -148,7 +161,6 @@ export class Workspace {

// Update context
void vscode.commands.executeCommand('setContext', 'moon.inWorkspaceRoot', this.root !== null);

void vscode.commands.executeCommand(
'setContext',
'moon.hasBinary',
Expand Down
Loading