Merge branch 'master' into reimplement-shake

Author: pepeiborra

FUNDING.yml

@@ -0,0 +1 @@
+open_collective: haskell-language-server

README.md

@@ -773,6 +773,8 @@ it to look for the right executable.
 :heart: The Haskell tooling dream is near, we need your help! :heart:
 
 - Join [our IRC channel](https://web.libera.chat/?channels=#haskell-language-server) at `#haskell-language-server` on [`libera`](https://libera.chat/).
+- Follow the [Haskell IDE team twitter account](https://twitter.com/IdeHaskell) for updates and help.
+- Join the [#haskell-tooling channel](https://discord.com/channels/280033776820813825/505370075402862594/808027763868827659) in the Functional Programming discord server. You can join the server via [this invitation](https://discord.gg/9spEdTNGrD).
 
 ### Style guidelines
 
@@ -873,3 +875,7 @@ This will typically provide instructions for how to support new languages.
 
 In some cases you may need to write a small bit of additional client support, or expose a way for the user to set the server's [configuration options](#configuring-haskell-language-server) and
 for them to configure how the server is started.
+
+### Sponsorship
+
+If you want to contribute financially you can do so via [open-collective](https://opencollective.com/haskell-language-server). In the past the funding has been used to sponsor [summer student projects](https://mpickering.github.io/ide/posts/2021-07-22-summer-of-hls.html). 

cabal-ghc901.project

@@ -67,15 +67,6 @@ source-repository-package
   subdir: dependent-sum-template
 -- https://github.com/obsidiansystems/dependent-sum/pull/57
 
-source-repository-package
-  type: git
-  location: https://github.com/anka-213/lsp
-  tag: tag-ghc-9.0.1-without-pr-326
-  subdir: lsp-types
-  subdir: lsp
-  subdir: lsp-test
--- https://github.com/haskell/lsp/pull/312
-
 -- benchmark dependency
 source-repository-package
   type: git
@@ -84,7 +75,7 @@ source-repository-package
 
 write-ghc-environment-files: never
 
-index-state: 2021-07-14T20:31:09Z
+index-state: 2021-08-01T00:00:00Z
 
 constraints:
     -- These plugins doesn't work on GHC9 yet

cabal.project

@@ -37,7 +37,7 @@ source-repository-package
 
 write-ghc-environment-files: never
 
-index-state: 2021-07-14T20:31:09Z
+index-state: 2021-08-01T00:00:00Z
 
 constraints:
     -- Diagrams doesn't support optparse-applicative >= 0.16 yet
@@ -85,20 +85,3 @@ allow-newer:
     these:base,
     time-compat:base
 
-source-repository-package
-  type: git
-  location: https://github.com/haskell/lsp.git
-  tag: ef59c28b41ed4c5775f0ab0c1e985839359cec96
-  subdir: lsp-types
-
-source-repository-package
-  type: git
-  location: https://github.com/haskell/lsp.git
-  tag: ef59c28b41ed4c5775f0ab0c1e985839359cec96
-  subdir: lsp-test
-
-source-repository-package
-  type: git
-  location: https://github.com/haskell/lsp.git
-  tag: ef59c28b41ed4c5775f0ab0c1e985839359cec96
-  subdir: lsp

ghcide/bench/lib/Experiments.hs

@@ -36,7 +36,10 @@ import           Development.Shake               (CmdOption (Cwd, FileStdout),
                                                   cmd_)
 import           Experiments.Types
 import           Language.LSP.Test
-import           Language.LSP.Types
+import           Language.LSP.Types              hiding
+                                                 (SemanticTokenAbsolute (length, line),
+                                                  SemanticTokenRelative (length),
+                                                  SemanticTokensEdit (_start))
 import           Language.LSP.Types.Capabilities
 import           Numeric.Natural
 import           Options.Applicative

ghcide/src/Development/IDE/Core/PositionMapping.hs

@@ -30,7 +30,8 @@ import           Data.Bifunctor
 import           Data.List
 import qualified Data.Text           as T
 import qualified Data.Vector.Unboxed as V
-import           Language.LSP.Types
+import           Language.LSP.Types  (Position (Position), Range (Range),
+                                      TextDocumentContentChangeEvent (TextDocumentContentChangeEvent))
 
 -- | Either an exact position, or the range of text that was substituted
 data PositionResult a

ghcide/src/Development/IDE/LSP/Outline.hs

@@ -22,7 +22,13 @@ import           Development.IDE.GHC.Error      (rangeToRealSrcSpan,
                                                  realSrcSpanToRange)
 import           Development.IDE.Types.Location
 import           Language.LSP.Server            (LspM)
-import           Language.LSP.Types
+import           Language.LSP.Types             (DocumentSymbol (..),
+                                                 DocumentSymbolParams (DocumentSymbolParams, _textDocument),
+                                                 List (..), ResponseError,
+                                                 SymbolInformation,
+                                                 SymbolKind (SkConstructor, SkField, SkFile, SkFunction, SkInterface, SkMethod, SkModule, SkObject, SkStruct, SkTypeParameter, SkUnknown),
+                                                 TextDocumentIdentifier (TextDocumentIdentifier),
+                                                 type (|?) (InL), uriToFilePath)
 import           Outputable                     (Outputable, ppr,
                                                  showSDocUnsafe)
 

ghcide/src/Development/IDE/Plugin/CodeAction.hs

@@ -62,7 +62,20 @@ import           HscTypes                                          (ImportedMods
 import           Ide.PluginUtils                                   (subRange)
 import           Ide.Types
 import qualified Language.LSP.Server                               as LSP
-import           Language.LSP.Types
+import           Language.LSP.Types                                (CodeAction (..),
+                                                                    CodeActionContext (CodeActionContext, _diagnostics),
+                                                                    CodeActionKind (CodeActionQuickFix, CodeActionUnknown),
+                                                                    CodeActionParams (CodeActionParams),
+                                                                    Command,
+                                                                    Diagnostic (..),
+                                                                    List (..),
+                                                                    ResponseError,
+                                                                    SMethod (STextDocumentCodeAction),
+                                                                    TextDocumentIdentifier (TextDocumentIdentifier),
+                                                                    TextEdit (TextEdit),
+                                                                    WorkspaceEdit (WorkspaceEdit, _changeAnnotations, _changes, _documentChanges),
+                                                                    type (|?) (InR),
+                                                                    uriToFilePath)
 import           Language.LSP.VFS
 import           Module                                            (moduleEnvElts)
 import           OccName

ghcide/src/Development/IDE/Plugin/CodeAction/PositionIndexed.hs

@@ -12,7 +12,8 @@ where
 
 import           Data.Char
 import           Data.List
-import           Language.LSP.Types
+import           Language.LSP.Types (Position (Position),
+                                     Range (Range, _end, _start))
 
 type PositionIndexed a = [(Position, a)]
 

ghcide/src/Development/IDE/Spans/AtPoint.hs

@@ -206,7 +206,7 @@ atPoint IdeOptions{} (HAR _ hf _ _ kind) (DKMap dm km) df pos = listToMaybe $ po
     hoverInfo ast = (Just range, prettyNames ++ pTypes)
       where
         pTypes
-          | length names == 1 = dropEnd1 $ map wrapHaskell prettyTypes
+          | Prelude.length names == 1 = dropEnd1 $ map wrapHaskell prettyTypes
           | otherwise = map wrapHaskell prettyTypes
 
         range = realSrcSpanToRange $ nodeSpan ast