Skip to content

Allow the server to be launched on standalone .hs files #235

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
merged 2 commits into from
Jun 14, 2020
Merged

Allow the server to be launched on standalone .hs files #235

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d67adc
Allow the server to be launched on standalone .hs files
lukel97 Jun 12, 2020
35188d8
Use the conventional language name
lukel97 Jun 12, 2020
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: 18 additions & 16 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,8 @@ async function activateHie(context: ExtensionContext, document: TextDocument) {

const uri = document.uri;
const folder = workspace.getWorkspaceFolder(uri);
// Don't handle files outside of a folder.
if (!folder) {
return;
}
// If the client already has an LSP server, then don't start a new one.
if (clients.has(folder.uri.toString())) {
// If the client already has an LSP server for this folder, then don't start a new one.
if (folder && clients.has(folder.uri.toString())) {
return;
}

Expand Down Expand Up @@ -98,18 +94,18 @@ async function activateHie(context: ExtensionContext, document: TextDocument) {
const forceStart: string = 'Force Start';
window.showErrorMessage(notInstalledMsg, forceStart).then(option => {
if (option === forceStart) {
activateHieNoCheck(context, folder, uri);
activateHieNoCheck(context, uri, folder);
}
});
} else {
activateHieNoCheck(context, folder, uri);
activateHieNoCheck(context, uri, folder);
}
} catch (e) {
console.error(e);
}
}

function activateHieNoCheck(context: ExtensionContext, folder: WorkspaceFolder, uri: Uri) {
function activateHieNoCheck(context: ExtensionContext, uri: Uri, folder?: WorkspaceFolder) {
// Stop right here, if HIE is disabled in the resource/workspace folder.
const enableHIE = workspace.getConfiguration('languageServerHaskell', uri).enableHIE;
if (!enableHIE) {
Expand All @@ -131,11 +127,14 @@ function activateHieNoCheck(context: ExtensionContext, folder: WorkspaceFolder,
// Substitute path variables with their corresponding locations.
if (hieExecutablePath !== '') {
hieExecutablePath = hieExecutablePath
.replace('${workspaceFolder}', folder.uri.path)
.replace('${workspaceRoot}', folder.uri.path)
.replace('${HOME}', os.homedir)
.replace('${home}', os.homedir)
.replace(/^~/, os.homedir);
if (folder) {
hieExecutablePath = hieExecutablePath
.replace('${workspaceFolder}', folder.uri.path)
.replace('${workspaceRoot}', folder.uri.path);
}
}

// Set the executable, based on the settings.
Expand Down Expand Up @@ -181,16 +180,17 @@ function activateHieNoCheck(context: ExtensionContext, folder: WorkspaceFolder,
};

// Set a unique name per workspace folder (useful for multi-root workspaces).
const langName = 'Haskell HIE (' + folder.name + ')';
const langName = 'Haskell' + (folder ? ` ( ${folder.name} )` : '');
const outputChannel: OutputChannel = window.createOutputChannel(langName);
outputChannel.appendLine('[client] run command = "' + serverPath + ' ' + runArgs.join(' ') + '"');
outputChannel.appendLine('[client] debug command = "' + serverPath + ' ' + debugArgs.join(' ') + '"');
const pat = folder ? `${folder.uri.fsPath}/**/*` : '**/*';
const clientOptions: LanguageClientOptions = {
// Use the document selector to only notify the LSP on files inside the folder
// path for the specific workspace.
documentSelector: [
{ scheme: 'file', language: 'haskell', pattern: `${folder.uri.fsPath}/**/*` },
{ scheme: 'file', language: 'literate haskell', pattern: `${folder.uri.fsPath}/**/*` }
{ scheme: 'file', language: 'haskell', pattern: pat },
{ scheme: 'file', language: 'literate haskell', pattern: pat }
],
synchronize: {
// Synchronize the setting section 'languageServerHaskell' to the server.
Expand Down Expand Up @@ -238,13 +238,15 @@ function activateHieNoCheck(context: ExtensionContext, folder: WorkspaceFolder,

// If the client already has an LSP server, then don't start a new one.
// We check this again, as there may be multiple parallel requests.
if (clients.has(folder.uri.toString())) {
if (folder && clients.has(folder.uri.toString())) {
return;
}

// Finally start the client and add it to the list of clients.
langClient.start();
clients.set(folder.uri.toString(), langClient);
if (folder) {
clients.set(folder.uri.toString(), langClient);
}
}

/*
Expand Down