Merge branch 'master' into filter-atpoint-results

Author: pepeiborra

Diff for: .github/workflows/hackage.yml

@@ -28,6 +28,7 @@ jobs:
       matrix:
         package: ["hie-compat", "hls-graph", "shake-bench",
                   "hls-plugin-api", "ghcide", "hls-test-utils",
+                  "hls-cabal-plugin",
                   "hls-brittany-plugin", "hls-floskell-plugin", "hls-fourmolu-plugin",
                   "hls-ormolu-plugin", "hls-stylish-haskell-plugin",
                   "hls-class-plugin", "hls-eval-plugin", "hls-explicit-imports-plugin",

Diff for: .github/workflows/test.yml

@@ -259,6 +259,10 @@ jobs:
         name: Test hls-cabal-fmt-plugin test suite
         run: cabal test hls-cabal-fmt-plugin --flag=isolateTests --test-options="$TEST_OPTS" || cabal test hls-cabal-fmt-plugin --flag=isolateTests --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-cabal-fmt-plugin --flag=isolateTests --test-options="$TEST_OPTS"
 
+      - if: matrix.test
+        name: Test hls-cabal-plugin test suite
+        run: cabal test hls-cabal-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-cabal-plugin --test-options="$TEST_OPTS"
+
   test_post_job:
     if: always()
     runs-on: ubuntu-latest

Diff for: CODEOWNERS

@@ -9,6 +9,7 @@
 # Plugins
 /plugins/hls-alternate-number-format-plugin @drsooch
 /plugins/hls-brittany-plugin @fendor
+/plugins/hls-cabal-plugin @fendor
 /plugins/hls-cabal-fmt-plugin @VeryMilkyJoe @fendor
 /plugins/hls-call-hierarchy-plugin @July541
 /plugins/hls-class-plugin @Ailrun

Diff for: cabal.project

@@ -8,6 +8,7 @@ packages:
          ./ghcide/test
          ./hls-plugin-api
          ./hls-test-utils
+         ./plugins/hls-cabal-plugin
          ./plugins/hls-cabal-fmt-plugin
          ./plugins/hls-tactics-plugin
          ./plugins/hls-brittany-plugin

Diff for: configuration-ghc-90.nix

@@ -18,13 +18,13 @@ let
       # https://github.com/nikita-volkov/ptr-poker/issues/11
       ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
 
-      ghc-lib = hself.ghc-lib_9_2_2_20220307;
+      ghc-lib = hself.ghc-lib_9_2_4_20220729;
       ghc-lib-parser = hself.ghc-lib-parser_9_2_4_20220729;
-      ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_2_0_4;
+      ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_2_1_1;
 
       Cabal = hself.Cabal_3_6_3_0;
       ormolu = hself.ormolu_0_5_0_1;
-      fourmolu = hself.fourmolu_0_6_0_0;
+
       # Hlint is still broken
       hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint-34 { });
 

Diff for: configuration-ghc-92.nix

@@ -24,8 +24,6 @@ let
       # https://github.com/nikita-volkov/ptr-poker/issues/11
       ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
 
-      ghc-exactprint =
-        hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint-150 { };
       # Hlint is still broken
       hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint { });
 

Diff for: configuration-ghc-94.nix

@@ -31,19 +31,6 @@ let
 
       stylish-haskell = appendConfigureFlag  hsuper.stylish-haskell "-fghc-lib";
 
-      cereal = hsuper.callHackage "cereal" "0.5.8.3" {};
-      base-compat = hsuper.callHackage "base-compat" "0.12.2" {};
-      base-compat-batteries = hsuper.callHackage "base-compat-batteries" "0.12.2" {};
-      hashable = hsuper.callHackage "hashable" "1.4.1.0" {};
-      primitive = hsuper.callHackage "primitive" "0.7.4.0" {};
-      ghc-check = hsuper.callHackage "ghc-check" "0.5.0.8" {};
-      lens = hsuper.callHackage "lens" "5.2" {};
-      integer-logarithms = hsuper.callHackage "integer-logarithms" "1.0.3.1" {};
-      hiedb = hsuper.callHackage "hiedb" "0.4.2.0" {};
-      hie-bios = hsuper.callHackage "hie-bios" "0.11.0" {};
-      lsp = hsuper.callCabal2nix "lsp" inputs.lsp {};
-      lsp-types = hsuper.callCabal2nix "lsp-types" inputs.lsp-types {};
-
       # Re-generate HLS drv excluding some plugins
       haskell-language-server =
         hself.callCabal2nixWithOptions "haskell-language-server" ./.

Diff for: docs/features.md

@@ -44,6 +44,12 @@ Provided by: `hls-stan-plugin`
 
 Provides Stan hints as diagnostics.
 
+### Cabal parse errors and warnings
+
+Provided by: `hls-cabal-plugin`
+
+Provides errors and warnings from Cabal as diagnostics
+
 ## Hovers
 
 Provided by: `ghcide`
@@ -308,6 +314,14 @@ Expand record wildcards, explicitly listing all record fields as field puns.
 
 ![Explicit Wildcard Demo](../plugins/hls-explicit-record-fields-plugin/wildcard.gif)
 
+### Unknown SPDX License suggestion
+
+Provided by: `hls-cabal-plugin`
+
+Code action kind: `quickfix`
+
+Correct common misspelling of SPDX Licenses such as `BSD-3-Clause`.
+
 ## Code lenses
 
 ### Add type signature