Merge branch 'alternate-number-format' of github.com:drsooch/haskell-language-server into alternate-number-format

Author: drsooch

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,57 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'status: needs triage, type: bug'
+assignees: ''
+
+---
+
+<!--
+Before opening an issue, please take a look at the [troubleshooting guide](https://haskell-language-server.readthedocs.io/en/latest/troubleshooting.html). This explains some common issues and will also help you to find the information that the issue template asks for.
+
+When filing an issue, please fill out as much of the information below as you can. This helps us to debug your issue, but is not required!
+-->
+
+### Your environment
+
+Which OS do you use:
+<!-- Windows, MacOS, Ubuntu, ArchLinux, etc... -->
+Which lsp-client do you use:
+<!-- Neovim, emacs, VS Codium, etc... -->
+Describe your project (alternative: link to the project):
+<!-- stack.yaml, package.yaml, *.cabal files, cabal.project, hie.yaml -->
+
+### Steps to reproduce
+<!-- Tell us how to reproduce this issue. -->
+
+### Expected behaviour
+<!-- Tell us what should happen. -->
+
+### Actual behaviour
+<!-- Tell us what happens instead. -->
+
+### Include debug information
+Execute in the root of your project the command `haskell-language-server-wrapper --debug .` and paste the logs here:
+(if you are using the vscode extension check the executable location [here](https://github.com/haskell/vscode-haskell#downloaded-binaries))
+<details>
+<summary>
+Debug output:
+</summary>
+
+```
+<paste your logs here>
+```
+</details>
+
+Paste the logs from the lsp-client, you can check instructions about for VS Code [here](https://github.com/haskell/vscode-haskell#troubleshooting)
+
+<details>
+<summary>
+LSP logs:
+</summary>
+
+```
+<paste your logs here>
+```
+</details>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'status: needs triage, type: enhancement'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+
+<!-- Add any other context or screenshots about the feature request here. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -28,7 +28,7 @@ jobs:
                   "hls-call-hierarchy-plugin",
                   "haskell-language-server"]
         # Uncomment 9.0.1 when ghcide is buildable
-        ghc: [ # "9.0.1",
+        ghc: [ "9.0.1",
               "8.10.7",
               "8.8.4",
               "8.6.5"]

.github/workflows/hackage.yml

@@ -139,8 +139,9 @@ jobs:
           sed -i.bak -e 's/Paths_haskell_language_server/Paths_hls/g' \
                      src/**/*.hs exe/*.hs
 
+      # repeating builds to workaround segfaults in windows and ghc-8.8.4
       - name: Build
-        run: cabal build
+        run: cabal build || cabal build || cabal build
 
       - name: Set test options
         run: |
@@ -238,8 +239,11 @@ jobs:
 
       - if: matrix.test
         name: Test hls-alternate-number-format-plugin test suite
-        run: cabal test hls-alternate-number-format-plugin --test-options="-j1 --rerun-update" || cabal test hls-alternate-number-format-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-alternate-number-format-plugin --test-options="-j1 --rerun"
+        run: cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS" || cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS"
 
+      - if: matrix.test
+        name: Test hls-qualify-imported-names-plugin test suite
+        run: cabal test hls-qualify-imported-names-plugin --test-options="$TEST_OPTS" || cabal test hls-qualify-imported-names-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-qualify-imported-names-plugin --test-options="$TEST_OPTS"
 
   test_post_job:
     if: always()

.github/workflows/test.yml

@@ -19,6 +19,7 @@ packages:
          ./plugins/hls-retrie-plugin
          ./plugins/hls-haddock-comments-plugin
          ./plugins/hls-splice-plugin
+         ./plugins/hls-qualify-imported-names-plugin
          ./plugins/hls-floskell-plugin
          ./plugins/hls-pragmas-plugin
          ./plugins/hls-module-name-plugin
@@ -34,23 +35,9 @@ package *
   ghc-options: -haddock
   test-show-details: direct
 
-source-repository-package
-  type: git
-  location: https://github.com/mokus0/th-extras
-  tag: 0d050b24ec5ef37c825b6f28ebd46787191e2a2d
--- https://github.com/mokus0/th-extras/issues/10
-
-
-source-repository-package
-  type: git
-  location: https://github.com/fendor/dependent-sum
-  tag: 5de03c38b0de4945f4e9bce1b026110e69dc8118
-  subdir: dependent-sum-template
--- https://github.com/obsidiansystems/dependent-sum/pull/59
-
 write-ghc-environment-files: never
 
-index-state: 2021-11-23T21:12:30Z
+index-state: 2021-11-29T08:11:07Z
 
 constraints:
   -- These plugins don't work on GHC9 yet

cabal-ghc901.project

@@ -18,6 +18,7 @@ packages:
         -- ./plugins/hls-retrie-plugin
          ./plugins/hls-haddock-comments-plugin
         --  ./plugins/hls-splice-plugin
+         ./plugins/hls-qualify-imported-names-plugin
          ./plugins/hls-floskell-plugin
          ./plugins/hls-pragmas-plugin
          ./plugins/hls-module-name-plugin
@@ -35,7 +36,7 @@ package *
 
 write-ghc-environment-files: never
 
-index-state: 2021-11-23T21:12:30Z
+index-state: 2021-11-29T08:11:07Z
 
 constraints:
   -- These plugins doesn't work on GHC92 yet

cabal-ghc921.project

@@ -25,6 +25,7 @@ packages:
          ./plugins/hls-ormolu-plugin
          ./plugins/hls-call-hierarchy-plugin
          ./plugins/hls-alternate-number-format-plugin
+         ./plugins/hls-qualify-imported-names-plugin
 
 -- Standard location for temporary packages needed for particular environments
 -- For example it is used in the project gitlab mirror to help in the MAcOS M1 build script
@@ -39,7 +40,7 @@ package *
 
 write-ghc-environment-files: never
 
-index-state: 2021-11-23T21:12:30Z
+index-state: 2021-11-29T08:11:07Z
 
 constraints:
     hyphenation +embed

cabal.project

@@ -16,6 +16,7 @@ You can watch demos for some of these features [below](#demos).
 - [Integration](#hlint) with [hlint](https://github.com/ndmitchell/hlint), the most used haskell linter, to show diagnostics and apply hints via [apply-refact](https://github.com/mpickering/apply-refact)
 - [Module name suggestions](#module-names) for insertion or correction
 - [Call hierarchy support](#call-hierarchy)
+- [Qualify names from an import declaration](#qualify-imported-names) in your code
 
 ## Demos
 
@@ -46,3 +47,7 @@ You can watch demos for some of these features [below](#demos).
 ### Call hierarchy
 
 ![Call Hierarchy in VSCode](https://github.com/haskell/haskell-language-server/raw/2857eeece0398e1cd4b2ffb6069b05c4d2308b39/plugins/hls-call-hierarchy-plugin/call-hierarchy-in-vscode.gif)
+
+### Qualify imported names
+
+![Qualify Imported Names Demo](../plugins/hls-qualify-imported-names-plugin/qualify-imported-names-demo.gif)

docs/features.md

@@ -12,6 +12,9 @@ import           Ide.Plugin.Example                as Example
 import           Ide.Plugin.Example2               as Example2
 
 -- haskell-language-server optional plugins
+#if qualifyImportedNames
+import           Ide.Plugin.QualifyImportedNames   as QualifyImportedNames
+#endif
 
 #if callHierarchy
 import           Ide.Plugin.CallHierarchy          as CallHierarchy
@@ -147,6 +150,9 @@ idePlugins includeExamples = pluginDescToIdePlugins allPlugins
 #if importLens
       ExplicitImports.descriptor "importLens" :
 #endif
+#if qualifyImportedNames
+      QualifyImportedNames.descriptor "qualifyImportedNames" :
+#endif
 #if refineImports
       RefineImports.descriptor "refineImports" :
 #endif

exe/Plugins.hs

@@ -442,6 +442,7 @@ executable ghcide-bench
         base,
         bytestring,
         containers,
+        data-default,
         directory,
         extra,
         filepath,

ghcide/ghcide.cabal

@@ -462,7 +462,7 @@ loadSessionWithOptions SessionLoadingOptions{..} dir = do
                     -> IO (IdeResult HscEnvEq, [FilePath])
         sessionOpts (hieYaml, file) = do
           v <- fromMaybe HM.empty . Map.lookup hieYaml <$> readVar fileToFlags
-          cfp <- canonicalizePath file
+          cfp <- makeAbsolute file
           case HM.lookup (toNormalizedFilePath' cfp) v of
             Just (opts, old_di) -> do
               deps_ok <- checkDependencyInfo old_di
@@ -483,7 +483,7 @@ loadSessionWithOptions SessionLoadingOptions{..} dir = do
     -- before attempting to do so.
     let getOptions :: FilePath -> IO (IdeResult HscEnvEq, [FilePath])
         getOptions file = do
-            ncfp <- toNormalizedFilePath' <$> canonicalizePath file
+            ncfp <- toNormalizedFilePath' <$> makeAbsolute file
             cachedHieYamlLocation <- HM.lookup ncfp <$> readVar filesMap
             hieYaml <- cradleLoc file
             sessionOpts (join cachedHieYamlLocation <|> hieYaml, file) `Safe.catch` \e ->
@@ -553,11 +553,11 @@ fromTargetId is exts (GHC.TargetModule mod) env dep = do
               , i <- is
               , boot <- ["", "-boot"]
               ]
-    locs <- mapM (fmap toNormalizedFilePath' . canonicalizePath) fps
+    locs <- mapM (fmap toNormalizedFilePath' . makeAbsolute) fps
     return [TargetDetails (TargetModule mod) env dep locs]
 -- For a 'TargetFile' we consider all the possible module names
 fromTargetId _ _ (GHC.TargetFile f _) env deps = do
-    nf <- toNormalizedFilePath' <$> canonicalizePath f
+    nf <- toNormalizedFilePath' <$> makeAbsolute f
     return [TargetDetails (TargetFile nf) env deps [nf]]
 
 toFlagsMap :: TargetDetails -> [(NormalizedFilePath, (IdeResult HscEnvEq, DependencyInfo))]

ghcide/session-loader/Development/IDE/Session.hs

@@ -138,7 +138,7 @@ import           Ide.Plugin.Config
 import qualified Language.LSP.Server                          as LSP
 import           Language.LSP.Types                           (SMethod (SCustomMethod))
 import           Language.LSP.VFS
-import           System.Directory                             (canonicalizePath, makeAbsolute)
+import           System.Directory                             (makeAbsolute)
 import           Data.Default                                 (def, Default)
 import           Ide.Plugin.Properties                        (HasProperty,
                                                                KeyNameProxy,
@@ -769,7 +769,7 @@ getModIfaceFromDiskAndIndexRule =
       hie_loc = Compat.ml_hie_file $ ms_location ms
   hash <- liftIO $ Util.getFileHash hie_loc
   mrow <- liftIO $ HieDb.lookupHieFileFromSource hiedb (fromNormalizedFilePath f)
-  hie_loc' <- liftIO $ traverse (canonicalizePath . HieDb.hieModuleHieFile) mrow
+  hie_loc' <- liftIO $ traverse (makeAbsolute . HieDb.hieModuleHieFile) mrow
   case mrow of
     Just row
       | hash == HieDb.modInfoHash (HieDb.hieModInfo row)

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

@@ -308,7 +308,14 @@ instance IsIdeGlobal GlobalIdeOptions
 getIdeOptions :: Action IdeOptions
 getIdeOptions = do
     GlobalIdeOptions x <- getIdeGlobalAction
-    return x
+    env <- lspEnv <$> getShakeExtras
+    case env of
+        Nothing -> return x
+        Just env -> do
+            config <- liftIO $ LSP.runLspT env HLS.getClientConfig
+            return x{optCheckProject = pure $ checkProject config,
+                     optCheckParents = pure $ checkParents config
+                }
 
 getIdeOptionsIO :: ShakeExtras -> IO IdeOptions
 getIdeOptionsIO ide = do