Merge master

Author: July541

.github/workflows/caching.yml

@@ -80,11 +80,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: [ "9.2.2"
+        ghc: [ "9.2.3"
+             , "9.2.2"
              , "9.0.2"
-             , "9.0.1"
              , "8.10.7"
-             , "8.10.6"
              , "8.8.4"
              , "8.6.5"
              ]
@@ -118,7 +117,7 @@ jobs:
           cabal $cabalBuild || cabal $cabalBuild || cabal $cabalBuild
         env:
           # needed for GHC 9.2.2 https://github.com/digital-asset/ghc-lib/issues/352
-          CPATH:"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi":$CPATH
+          CPATH: "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
 
       # We build ghcide with benchs and test enabled to include its dependencies in the cache
       # (including shake-bench)

.github/workflows/flags.yml

@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: [ "9.2.2"
+        ghc: [ "9.2.3"
              , "9.0.2"
              , "8.10.7"
              , "8.8.4"
@@ -68,7 +68,7 @@ jobs:
         run: cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe ekg"
 
       # we have to clean up warnings for 9.0 and 9.2 before enable -WAll
-      - if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.2'
+      - if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.3'
         name: Build with pedantic (-WError)
         run: cabal v2-build --flags="pedantic"
 

.github/workflows/test.yml

@@ -57,11 +57,10 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: [ "9.2.2"
+        ghc: [ "9.2.3"
+             , "9.2.2"
              , "9.0.2"
-             , "9.0.1"
              , "8.10.7"
-             , "8.10.6"
              , "8.8.4"
              , "8.6.5"
              ]
@@ -71,7 +70,7 @@ jobs:
         include:
            # only test supported ghc major versions
            - os: ubuntu-latest
-             ghc: '9.2.2'
+             ghc: '9.2.3'
              test: true
            - os: ubuntu-latest
              ghc: '9.0.2'
@@ -86,7 +85,7 @@ jobs:
              ghc: '8.6.5'
              test: true
            - os: windows-latest
-             ghc: '9.2.2'
+             ghc: '9.2.3'
              test: true
            - os: windows-latest
              ghc: '9.0.2'
@@ -98,12 +97,10 @@ jobs:
              ghc: '8.6.5'
              test: true
            # only build rest of supported ghc versions for windows
-           - os: windows-latest
-             ghc: '9.0.1'
-           - os: windows-latest
-             ghc: '8.10.6'
            - os: windows-latest
              ghc: '8.8.4'
+           - os: windows-latest
+             ghc: '9.2.2'
 
     steps:
       - uses: actions/checkout@v3
@@ -162,7 +159,7 @@ jobs:
           HLS_WRAPPER_TEST_EXE: hls-wrapper
         run: cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper" || cabal test wrapper-test --test-options="$TEST_OPTS  --rerun-log-file .tasty-rerun-log-wrapper" || cabal test wrapper-test --test-options="$TEST_OPTS  --rerun-log-file .tasty-rerun-log-wrapper"
 
-      - if: matrix.test && matrix.ghc != '9.2.2'
+      - if: matrix.test && matrix.ghc != '9.2.3'
         name: Test hls-brittany-plugin
         run: cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-brittany-plugin --test-options="$TEST_OPTS"
 
@@ -182,11 +179,11 @@ jobs:
         name: Test hls-eval-plugin
         run: cabal test hls-eval-plugin --test-options="$TEST_OPTS" || cabal test hls-eval-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-eval-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test && matrix.ghc != '9.2.2'
+      - if: matrix.test && matrix.ghc != '9.2.3'
         name: Test hls-haddock-comments-plugin
         run: cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test && matrix.ghc != '9.2.2'
+      - if: matrix.test && matrix.ghc != '9.2.3'
         name: Test hls-splice-plugin
         run: cabal test hls-splice-plugin --test-options="$TEST_OPTS" || cabal test hls-splice-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-splice-plugin --test-options="$TEST_OPTS"
 
@@ -202,7 +199,7 @@ jobs:
         name: Test hls-fourmolu-plugin
         run: cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test && matrix.ghc != '9.2.2'
+      - if: matrix.test && matrix.ghc != '9.2.3'
         name: Test hls-tactics-plugin test suite
         run: cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-tactics-plugin --test-options="$TEST_OPTS"
 
@@ -246,6 +243,10 @@ jobs:
         name: Test hls-change-type-signature test suite
         run: cabal test hls-change-type-signature-plugin --test-options="$TEST_OPTS" || cabal test hls-change-type-signature-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-change-type-signature-plugin --test-options="$TEST_OPTS"
 
+      - if: matrix.test
+        name: Test hls-gadt-plugin test suit
+        run: cabal test hls-gadt-plugin --test-options="$TEST_OPTS" || cabal test hls-gadt-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-gadt-plugin --test-options="$TEST_OPTS"
+
   test_post_job:
     if: always()
     runs-on: ubuntu-latest

.gitlab-ci.yml

@@ -19,7 +19,7 @@ variables:
       CABAL_PROJECT: cabal.project
     - GHC_VERSION: 9.2.2
       CABAL_PROJECT: cabal.project
-    - GHC_VERSION: 9.2.1
+    - GHC_VERSION: 9.2.3
       CABAL_PROJECT: cabal.project
 
 workflow:

CODEOWNERS

@@ -15,6 +15,7 @@
 /plugins/hls-explicit-imports-plugin @pepeiborra
 /plugins/hls-floskell-plugin @Ailrun
 /plugins/hls-fourmolu-plugin @georgefst
+/plugins/hls-gadt-plugin @July541
 /plugins/hls-haddock-comments-plugin @berberman
 /plugins/hls-hlint-plugin @jneira @eddiemundo
 /plugins/hls-module-name-plugin

bindist/ghcs

@@ -2,5 +2,5 @@
 8.8.4,cabal.project
 8.10.7,cabal.project
 9.0.2,cabal.project
-9.2.1,cabal.project
 9.2.2,cabal.project
+9.2.3,cabal.project

bindist/ghcs-Msys

@@ -1,4 +1,4 @@
 8.10.7,cabal.project
 9.0.2,cabal.project
 9.2.2,cabal.project
-9.2.1,cabal.project
+9.2.3,cabal.project

cabal.project

@@ -28,6 +28,7 @@ packages:
          ./plugins/hls-qualify-imported-names-plugin
          ./plugins/hls-selection-range-plugin
          ./plugins/hls-change-type-signature-plugin
+         ./plugins/hls-gadt-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
@@ -43,7 +44,7 @@ package *
 
 write-ghc-environment-files: never
 
-index-state: 2022-04-30T21:02:45Z
+index-state: 2022-06-12T00:00:00Z
 
 constraints:
   hyphenation +embed,
@@ -66,26 +67,5 @@ allow-newer:
   -- ghc-9.2
   ----------
   hiedb:base,
-  retrie:ghc-exactprint,
 
-  -- for brittany
-  -- https://github.com/lspitzner/multistate/pull/8
-  multistate:base,
-  -- https://github.com/lspitzner/data-tree-print/pull/3
-  data-tree-print:base,
-  -- https://github.com/lspitzner/butcher/pull/8
-  butcher:base,
-
-  -- for shake-bench
-  Chart:lens,
-  Chart-diagrams:lens,
-
-  -- for ekg
-  ekg-core:base,
-  ekg-core:ghc-prim,
-  ekg-wai:base,
-  ekg-wai:time,
-
-  -- for shake-bench
-  Chart-diagrams:diagrams-core,
-  SVGFonts:diagrams-core
+  ekg-wai:time

docs/features.md

@@ -256,7 +256,19 @@ Known Limitations:
 
 ![Change Type Signature Demo](../plugins/hls-change-type-signature-plugin/change2.gif)
 
-[Link to Docs](../plugins/hls-change-type-signature/README.md)
+![Link to Docs](../plugins/hls-change-type-signature-plugin/README.md)
+
+### Convert to GADT syntax
+
+Provided by: `hls-gadt-plugin`
+
+Code action kind: `refactor.rewrite`
+
+Convert a datatype to GADT syntax.
+
+![GADT Demo](../plugins/hls-gadt-plugin/gadt.gif)
+
+![Link to Docs](../plugins/hls-gadt-plugin/README.md)
 
 ## Code lenses
 
@@ -274,6 +286,13 @@ Evaluates code blocks in comments with a click. [Tutorial](https://github.com/ha
 
 ![Eval Demo](https://raw.githubusercontent.com/haskell/haskell-language-server/master/plugins/hls-eval-plugin/demo.gif)
 
+Known limitations:
+
+- Standard input is shared with HLS, so e.g. [`getLine` breaks the connection to server](https://github.com/haskell/haskell-language-server/issues/2913).
+- Standard (error) output [is not captured](https://github.com/haskell/haskell-language-server/issues/1977).
+- While similar to [doctest](https://hackage.haskell.org/package/doctest), some of its features are unsupported,
+  see [Differences with doctest](https://github.com/haskell/haskell-language-server/blob/master/plugins/hls-eval-plugin/README.md#differences-with-doctest).
+
 ### Make import lists fully explicit code lens
 
 Provided by: `hls-explicit-imports-plugin`

docs/installation.md

@@ -110,7 +110,7 @@ In addition make sure `haskell-language-server.exe` is not running by closing yo
 ### Download the source code
 
 ```bash
-git clone https://github.com/haskell/haskell-language-server --recurse-submodules
+git clone https://github.com/haskell/haskell-language-server
 cd haskell-language-server
 ```
 
@@ -136,18 +136,9 @@ To install, download the `haskell-language-server-wrapper` executable for your p
 ## Arch Linux
 
 The preferred method of installation for development purposes is to use the [haskell-language-server-static](https://aur.archlinux.org/packages/haskell-language-server-static) package from AUR.
-This package contains statically linked binaries for each supported GHC version and `haskell-language-server-wrapper` for automatic GHC version selection.
+This package contains pre-built binaries for each supported GHC version and `haskell-language-server-wrapper` for automatic GHC version selection.
 It is updated regularly, requires no additional dependencies, and is independent of other haskell packages you may have on your system, including GHC.
-Its size is relatively large (approx. 900 MB), but if this is a problem for you, during installation you can disable the GHC versions you will not be using by editing the PKGBUILD file.
 
-Alternatively, if you want to use **dynamically linked** Haskell packages from `pacman`,
-you can install the latest pre-compiled version of `haskell-language-server` from [[community]](https://archlinux.org/packages/community/x86_64/haskell-language-server/):
-
-```bash
-sudo pacman -S haskell-language-server
-```
-
-In this case, `haskell-language-server` is compiled against the GHC distributed to Arch Linux, so you will need maintain a system wide Haskell development environment, and install GHC from `pacman` as well.
 See [ArchWiki](https://wiki.archlinux.org/index.php/Haskell) for the details of Haskell infrastructure on Arch Linux.
 
 ## Fedora

docs/supported-versions.md

@@ -55,6 +55,7 @@ Sometimes a plugin will be supported in the prebuilt binaries but not in a HLS b
 | `hls-stylish-haskell-plugin`        |                          |
 | `hls-tactics-plugin`                | 9.2                      |
 | `hls-selection-range-plugin`        |                          |
+| `hls-gadt-plugin`                   |                          |
 
 ### Using deprecated GHC versions
 

exe/Plugins.hs

@@ -82,6 +82,10 @@ import           Ide.Plugin.SelectionRange         as SelectionRange
 #if changeTypeSignature
 import           Ide.Plugin.ChangeTypeSignature    as ChangeTypeSignature
 #endif
+
+#if gadt
+import           Ide.Plugin.GADT                   as GADT
+#endif
 -- formatters
 
 #if floskell
@@ -132,7 +136,7 @@ idePlugins recorder includeExamples = pluginDescToIdePlugins allPlugins
       Floskell.descriptor "floskell" :
 #endif
 #if fourmolu
-      Fourmolu.descriptor "fourmolu" :
+      Fourmolu.descriptor pluginRecorder "fourmolu" :
 #endif
 #if tactic
       Tactic.descriptor pluginRecorder "tactics" :
@@ -153,7 +157,7 @@ idePlugins recorder includeExamples = pluginDescToIdePlugins allPlugins
       Brittany.descriptor "brittany" :
 #endif
 #if callHierarchy
-      CallHierarchy.descriptor "callHierarchy":
+      CallHierarchy.descriptor :
 #endif
 #if class
       Class.descriptor pluginRecorder "class" :
@@ -183,13 +187,16 @@ idePlugins recorder includeExamples = pluginDescToIdePlugins allPlugins
       Splice.descriptor "splice" :
 #endif
 #if alternateNumberFormat
-      AlternateNumberFormat.descriptor pluginRecorder "alternateNumberFormat" :
+      AlternateNumberFormat.descriptor pluginRecorder :
 #endif
 #if selectionRange
       SelectionRange.descriptor "selectionRange" :
 #endif
 #if changeTypeSignature
-      ChangeTypeSignature.descriptor "changeTypeSignature" :
+      ChangeTypeSignature.descriptor :
+#endif
+#if gadt
+      GADT.descriptor "gadt" :
 #endif
     -- The ghcide descriptors should come last so that the notification handlers
     -- (which restart the Shake build) run after everything else