Skip to content

Experimenting with the WIP multi ghcide branch #57

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 14 commits into from
Apr 7, 2020
Merged

Experimenting with the WIP multi ghcide branch #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
48a228f
WIP, prior to rebase for experimental
alanz Mar 21, 2020
08435a7
Experimental multi-component support
alanz Mar 21, 2020
b555a6e
Add prefix to built in ghcide command
alanz Mar 21, 2020
1aae2cf
ghcide code lens command now works
alanz Mar 22, 2020
aa17b82
Provide symbols from ghcide too
alanz Mar 22, 2020
4038c65
Update to same cabal-helper as hie
alanz Mar 23, 2020
c3eec94
Adapt to ghcide changes
alanz Mar 23, 2020
745f378
Update ghcide, use optThreads = 1
alanz Mar 23, 2020
7822586
Bump ghcide
alanz Mar 23, 2020
9ceea5b
Use ghcide wip/multi-rebased rebased on current master
alanz Mar 24, 2020
2fb1b91
Update to use latest multi-attempt on ghcide
alanz Mar 29, 2020
1456333
update stack yaml files
alanz Mar 29, 2020
add70e4
Update to use mpickering ghcide from wip/multi-rebase
alanz Apr 6, 2020
abcbdaa
Fix failing hls functional test
alanz Apr 7, 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
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
# rm -rf path_to_submodule
[submodule "ghcide"]
path = ghcide
url = https://github.com/digital-asset/ghcide.git
# url = https://github.com/alanz/ghcide.git
# url = https://github.com/digital-asset/ghcide.git
url = https://github.com/alanz/ghcide.git
4 changes: 3 additions & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ source-repository-package
tag: a18bbb2af92e9b4337e7f930cb80754f2408bcfd

tests: true
documentation: false
-- documentation: true

package haskell-language-server
test-show-details: direct
Expand All @@ -16,4 +18,4 @@ package ghcide

write-ghc-environment-files: never

index-state: 2020-03-03T21:14:55Z
index-state: 2020-03-24T21:15:10Z
394 changes: 331 additions & 63 deletions exe/Main.hs
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 0 additions & 34 deletions exe/RuleTypes.hs
View file
Open in desktop

This file was deleted.

164 changes: 0 additions & 164 deletions exe/Rules.hs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ghcide
Open in desktop
Submodule ghcide updated 47 files
+1 −1 .azure/linux-stack.yml
+2 −4 .azure/windows-stack.yml
+0 −25 .ghci
+2 −0 .hlint.yaml
+4 −0 README.md
+332 −50 exe/Main.hs
+0 −33 exe/RuleTypes.hs
+0 −161 exe/Rules.hs
+9 −0 exe/Utils.hs
+18 −6 ghcide.cabal
+10 −1 hie.yaml
+19 −0 src/Development/IDE/Compat.hs
+219 −65 src/Development/IDE/Core/Compile.hs
+4 −29 src/Development/IDE/Core/FileExists.hs
+14 −5 src/Development/IDE/Core/Preprocessor.hs
+52 −0 src/Development/IDE/Core/RuleTypes.hs
+259 −71 src/Development/IDE/Core/Rules.hs
+4 −4 src/Development/IDE/Core/Shake.hs
+116 −18 src/Development/IDE/GHC/Compat.hs
+5 −3 src/Development/IDE/GHC/Error.hs
+1,789 −0 src/Development/IDE/GHC/HieAst.hs
+6 −3 src/Development/IDE/GHC/Orphans.hs
+69 −20 src/Development/IDE/GHC/Util.hs
+30 −0 src/Development/IDE/GHC/WithDynFlags.hs
+35 −2 src/Development/IDE/Import/DependencyInformation.hs
+18 −12 src/Development/IDE/Import/FindImports.hs
+1 −1 src/Development/IDE/LSP/HoverDefinition.hs
+2 −2 src/Development/IDE/LSP/Notifications.hs
+3 −1 src/Development/IDE/LSP/Outline.hs
+24 −1 src/Development/IDE/Plugin.hs
+19 −5 src/Development/IDE/Plugin/CodeAction.hs
+14 −3 src/Development/IDE/Plugin/Completions.hs
+8 −8 src/Development/IDE/Plugin/Completions/Logic.hs
+4 −5 src/Development/IDE/Spans/AtPoint.hs
+19 −10 src/Development/IDE/Spans/Calculate.hs
+15 −5 src/Development/IDE/Types/Diagnostics.hs
+24 −116 src/Development/IDE/Types/Location.hs
+3 −0 src/Development/IDE/Types/Options.hs
+4 −3 stack-ghc-lib.yaml
+4 −3 stack.yaml
+5 −3 stack84.yaml
+5 −0 stack88.yaml
+3 −0 test/data/Bar.hs
+5 −0 test/data/Foo.hs
+7 −0 test/data/GotoHover.hs
+143 −96 test/exe/Main.hs
+25 −2 test/src/Development/IDE/Test.hs
8 changes: 4 additions & 4 deletions haskell-language-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ source-repository head

library
exposed-modules:
Ide.Compat
Ide.Cradle
Ide.Logger
Ide.Plugin
Expand Down Expand Up @@ -63,7 +62,7 @@ library
, ghcide >= 0.1
, gitrev
, hashable
, haskell-lsp == 0.20.*
, haskell-lsp == 0.21.*
, hie-bios >= 0.4
, hslogger
, lens
Expand Down Expand Up @@ -97,8 +96,6 @@ executable haskell-language-server
other-modules:
Arguments
Paths_haskell_language_server
Rules
RuleTypes
autogen-modules:
Paths_haskell_language_server
ghc-options:
Expand All @@ -125,6 +122,7 @@ executable haskell-language-server
, containers
, data-default
, deepseq
, directory
, extra
, filepath
--------------------------------------------------------------
Expand All @@ -135,6 +133,7 @@ executable haskell-language-server
-- which works for now.
, ghc
--------------------------------------------------------------
, ghc-check
, ghc-paths
, ghcide
, gitrev
Expand All @@ -146,6 +145,7 @@ executable haskell-language-server
, optparse-applicative
, shake >= 0.17.5
, text
, time
, unordered-containers
default-language: Haskell2010

Expand Down
19 changes: 0 additions & 19 deletions src/Ide/Compat.hs
View file
Open in desktop

This file was deleted.

Loading