This repository has been archived by the owner on Oct 7, 2020. It is now read-only.
[WIP] Use haskell-lsp with VFS race condition fix #1446
There are no files selected for viewing
This file contains 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 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 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 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 |
|---|---|---|
|
|
@@ -30,6 +30,7 @@ import qualified Data.ByteString.Lazy as BL | |
| import Data.Coerce (coerce) | ||
| import Data.Default | ||
| import Data.Foldable | ||
| import Data.List.NonEmpty ( nonEmpty ) | ||
| import qualified Data.Map as Map | ||
| import Data.Maybe | ||
| import Data.Semigroup (Semigroup(..), Option(..), option) | ||
|
|
@@ -219,8 +220,8 @@ mapFileFromVfs tn vtdi = do | |
| vfsFunc <- asksLspFuncs Core.getVirtualFileFunc | ||
| mvf <- liftIO $ vfsFunc (J.toNormalizedUri uri) | ||
| case (mvf, uriToFilePath uri) of | ||
| (Just (VFS.VirtualFile _ rope), Just fp) -> do | ||
| let text' = Rope.toString rope | ||
|
|
||
| -- text = "{-# LINE 1 \"" ++ fp ++ "\"#-}\n" <> text' | ||
| let req = GReq tn (Just uri) Nothing Nothing (const $ return ()) | ||
| $ IdeResultOk <$> do | ||
|
|
@@ -798,7 +799,7 @@ withDocumentContents reqId uri f = do | |
| (J.responseId reqId) | ||
| J.InvalidRequest | ||
| "Document was not open" | ||
| Just (VFS.VirtualFile _ txt) -> f (Rope.toText txt) | ||
|
|
||
|
|
||
| -- | Get the currently configured formatter provider. | ||
| -- The currently configured formatter provider is defined in @Config@ by PluginId. | ||
|
|
@@ -966,16 +967,34 @@ syncOptions = J.TextDocumentSyncOptions | |
| hieOptions :: [T.Text] -> Core.Options | ||
| hieOptions commandIds = | ||
| def { Core.textDocumentSync = Just syncOptions | ||
| -- The characters that trigger completion automatically. | ||
| , Core.completionTriggerCharacters = Just ['.'] | ||
|
|
||
| -- The list of all possible characters that commit a completion. This field can be used | ||
| -- if clients don't support individual commmit characters per completion item. See | ||
| -- `_commitCharactersSupport`. | ||
| -- , completionAllCommitCharacters :: Maybe [Char] | ||
|
|
||
| -- The characters that trigger signature help automatically. | ||
| -- , signatureHelpTriggerCharacters :: Maybe [Char] | ||
|
|
||
| -- List of characters that re-trigger signature help. | ||
| -- These trigger characters are only active when signature help is already showing. All trigger characters | ||
| -- are also counted as re-trigger characters. | ||
| -- , signatureHelpRetriggerCharacters :: Maybe [Char] | ||
|
|
||
| -- CodeActionKinds that this server may return. | ||
| -- The list of kinds may be generic, such as `CodeActionKind.Refactor`, or the server | ||
| -- may list out every specific kind they provide. | ||
| -- , codeActionKinds :: Maybe [J.CodeActionKind] | ||
|
|
||
| -- The list of characters that triggers on type formatting. | ||
| -- If you set `documentOnTypeFormattingHandler`, you **must** set this. | ||
| , Core.documentOnTypeFormattingTriggerCharacters = nonEmpty [] | ||
|
|
||
| -- The commands to be executed on the server. | ||
| -- If you set `executeCommandHandler`, you **must** set this. | ||
| , Core.executeCommandCommands = Just commandIds | ||
|
There was a problem hiding this comment. I am not sure if these are set up correctly, please provide input. There was a problem hiding this comment. I don't know either is this @bubba who changed it? There was a problem hiding this comment. I have a branch for these options, I'll apply it on top of this after this is merged /~https://github.com/bubba/haskell-ide-engine/tree/new-haskell-lsp-options |
||
| } | ||
|
|
||
|
|
||
|
|
||
This file contains 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 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 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 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 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 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 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 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 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
Submodule haskell-lsp
added at
ea1dba
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should make
VirtualFilemore abstract and provide an accessor to get the text out (I have this on my dejafu branch).