-
Notifications
You must be signed in to change notification settings - Fork 90
Consider user installed HLSes (e.g. via ghcup compile) #543
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.
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
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
a9195f4
Consider user installed HLSes (e.g. via ghcup compile)
hasufell 2c7fd41
Be more strict about PATH vs serverExecutablePath
hasufell 49b6dfe
Rework configuration setting and error handling
hasufell 484cd67
Make serverExecutablePATH override all other settings
hasufell 6ebfdef
Fix windows
hasufell 4493e48
Consider all ghcup installed/compile HLSes
hasufell 757c0d6
Cleanup and improve error handling
hasufell 1a9b77a
Format prettier
hasufell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
'use strict'; | ||
import * as path from 'path'; | ||
import { | ||
env, | ||
commands, | ||
ExtensionContext, | ||
OutputChannel, | ||
|
@@ -22,7 +23,7 @@ import { | |
import { CommandNames } from './commands/constants'; | ||
import { ImportIdentifier } from './commands/importIdentifier'; | ||
import { DocsBrowser } from './docsBrowser'; | ||
import { addPathToProcessPath, findHaskellLanguageServer, IEnvVars } from './hlsBinaries'; | ||
import { MissingToolError, addPathToProcessPath, findHaskellLanguageServer, IEnvVars } from './hlsBinaries'; | ||
import { expandHomeDir, ExtensionLogger } from './utils'; | ||
|
||
// The current map of documents & folders to language servers. | ||
|
@@ -153,7 +154,16 @@ async function activateServerForFolder(context: ExtensionContext, uri: Uri, fold | |
return; | ||
} | ||
} catch (e) { | ||
if (e instanceof Error) { | ||
if (e instanceof MissingToolError) { | ||
const link = e.installLink(); | ||
if (link) { | ||
if (await window.showErrorMessage(e.message, `Install ${e.tool}`)) { | ||
env.openExternal(link); | ||
} | ||
} else { | ||
await window.showErrorMessage(e.message); | ||
} | ||
} else if (e instanceof Error) { | ||
Comment on lines
+157
to
+166
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Here at the top-level of extension init we catch all promise errors and also restore the |
||
logger.error(`Error getting the server executable: ${e.message}`); | ||
window.showErrorMessage(e.message); | ||
} | ||
|
@@ -188,11 +198,11 @@ async function activateServerForFolder(context: ExtensionContext, uri: Uri, fold | |
|
||
let serverEnvironment: IEnvVars = workspace.getConfiguration('haskell', uri).serverEnvironment; | ||
if (addInternalServerPath !== undefined) { | ||
const newPath = addPathToProcessPath(addInternalServerPath); | ||
serverEnvironment = { | ||
PATH: newPath, | ||
... serverEnvironment | ||
}; | ||
const newPath = addPathToProcessPath(addInternalServerPath); | ||
serverEnvironment = { | ||
PATH: newPath, | ||
...serverEnvironment, | ||
}; | ||
} | ||
const exeOptions: ExecutableOptions = { | ||
cwd: folder ? undefined : path.dirname(uri.fsPath), | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.