diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml
index 15b309926e2..0bc80aca7f0 100644
--- a/.github/actions/setup-build/action.yml
+++ b/.github/actions/setup-build/action.yml
@@ -7,7 +7,7 @@ inputs:
   cabal:
     description: "Cabal version"
     required: false
-    default: "3.6"
+    default: "3.8.1.0"
   os:
     description: "Operating system: Linux, Windows or macOS"
     required: true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5b963a662df..849dd9c7f36 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -57,7 +57,9 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: [ "9.2.4"
+        ghc: [ "9.4.2"
+             , "9.4.1"
+             , "9.2.4"
              , "9.2.3"
              , "9.0.2"
              , "8.10.7"
@@ -69,6 +71,9 @@ jobs:
             ]
         include:
            # only test supported ghc major versions
+           - os: ubuntu-latest
+             ghc: '9.4.2'
+             test: true
            - os: ubuntu-latest
              ghc: '9.2.4'
              test: true
@@ -84,6 +89,9 @@ jobs:
            - os: ubuntu-latest
              ghc: '8.6.5'
              test: true
+           - os: windows-latest
+             ghc: '9.4.2'
+             test: true
            - os: windows-latest
              ghc: '9.2.4'
              test: true
@@ -156,99 +164,103 @@ 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.4'
+      - if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.4.2'
         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"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.4.2'
+        name: Test hls-refactor-plugin
+        run: cabal test hls-refactor-plugin --test-options="$TEST_OPTS" || cabal test hls-refactor-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-refactor-plugin --test-options="$TEST_OPTS"
+
+      - if: matrix.test && matrix.ghc != '9.4.2'
         name: Test hls-floskell-plugin
         run: cabal test hls-floskell-plugin --test-options="$TEST_OPTS" || cabal test hls-floskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-floskell-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.4.2'
         name: Test hls-class-plugin
         run: cabal test hls-class-plugin --test-options="$TEST_OPTS" || cabal test hls-class-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-class-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.4.2'
         name: Test hls-pragmas-plugin
         run: cabal test hls-pragmas-plugin --test-options="$TEST_OPTS" || cabal test hls-pragmas-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-pragmas-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.4.2'
         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.4'
+      - if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.4.2'
         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.4'
+      - if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.4.2'
         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"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.4.2'
         name: Test hls-stylish-haskell-plugin
         run: cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.4.2'
         name: Test hls-ormolu-plugin
         run: cabal test hls-ormolu-plugin --test-options="$TEST_OPTS" || cabal test hls-ormolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-ormolu-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.4.2'
         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.4'
+      - if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.4.2'
         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"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.4.2'
         name: Test hls-refine-imports-plugin test suite
         run: cabal test hls-refine-imports-plugin --test-options="$TEST_OPTS" || cabal test hls-refine-imports-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-refine-imports-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.4.2'
         name: Test hls-explicit-imports-plugin test suite
         run: cabal test hls-explicit-imports-plugin --test-options="$TEST_OPTS" || cabal test hls-explicit-imports-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-explicit-imports-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.4.2'
         name: Test hls-call-hierarchy-plugin test suite
         run: cabal test hls-call-hierarchy-plugin --test-options="$TEST_OPTS" || cabal test hls-call-hierarchy-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-call-hierarchy-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test && matrix.os != 'windows-latest'
+      - if: matrix.test && matrix.os != 'windows-latest' && matrix.ghc != '9.4.2'
         name: Test hls-rename-plugin test suite
         run: cabal test hls-rename-plugin --test-options="$TEST_OPTS" || cabal test hls-rename-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-rename-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.4.2'
         name: Test hls-hlint-plugin test suite
         run: cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-hlint-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.4'
+      - if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.4' && matrix.ghc != '9.4.2'
         name: Test hls-stan-plugin test suite
         run: cabal test hls-stan-plugin --test-options="$TEST_OPTS" || cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-stan-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.4.2'
         name: Test hls-module-name-plugin test suite
         run: cabal test hls-module-name-plugin --test-options="$TEST_OPTS" || cabal test hls-module-name-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-module-name-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.4.2'
         name: Test hls-alternate-number-format-plugin test suite
         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
+      - if: matrix.test && matrix.ghc != '9.4.2'
         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"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.4.2'
         name: Test hls-code-range-plugin test suite
         run: cabal test hls-code-range-plugin --test-options="$TEST_OPTS" || cabal test hls-code-range-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-code-range-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.4.2'
         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
+      - if: matrix.test && matrix.ghc != '9.4.2'
         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"
 
-      - if: matrix.test
+      - if: matrix.test && matrix.ghc != '9.4.2'
         name: Test hls-explicit-fixity-plugin test suite
         run: cabal test hls-explicit-fixity-plugin --test-options="$TEST_OPTS" || cabal test hls-explicit-fixity-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-explicit-fixity-plugin --test-options="$TEST_OPTS"
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0bed4d60dd..1152d09d361 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ variables:
   # Commit of ghc/ci-images repository from which to pull Docker images
   DOCKER_REV: "4ed1a4f27828ba96a34662dc954335e29b470cd2"
 
-  CABAL_INSTALL_VERSION: 3.6.2.0
+  CABAL_INSTALL_VERSION: 3.8.1.0
 
 .windows_matrix: &windows_matrix
   matrix:
@@ -21,6 +21,10 @@ variables:
       CABAL_PROJECT: cabal.project
     - GHC_VERSION: 9.2.4
       CABAL_PROJECT: cabal.project
+    - GHC_VERSION: 9.4.1
+      CABAL_PROJECT: cabal.project
+    - GHC_VERSION: 9.4.2
+      CABAL_PROJECT: cabal.project
 
 workflow:
   rules:
diff --git a/.hlint.yaml b/.hlint.yaml
index bb41a16e649..8caaebd8f6d 100644
--- a/.hlint.yaml
+++ b/.hlint.yaml
@@ -54,6 +54,7 @@
     within:
     - Development.IDE.Core.Shake
     - Development.IDE.GHC.Util
+    - Development.IDE.Plugin.CodeAction.Util
     - Development.IDE.Graph.Internal.Database
     - Development.IDE.Graph.Internal.Paths
     - Development.IDE.Graph.Internal.Profile
@@ -184,6 +185,7 @@
     - Development.IDE.Core.Shake
     - Development.IDE.Plugin.Completions
     - Development.IDE.Plugin.CodeAction.ExactPrint
+    - Development.IDE.Plugin.CodeAction
     - Development.IDE.Test
     - Development.IDE.Graph.Internal.Profile
     - Development.IDE.Graph.Internal.Rules
@@ -221,6 +223,7 @@
     - Development.IDE.Core.Compile
     - Development.IDE.Graph.Internal.Database
     - Development.IDE.GHC.Util
+    - Development.IDE.Plugin.CodeAction.Util
     - Wingman.Debug
 
 # We really do not want novel usages of restricted functions, and mere
diff --git a/bench/config.yaml b/bench/config.yaml
index 14977ccbb27..9be8bd67d89 100644
--- a/bench/config.yaml
+++ b/bench/config.yaml
@@ -96,6 +96,7 @@ configurations:
 # The implicitly included plugins are:
 # - ghcide-core
 # - ghcide-hover-and-symbols
+<<<<<<< HEAD
 
 # Uncomment below sections if needed
 # - None: []
@@ -111,12 +112,13 @@ configurations:
 #   - ghcide-type-lenses
 #   - pragmas
 # - Ghcide:
+#   - ghcide-completions
+#   - ghcide-type-lenses
+# - Refactor:
 #   - ghcide-code-actions-bindings
 #   - ghcide-code-actions-fill-holes
 #   - ghcide-code-actions-imports-exports
 #   - ghcide-code-actions-type-signatures
-#   - ghcide-completions
-#   - ghcide-type-lenses
 - All:
   - alternateNumberFormat
   - callHierarchy
diff --git a/bindist/ghcs b/bindist/ghcs
index b5009e2c780..151afa12510 100644
--- a/bindist/ghcs
+++ b/bindist/ghcs
@@ -4,3 +4,5 @@
 9.0.2,cabal.project
 9.2.3,cabal.project
 9.2.4,cabal.project
+9.4.1,cabal.project
+9.4.2,cabal.project
diff --git a/bindist/ghcs-Msys b/bindist/ghcs-Msys
index b4ed5601d5f..17e3ffea1c1 100644
--- a/bindist/ghcs-Msys
+++ b/bindist/ghcs-Msys
@@ -2,3 +2,5 @@
 9.0.2,cabal.project
 9.2.3,cabal.project
 9.2.4,cabal.project
+9.4.1,cabal.project
+9.4.2,cabal.project
diff --git a/cabal.project b/cabal.project
index 239fcf6330e..54a9c0bdc9e 100644
--- a/cabal.project
+++ b/cabal.project
@@ -5,6 +5,7 @@ packages:
          ./hls-graph
          ./ghcide
          ./ghcide-bench
+         ./ghcide/test
          ./hls-plugin-api
          ./hls-test-utils
          ./plugins/hls-tactics-plugin
@@ -32,6 +33,7 @@ packages:
          ./plugins/hls-stan-plugin
          ./plugins/hls-gadt-plugin
          ./plugins/hls-explicit-fixity-plugin
+         ./plugins/hls-refactor-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
@@ -46,9 +48,13 @@ package *
 
 write-ghc-environment-files: never
 
-index-state: 2022-08-15T06:53:13Z
+index-state: 2022-08-29T06:53:13Z
 
 constraints:
+  -- For GHC 9.4, older versions of entropy fail to build on Windows
+  entropy >= 0.4.1.10,
+  -- For GHC 9.4
+  basement >= 0.0.15,
   hyphenation +embed,
   -- remove this when hlint sets ghc-lib to true by default
   -- https://github.com/ndmitchell/hlint/issues/1376
@@ -65,6 +71,16 @@ source-repository-package
   tag: 7a0af7a8fd38045fd15fb13445bdcc7085325460
   -- https://github.com/tibbe/ekg-json/pull/12
 
+source-repository-package
+  type:git
+  location: https://github.com/wz1000/hiedb
+  tag: 67b92df2359558091df9102db5b701327308b930
+
+source-repository-package
+  type:git
+  location: https://github.com/wz1000/hie-bios
+  tag: aa73d3d2eb89df0003d2468a105e326d71b62cc7
+
 -- Remove me when a new version of lsp is released
 source-repository-package
   type:git
@@ -85,6 +101,30 @@ source-repository-package
   tag: 77a434087b1f39ae6fd4bc6d88fddbcd1d23e185
 
 allow-newer:
+  -- ghc-9.4
+  Chart-diagrams:lens,
+  Chart:lens,
+  co-log-core:base,
+  constraints-extras:base,
+  constraints-extras:template-haskell,
+  dependent-sum:some,
+  diagrams-contrib:base,
+  diagrams-contrib:lens,
+  diagrams-postscript:base,
+  diagrams-postscript:lens,
+  diagrams-svg:base,
+  diagrams-svg:lens,
+  ekg-json:base,
+  ghc-paths:Cabal,
+  haddock-library:base,
+  hie-bios:aeson,
+  hie-bios:ghc,
+  monoid-extras:base,
+  monoid-subclasses:vector,
+  svg-builder:base,
+  uuid:time,
+  vector-space:base,
+
   -- ghc-9.2
   ----------
   hiedb:base,
diff --git a/configuration-ghc-94.nix b/configuration-ghc-94.nix
new file mode 100644
index 00000000000..3790e182a77
--- /dev/null
+++ b/configuration-ghc-94.nix
@@ -0,0 +1,42 @@
+{ pkgs, inputs }:
+
+let
+  disabledPlugins = [
+    "hls-hlint-plugin"
+    # That one is not technically a plugin, but by putting it in this list, we
+    # get it removed from the top level list of requirement and it is not pull
+    # in the nix shell.
+    "shake-bench"
+  ];
+
+  hpkgsOverride = hself: hsuper:
+    with pkgs.haskell.lib;
+    {
+      hlsDisabledPlugins = disabledPlugins;
+      # YOLO
+      mkDerivation = args:
+        hsuper.mkDerivation (args // {
+          jailbreak = true;
+          doCheck = false;
+        });
+    } // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
+      # ptr-poker breaks on MacOS without SSE2 optimizations
+      # 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 { });
+
+      stylish-haskell = appendConfigureFlag  hsuper.stylish-haskell "-fghc-lib";
+
+      # Re-generate HLS drv excluding some plugins
+      haskell-language-server =
+        hself.callCabal2nixWithOptions "haskell-language-server" ./.
+        (pkgs.lib.concatStringsSep " " [ "-fpedantic" "-f-hlint" ]) { };
+    });
+in {
+  inherit disabledPlugins;
+  tweakHpkgs = hpkgs: hpkgs.extend hpkgsOverride;
+}
diff --git a/flake.nix b/flake.nix
index 738bcde4da6..5c661fe66eb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -138,11 +138,13 @@
           sourceDirs = {
             haskell-language-server = ./.;
             ghcide = ./ghcide;
+            ghcide-bench = ./ghcide-bench;
             hls-graph = ./hls-graph;
             shake-bench = ./shake-bench;
             hie-compat = ./hie-compat;
             hls-plugin-api = ./hls-plugin-api;
             hls-test-utils = ./hls-test-utils;
+            ghcide-test-utils = ./ghcide/test;
           } // pluginSourceDirs;
 
           # Tweak our packages
@@ -214,6 +216,7 @@
 
         ghc902Config = (import ./configuration-ghc-90.nix) { inherit pkgs inputs; };
         ghc924Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; };
+        ghc941Config = (import ./configuration-ghc-94.nix) { inherit pkgs inputs; };
 
         # GHC versions
         # While HLS still works fine with 8.10 GHCs, we only support the versions that are cached
@@ -223,11 +226,13 @@
           cases = {
             ghc902 = ghc902Config.tweakHpkgs (pkgs.hlsHpkgs "ghc902");
             ghc924 = ghc924Config.tweakHpkgs (pkgs.hlsHpkgs "ghc924");
+            ghc941 = ghc941Config.tweakHpkgs (pkgs.hlsHpkgs "ghc941");
           };
           in { default = cases."${ghcVersion}"; } // cases;
 
         ghc902 = supportedGHCs.ghc902;
         ghc924 = supportedGHCs.ghc924;
+        ghc941 = supportedGHCs.ghc941;
         ghcDefault = supportedGHCs.default;
 
         # For markdown support
@@ -360,6 +365,7 @@
           haskell-language-server-dev = mkDevShell ghcDefault "cabal.project";
           haskell-language-server-902-dev = mkDevShell ghc902 "cabal.project";
           haskell-language-server-924-dev = mkDevShell ghc924 "cabal.project";
+          haskell-language-server-941-dev = mkDevShell ghc941 "cabal.project";
         };
 
         # Developement shell, haskell packages are also provided by nix
@@ -367,12 +373,14 @@
           haskell-language-server-dev-nix = mkDevShellWithNixDeps ghcDefault "cabal.project";
           haskell-language-server-902-dev-nix = mkDevShellWithNixDeps ghc902 "cabal.project";
           haskell-language-server-924-dev-nix = mkDevShellWithNixDeps ghc924 "cabal.project";
+          haskell-language-server-941-dev-nix = mkDevShellWithNixDeps ghc941 "cabal.project";
         };
 
         allPackages = {
           haskell-language-server = mkExe ghcDefault;
           haskell-language-server-902 = mkExe ghc902;
           haskell-language-server-924 = mkExe ghc924;
+          haskell-language-server-941 = mkExe ghc941;
         };
 
         devShells = simpleDevShells // nixDevShells // {
diff --git a/ghcide-bench/ghcide-bench.cabal b/ghcide-bench/ghcide-bench.cabal
index 89a9fc10809..450aadba50e 100644
--- a/ghcide-bench/ghcide-bench.cabal
+++ b/ghcide-bench/ghcide-bench.cabal
@@ -63,8 +63,6 @@ library
     exposed-modules:
         Experiments.Types
         Experiments
-    other-modules:
-        Development.IDE.Test.Diagnostic
     build-depends:
         aeson,
         async,
@@ -76,6 +74,7 @@ library
         extra,
         filepath,
         ghcide,
+        ghcide-test-utils,
         hashable,
         lens,
         lsp-test,
diff --git a/ghcide-bench/src/Development/IDE/Test/Diagnostic.hs b/ghcide-bench/src/Development/IDE/Test/Diagnostic.hs
deleted file mode 100644
index a1ea88ec280..00000000000
--- a/ghcide-bench/src/Development/IDE/Test/Diagnostic.hs
+++ /dev/null
@@ -1,48 +0,0 @@
--- Duplicate of ghcide/test/Development/IDE/Test/Diagnostic.hs
-module Development.IDE.Test.Diagnostic where
-
-import           Control.Lens            ((^.))
-import qualified Data.Text               as T
-import           GHC.Stack               (HasCallStack)
-import           Language.LSP.Types
-import           Language.LSP.Types.Lens as Lsp
-
--- | (0-based line number, 0-based column number)
-type Cursor = (UInt, UInt)
-
-cursorPosition :: Cursor -> Position
-cursorPosition (line,  col) = Position line col
-
-type ErrorMsg = String
-
-requireDiagnostic
-    :: (Foldable f, Show (f Diagnostic), HasCallStack)
-    => f Diagnostic
-    -> (DiagnosticSeverity, Cursor, T.Text, Maybe DiagnosticTag)
-    -> Maybe ErrorMsg
-requireDiagnostic actuals expected@(severity, cursor, expectedMsg, expectedTag)
-    | any match actuals = Nothing
-    | otherwise = Just $
-            "Could not find " <> show expected <>
-            " in " <> show actuals
-  where
-    match :: Diagnostic -> Bool
-    match d =
-        Just severity == _severity d
-        && cursorPosition cursor == d ^. range . start
-        && standardizeQuotes (T.toLower expectedMsg) `T.isInfixOf`
-           standardizeQuotes (T.toLower $ d ^. message)
-        && hasTag expectedTag (d ^. tags)
-
-    hasTag :: Maybe DiagnosticTag -> Maybe (List DiagnosticTag) -> Bool
-    hasTag Nothing  _                          = True
-    hasTag (Just _) Nothing                    = False
-    hasTag (Just actualTag) (Just (List tags)) = actualTag `elem` tags
-
-standardizeQuotes :: T.Text -> T.Text
-standardizeQuotes msg = let
-        repl '‘' = '\''
-        repl '’' = '\''
-        repl '`' = '\''
-        repl  c  = c
-    in  T.map repl msg
diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal
index e3af7960ce7..0329130c887 100644
--- a/ghcide/ghcide.cabal
+++ b/ghcide/ghcide.cabal
@@ -60,7 +60,6 @@ library
         filepath,
         fingertree,
         focus,
-        ghc-exactprint < 1 || >= 1.4,
         ghc-trace-events,
         Glob,
         haddock-library >= 1.8 && < 1.11,
@@ -74,16 +73,13 @@ library
         lsp ^>= 1.5.0.0 ,
         monoid-subclasses,
         mtl,
-        network-uri,
         optparse-applicative,
         parallel,
         prettyprinter-ansi-terminal,
         prettyprinter >= 1.6,
         random,
         regex-tdfa >= 1.3.1.0,
-        retrie,
         text-rope,
-        safe,
         safe-exceptions,
         hls-graph ^>= 1.7,
         sorted-list,
@@ -95,9 +91,7 @@ library
         time,
         transformers,
         unordered-containers >= 0.2.10.0,
-        utf8-string,
         vector,
-        vector-algorithms,
         hslogger,
         Diff ^>=0.4.0,
         vector,
@@ -114,9 +108,6 @@ library
         hie-bios ^>= 0.9.1,
         implicit-hie-cradle ^>= 0.3.0.5 || ^>= 0.5,
         base16-bytestring >=0.1.1 && <1.1
-    if impl(ghc >= 9.2)
-      build-depends:
-        ghc-exactprint >= 1.4
     if os(windows)
       build-depends:
         Win32
@@ -172,7 +163,6 @@ library
         Development.IDE.GHC.Compat
         Development.IDE.GHC.Compat.Core
         Development.IDE.GHC.Compat.Env
-        Development.IDE.GHC.Compat.ExactPrint
         Development.IDE.GHC.Compat.Iface
         Development.IDE.GHC.Compat.Logger
         Development.IDE.GHC.Compat.Outputable
@@ -182,9 +172,7 @@ library
         Development.IDE.GHC.Compat.Util
         Development.IDE.Core.Compile
         Development.IDE.GHC.CoreFile
-        Development.IDE.GHC.Dump
         Development.IDE.GHC.Error
-        Development.IDE.GHC.ExactPrint
         Development.IDE.GHC.Orphans
         Development.IDE.GHC.Util
         Development.IDE.Import.DependencyInformation
@@ -214,8 +202,6 @@ library
         Development.IDE.Plugin
         Development.IDE.Plugin.Completions
         Development.IDE.Plugin.Completions.Types
-        Development.IDE.Plugin.CodeAction
-        Development.IDE.Plugin.CodeAction.ExactPrint
         Development.IDE.Plugin.HLS
         Development.IDE.Plugin.HLS.GhcIde
         Development.IDE.Plugin.Test
@@ -226,8 +212,6 @@ library
         Development.IDE.Core.FileExists
         Development.IDE.GHC.CPP
         Development.IDE.GHC.Warnings
-        Development.IDE.Plugin.CodeAction.PositionIndexed
-        Development.IDE.Plugin.CodeAction.Args
         Development.IDE.Plugin.Completions.Logic
         Development.IDE.Session.VersionCheck
         Development.IDE.Types.Action
@@ -365,7 +349,6 @@ test-suite ghcide-tests
         ghc,
         --------------------------------------------------------------
         ghcide,
-        ghc-typelits-knownnat,
         lsp,
         lsp-types,
         hls-plugin-api,
@@ -393,16 +376,18 @@ test-suite ghcide-tests
       build-depends:
           record-dot-preprocessor,
           record-hasfield
+    if impl(ghc < 9.3)
+       build-depends:  ghc-typelits-knownnat
     hs-source-dirs: test/cabal test/exe test/src bench/lib
     ghc-options: -threaded -Wall -Wno-name-shadowing -O0 -Wno-unticked-promoted-constructors
     main-is: Main.hs
     other-modules:
-        Development.IDE.Test
-        Development.IDE.Test.Diagnostic
         Development.IDE.Test.Runfiles
         FuzzySearch
         Progress
         HieDbRetry
+        Development.IDE.Test
+        Development.IDE.Test.Diagnostic
     default-extensions:
         BangPatterns
         DeriveFunctor
diff --git a/ghcide/session-loader/Development/IDE/Session.hs b/ghcide/session-loader/Development/IDE/Session.hs
index 4a3e932025c..da0a7dd5e32 100644
--- a/ghcide/session-loader/Development/IDE/Session.hs
+++ b/ghcide/session-loader/Development/IDE/Session.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE ExistentialQuantification #-}
 {-# LANGUAGE RankNTypes                #-}
 {-# LANGUAGE TypeFamilies              #-}
+{-# LANGUAGE CPP                       #-}
 
 {-|
 The logic for setting up a ghcide session by tapping into hie-bios.
@@ -100,6 +101,9 @@ import           HieDb.Types
 import           HieDb.Utils
 import qualified System.Random                        as Random
 import           System.Random                        (RandomGen)
+import Control.Monad.IO.Unlift (MonadUnliftIO)
+import Control.Exception (evaluate)
+import Control.DeepSeq
 
 data Log
   = LogSettingInitialDynFlags
@@ -208,11 +212,13 @@ data SessionLoadingOptions = SessionLoadingOptions
   , getCacheDirs           :: String -> [String] -> IO CacheDirs
   -- | Return the GHC lib dir to use for the 'unsafeGlobalDynFlags'
   , getInitialGhcLibDir    :: Recorder (WithPriority Log) -> FilePath -> IO (Maybe LibDir)
+#if !MIN_VERSION_ghc(9,3,0)
   , fakeUid                :: UnitId
     -- ^ unit id used to tag the internal component built by ghcide
     --   To reuse external interface files the unit ids must match,
     --   thus make sure to build them with `--this-unit-id` set to the
     --   same value as the ghcide fake uid
+#endif
   }
 
 instance Default SessionLoadingOptions where
@@ -221,7 +227,9 @@ instance Default SessionLoadingOptions where
         ,loadCradle = loadWithImplicitCradle
         ,getCacheDirs = getCacheDirsDefault
         ,getInitialGhcLibDir = getInitialGhcLibDirDefault
+#if !MIN_VERSION_ghc(9,3,0)
         ,fakeUid = Compat.toUnitId (Compat.stringToUnit "main")
+#endif
         }
 
 -- | Find the cradle for a given 'hie.yaml' configuration.
@@ -494,7 +502,11 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} dir = do
               new_deps' <- forM new_deps $ \RawComponentInfo{..} -> do
                   -- Remove all inplace dependencies from package flags for
                   -- components in this HscEnv
+#if MIN_VERSION_ghc(9,3,0)
+                  let (df2, uids) = (rawComponentDynFlags, [])
+#else
                   let (df2, uids) = removeInplacePackages fakeUid inplace rawComponentDynFlags
+#endif
                   let prefix = show rawComponentUnitId
                   -- See Note [Avoiding bad interface files]
                   let hscComponents = sort $ map show uids
@@ -517,10 +529,14 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} dir = do
               -- that I do not fully understand
               log Info $ LogMakingNewHscEnv inplace
               hscEnv <- emptyHscEnv ideNc libDir
-              newHscEnv <-
+              !newHscEnv <-
                 -- Add the options for the current component to the HscEnv
                 evalGhcEnv hscEnv $ do
-                  _ <- setSessionDynFlags $ setHomeUnitId_ fakeUid df
+                  _ <- setSessionDynFlags
+#if !MIN_VERSION_ghc(9,3,0)
+                          $ setHomeUnitId_ fakeUid
+#endif
+                          df
                   getSession
 
               -- Modify the map so the hieYaml now maps to the newly created
@@ -718,7 +734,11 @@ cradleToOptsAndLibDir recorder cradle file = do
             logWith recorder Info $ LogNoneCradleFound file
             return (Left [])
 
+#if MIN_VERSION_ghc(9,3,0)
+emptyHscEnv :: NameCache -> FilePath -> IO HscEnv
+#else
 emptyHscEnv :: IORef NameCache -> FilePath -> IO HscEnv
+#endif
 emptyHscEnv nc libDir = do
     env <- runGhc (Just libDir) getSession
     initDynLinker env
@@ -757,7 +777,11 @@ toFlagsMap TargetDetails{..} =
     [ (l, (targetEnv, targetDepends)) | l <-  targetLocations]
 
 
+#if MIN_VERSION_ghc(9,3,0)
+setNameCache :: NameCache -> HscEnv -> HscEnv
+#else
 setNameCache :: IORef NameCache -> HscEnv -> HscEnv
+#endif
 setNameCache nc hsc = hsc { hsc_NC = nc }
 
 -- | Create a mapping from FilePaths to HscEnvEqs
@@ -773,6 +797,11 @@ newComponentCache
 newComponentCache recorder exts cradlePath cfp hsc_env uids ci = do
     let df = componentDynFlags ci
     hscEnv' <-
+#if MIN_VERSION_ghc(9,3,0)
+      -- Set up a multi component session with the other units on GHC 9.4
+        Compat.initUnits (map snd uids) (hscSetFlags df hsc_env)
+#elif MIN_VERSION_ghc(9,2,0)
+      -- This initializes the units for GHC 9.2
       -- Add the options for the current component to the HscEnv
       -- We want to call `setSessionDynFlags` instead of `hscSetFlags`
       -- because `setSessionDynFlags` also initializes the package database,
@@ -782,7 +811,10 @@ newComponentCache recorder exts cradlePath cfp hsc_env uids ci = do
       evalGhcEnv hsc_env $ do
         _ <- setSessionDynFlags $ df
         getSession
-
+#else
+      -- getOptions is enough to initialize units on GHC <9.2
+      pure $ hscSetFlags df hsc_env { hsc_IC = (hsc_IC hsc_env) { ic_dflags = df } }
+#endif
 
     let newFunc = maybe newHscEnvEqPreserveImportPaths newHscEnvEq cradlePath
     henv <- newFunc hscEnv' uids
@@ -790,6 +822,7 @@ newComponentCache recorder exts cradlePath cfp hsc_env uids ci = do
         targetDepends = componentDependencyInfo ci
         res = (targetEnv, targetDepends)
     logWith recorder Debug $ LogNewComponentCache res
+    evaluate $ liftRnf rwhnf $ componentTargets ci
 
     let mk t = fromTargetId (importPaths df) exts (targetId t) targetEnv targetDepends
     ctargets <- concatMapM mk (componentTargets ci)
@@ -998,9 +1031,11 @@ setOptions (ComponentOptions theOpts compRoot _) dflags = do
     -- initPackages parses the -package flags and
     -- sets up the visibility for each component.
     -- Throws if a -package flag cannot be satisfied.
-    env <- hscSetFlags dflags'' <$> getSession
-    final_env' <- liftIO $ wrapPackageSetupException $ Compat.initUnits env
-    return (hsc_dflags final_env', targets)
+    -- This only works for GHC <9.2
+    -- For GHC >= 9.2, we need to modify the unit env in the hsc_dflags, which
+    -- is done later in newComponentCache
+    final_flags <- liftIO $ wrapPackageSetupException $ Compat.oldInitUnits dflags''
+    return (final_flags, targets)
 
 setIgnoreInterfacePragmas :: DynFlags -> DynFlags
 setIgnoreInterfacePragmas df =
diff --git a/ghcide/src/Development/IDE/Core/Compile.hs b/ghcide/src/Development/IDE/Core/Compile.hs
index 2430ec719a0..e6094a470d8 100644
--- a/ghcide/src/Development/IDE/Core/Compile.hs
+++ b/ghcide/src/Development/IDE/Core/Compile.hs
@@ -63,6 +63,7 @@ import           Data.IORef
 import           Data.List.Extra
 import           Data.Map                          (Map)
 import qualified Data.Map.Strict                   as Map
+import qualified Data.Set                          as Set
 import           Data.Maybe
 import qualified Data.Text                         as T
 import           Data.Time                         (UTCTime (..))
@@ -220,7 +221,12 @@ captureSplicesAndDeps TypecheckHelpers{..} env k = do
     -- names in the compiled bytecode, recording the modules that those names
     -- come from in the IORef,, as these are the modules on whose implementation
     -- we depend.
-    compile_bco_hook :: IORef (ModuleEnv BS.ByteString) -> HscEnv -> SrcSpan -> CoreExpr -> IO ForeignHValue
+    compile_bco_hook :: IORef (ModuleEnv BS.ByteString) -> HscEnv -> SrcSpan -> CoreExpr
+#if MIN_VERSION_ghc(9,3,0)
+                     -> IO (ForeignHValue, [Linkable], PkgsLoaded)
+#else
+                     -> IO ForeignHValue
+#endif
     compile_bco_hook var hsc_env srcspan ds_expr
       = do { let dflags = hsc_dflags hsc_env
 
@@ -241,13 +247,21 @@ captureSplicesAndDeps TypecheckHelpers{..} env k = do
            ; let iNTERACTIVELoc = G.ModLocation{ ml_hs_file   = Nothing,
                                         ml_hi_file   = panic "hscCompileCoreExpr':ml_hi_file",
                                         ml_obj_file  = panic "hscCompileCoreExpr':ml_obj_file",
-                                        ml_hie_file  = panic "hscCompileCoreExpr':ml_hie_file" }
+#if MIN_VERSION_ghc(9,3,0)
+                                        ml_dyn_obj_file = panic "hscCompileCoreExpr':ml_dyn_obj_file",
+                                        ml_dyn_hi_file  = panic "hscCompileCoreExpr':ml_dyn_hi_file",
+#endif
+                                        ml_hie_file  = panic "hscCompileCoreExpr':ml_hie_file"
+                                        }
            ; let ictxt = hsc_IC hsc_env
 
            ; (binding_id, stg_expr, _, _) <-
                myCoreToStgExpr (hsc_logger hsc_env)
                                (hsc_dflags hsc_env)
                                ictxt
+#if MIN_VERSION_ghc(9,3,0)
+                               True -- for bytecode
+#endif
                                (icInteractiveModule ictxt)
                                iNTERACTIVELoc
                                prepd_expr
@@ -269,7 +283,13 @@ captureSplicesAndDeps TypecheckHelpers{..} env k = do
             -- by default, so we can safely ignore them here.
 
             -- Find the linkables for the modules we need
-           ; let needed_mods = mkUniqSet [ moduleName mod
+           ; let needed_mods = mkUniqSet [
+#if MIN_VERSION_ghc(9,3,0)
+                                           mod -- We need the whole module for 9.4 because of multiple home units modules may have different unit ids
+#else
+                                           moduleName mod -- On <= 9.2, just the name is enough because all unit ids will be the same
+#endif
+
 #if MIN_VERSION_ghc(9,2,0)
                                          | n <- concatMap (uniqDSetToList . bcoFreeNames) $ bc_bcos bcos
 #else
@@ -277,32 +297,50 @@ captureSplicesAndDeps TypecheckHelpers{..} env k = do
 #endif
                                          , Just mod <- [nameModule_maybe n] -- Names from other modules
                                          , not (isWiredInName n) -- Exclude wired-in names
-                                         , moduleUnitId mod == uid -- Only care about stuff from the home package
+                                         , moduleUnitId mod `elem` home_unit_ids -- Only care about stuff from the home package set
                                          ]
-                 hpt = hsc_HPT hsc_env
-                 uid = homeUnitId_ dflags
-                 mods_transitive = getTransitiveMods hpt needed_mods
-                  -- Non det OK as we will put it into maps later anyway
-                 mods_transitive_list = nonDetEltsUniqSet mods_transitive
+                 home_unit_ids =
+#if MIN_VERSION_ghc(9,3,0)
+                    map fst (hugElts $ hsc_HUG hsc_env)
+#else
+                    [homeUnitId_ dflags]
+#endif
+                 mods_transitive = getTransitiveMods hsc_env needed_mods
 
-           ; lbs <- getLinkables [toNormalizedFilePath' file | mod <- mkHomeModule
-#if MIN_VERSION_ghc(9,0,0)
-                                                                      (hscHomeUnit hsc_env)
+                 -- If we don't support multiple home units, ModuleNames are sufficient because all the units will be the same
+                 mods_transitive_list = 
+#if MIN_VERSION_ghc(9,3,0)
+                                         mapMaybe nodeKeyToInstalledModule $ Set.toList mods_transitive
 #else
-                                                                      uid
+                                        -- Non det OK as we will put it into maps later anyway
+                                         map (Compat.installedModule (homeUnitId_ dflags)) $ nonDetEltsUniqSet mods_transitive
 #endif
-                                                                      <$> mods_transitive_list
-                                                             , let ms   = fromJust $ mgLookupModule (hsc_mod_graph hsc_env) mod
-                                                             , let file = fromJust $ ml_hs_file $ ms_location ms
-                                                             ]
-           ; let hsc_env' = hsc_env { hsc_HPT = addListToHpt hpt [(moduleName $ mi_module $ hm_iface hm, hm) | lb <- lbs, let hm = linkableHomeMod lb] }
+
+#if MIN_VERSION_ghc(9,3,0)
+           ; moduleLocs <- readIORef (fcModuleCache $ hsc_FC hsc_env)
+#else
+           ; moduleLocs <- readIORef (hsc_FC hsc_env)
+#endif
+           ; lbs <- getLinkables [toNormalizedFilePath' file
+                                 | mod <- mods_transitive_list
+                                 , let ifr = fromJust $ lookupInstalledModuleEnv moduleLocs mod
+                                       file = case ifr of
+                                         InstalledFound loc _ ->
+                                           fromJust $ ml_hs_file loc
+                                         _ -> panic "hscCompileCoreExprHook: module not found"
+                                 ]
+           ; let hsc_env' = loadModulesHome (map linkableHomeMod lbs) hsc_env
 
              -- Essential to do this here after we load the linkables
            ; keep_lbls <- getLinkablesToKeep
 
            ; unload hsc_env' $ map (\(mod, time) -> LM time mod []) $ moduleEnvToList keep_lbls
 
-#if MIN_VERSION_ghc(9,2,0)
+#if MIN_VERSION_ghc(9,3,0)
+             {- load it -}
+           ; (fv_hvs, lbss, pkgs) <- loadDecls (hscInterp hsc_env') hsc_env' srcspan bcos
+           ; let hval = ((expectJust "hscCompileCoreExpr'" $ lookup (idName binding_id) fv_hvs), lbss, pkgs)
+#elif MIN_VERSION_ghc(9,2,0)
              {- load it -}
            ; fv_hvs <- loadDecls (hscInterp hsc_env') hsc_env' srcspan bcos
            ; let hval = (expectJust "hscCompileCoreExpr'" $ lookup (idName binding_id) fv_hvs)
@@ -314,9 +352,26 @@ captureSplicesAndDeps TypecheckHelpers{..} env k = do
            ; modifyIORef' var (flip extendModuleEnvList [(mi_module $ hm_iface hm, linkableHash lb) | lb <- lbs, let hm = linkableHomeMod lb])
            ; return hval }
 
+#if MIN_VERSION_ghc(9,3,0)
+    -- TODO: support backpack
+    nodeKeyToInstalledModule :: NodeKey -> Maybe InstalledModule
+    nodeKeyToInstalledModule (NodeKey_Module (ModNodeKeyWithUid (GWIB mod _) uid)) = Just $ mkModule uid mod
+    nodeKeyToInstalledModule _ = Nothing
+    moduleToNodeKey :: Module -> NodeKey
+    moduleToNodeKey mod = NodeKey_Module $ ModNodeKeyWithUid (GWIB (moduleName mod) NotBoot) (moduleUnitId mod)
+#endif
+
     -- Compute the transitive set of linkables required
-    getTransitiveMods hpt needed_mods = go emptyUniqSet needed_mods
+    getTransitiveMods hsc_env needed_mods 
+#if MIN_VERSION_ghc(9,3,0)
+      = Set.unions (Set.fromList (map moduleToNodeKey mods) : [ dep | m <- mods
+                                                              , Just dep <- [Map.lookup (moduleToNodeKey m) (mgTransDeps (hsc_mod_graph hsc_env))]
+                                                              ])
+      where mods = nonDetEltsUniqSet needed_mods -- OK because we put them into a set immediately after
+#else
+      = go emptyUniqSet needed_mods
       where
+        hpt = hsc_HPT hsc_env
         go seen new
           | isEmptyUniqSet new = seen
           | otherwise = go seen' new'
@@ -325,8 +380,7 @@ captureSplicesAndDeps TypecheckHelpers{..} env k = do
               new'  = new_deps `minusUniqSet` seen'
               new_deps = unionManyUniqSets [ mkUniqSet $ getDependentMods $ hm_iface mod_info
                                            | mod_info <- eltsUDFM $ udfmIntersectUFM hpt (getUniqSet new)]
-
-
+#endif
 
     -- | Add a Hook to the DynFlags which captures and returns the
     -- typechecked splices before they are run. This information
@@ -390,11 +444,7 @@ mkHiFileResultNoCompile session tcm = do
       tcGblEnv = tmrTypechecked tcm
   details <- makeSimpleDetails hsc_env_tmp tcGblEnv
   sf <- finalSafeMode (ms_hspp_opts ms) tcGblEnv
-#if MIN_VERSION_ghc(8,10,0)
-  iface <- mkIfaceTc hsc_env_tmp sf details tcGblEnv
-#else
-  (iface, _) <- mkIfaceTc hsc_env_tmp Nothing sf details tcGblEnv
-#endif
+  iface <- mkIfaceTc hsc_env_tmp sf details ms tcGblEnv
   pure $! mkHiFileResult ms iface details (tmrRuntimeModules tcm) Nothing
 
 mkHiFileResultCompile
@@ -416,12 +466,22 @@ mkHiFileResultCompile se session' tcm simplified_guts = catchErrs $ do
     else do
         -- write core file
         -- give variables unique OccNames
-        (guts, details) <- tidyProgram session simplified_guts
+        tidy_opts <- initTidyOpts session
+        (guts, details) <- tidyProgram tidy_opts simplified_guts
         pure (details, Just guts)
 
 #if MIN_VERSION_ghc(9,0,1)
-  let !partial_iface = force (mkPartialIface session details simplified_guts)
+  let !partial_iface = force $ mkPartialIface session details
+#if MIN_VERSION_ghc(9,3,0)
+                                              ms
+#endif
+                                              simplified_guts
+
   final_iface <- mkFullIface session partial_iface Nothing
+#if MIN_VERSION_ghc(9,4,2)
+                    Nothing
+#endif
+
 #elif MIN_VERSION_ghc(8,10,0)
   let !partial_iface = force (mkPartialIface session details simplified_guts)
   final_iface <- mkFullIface session partial_iface
@@ -464,8 +524,18 @@ mkHiFileResultCompile se session' tcm simplified_guts = catchErrs $ do
 
       -- Run corePrep first as we want to test the final version of the program that will
       -- get translated to STG/Bytecode
-      (prepd_binds , _) <- corePrepPgm session mod (ms_location ms) unprep_binds data_tycons
-      (prepd_binds', _) <- corePrepPgm session mod (ms_location ms) unprep_binds' data_tycons
+#if MIN_VERSION_ghc(9,3,0)
+      prepd_binds
+#else
+      (prepd_binds , _)
+#endif
+        <- corePrepPgm session mod (ms_location ms) unprep_binds data_tycons
+#if MIN_VERSION_ghc(9,3,0)
+      prepd_binds'
+#else
+      (prepd_binds', _)
+#endif
+        <- corePrepPgm session mod (ms_location ms) unprep_binds' data_tycons
       let binds  = noUnfoldings $ (map flattenBinds . (:[])) $ prepd_binds
           binds' = noUnfoldings $ (map flattenBinds . (:[])) $ prepd_binds'
 
@@ -552,9 +622,17 @@ generateObjectCode session summary guts = do
                 withWarnings "object" $ \tweak -> do
                       let env' = tweak (hscSetFlags (ms_hspp_opts summary) session)
                           target = platformDefaultBackend (hsc_dflags env')
-                          newFlags = setBackend target $ updOptLevel 0 $ setOutputFile dot_o $ hsc_dflags env'
+                          newFlags = setBackend target $ updOptLevel 0 $ setOutputFile
+#if MIN_VERSION_ghc(9,3,0)
+                              (Just dot_o)
+#else
+                              dot_o
+#endif
+                            $ hsc_dflags env'
                           session' = hscSetFlags newFlags session
-#if MIN_VERSION_ghc(9,0,1)
+#if MIN_VERSION_ghc(9,4,2)
+                      (outputFilename, _mStub, _foreign_files, _cinfos, _stgcinfos) <- hscGenHardCode session' guts
+#elif MIN_VERSION_ghc(9,0,1)
                       (outputFilename, _mStub, _foreign_files, _cinfos) <- hscGenHardCode session' guts
 #else
                       (outputFilename, _mStub, _foreign_files) <- hscGenHardCode session' guts
@@ -565,7 +643,14 @@ generateObjectCode session summary guts = do
                                 summary
 #endif
                                 fp
-                      compileFile session' StopLn (outputFilename, Just (As False))
+                      obj <- compileFile session' driverNoStop (outputFilename, Just (As False))
+#if MIN_VERSION_ghc(9,3,0)
+                      case obj of
+                        Nothing -> throwGhcExceptionIO $ Panic "compileFile didn't generate object code"
+                        Just x -> pure x
+#else
+                      return obj
+#endif
               let unlinked = DotO dot_o_fp
               -- Need time to be the modification time for recompilation checking
               t <- liftIO $ getModificationTime dot_o_fp
@@ -614,10 +699,17 @@ update_pm_mod_summary :: (ModSummary -> ModSummary) -> ParsedModule -> ParsedMod
 update_pm_mod_summary up pm =
   pm{pm_mod_summary = up $ pm_mod_summary pm}
 
+#if MIN_VERSION_ghc(9,3,0)
+unDefer :: (Maybe DiagnosticReason, FileDiagnostic) -> (Bool, FileDiagnostic)
+unDefer (Just (WarningWithFlag Opt_WarnDeferredTypeErrors)         , fd) = (True, upgradeWarningToError fd)
+unDefer (Just (WarningWithFlag Opt_WarnTypedHoles)                 , fd) = (True, upgradeWarningToError fd)
+unDefer (Just (WarningWithFlag Opt_WarnDeferredOutOfScopeVariables), fd) = (True, upgradeWarningToError fd)
+#else
 unDefer :: (WarnReason, FileDiagnostic) -> (Bool, FileDiagnostic)
 unDefer (Reason Opt_WarnDeferredTypeErrors         , fd) = (True, upgradeWarningToError fd)
 unDefer (Reason Opt_WarnTypedHoles                 , fd) = (True, upgradeWarningToError fd)
 unDefer (Reason Opt_WarnDeferredOutOfScopeVariables, fd) = (True, upgradeWarningToError fd)
+#endif
 unDefer ( _                                        , fd) = (False, fd)
 
 upgradeWarningToError :: FileDiagnostic -> FileDiagnostic
@@ -626,10 +718,15 @@ upgradeWarningToError (nfp, sh, fd) =
   warn2err :: T.Text -> T.Text
   warn2err = T.intercalate ": error:" . T.splitOn ": warning:"
 
+#if MIN_VERSION_ghc(9,3,0)
+hideDiag :: DynFlags -> (Maybe DiagnosticReason, FileDiagnostic) -> (Maybe DiagnosticReason, FileDiagnostic)
+hideDiag originalFlags (w@(Just (WarningWithFlag warning)), (nfp, _sh, fd))
+#else
 hideDiag :: DynFlags -> (WarnReason, FileDiagnostic) -> (WarnReason, FileDiagnostic)
-hideDiag originalFlags (Reason warning, (nfp, _sh, fd))
+hideDiag originalFlags (w@(Reason warning), (nfp, _sh, fd))
+#endif
   | not (wopt warning originalFlags)
-  = (Reason warning, (nfp, HideDiag, fd))
+  = (w, (nfp, HideDiag, fd))
 hideDiag _originalFlags t = t
 
 -- | Warnings which lead to a diagnostic tag
@@ -650,10 +747,15 @@ unnecessaryDeprecationWarningFlags
     ]
 
 -- | Add a unnecessary/deprecated tag to the required diagnostics.
+#if MIN_VERSION_ghc(9,3,0)
+tagDiag :: (Maybe DiagnosticReason, FileDiagnostic) -> (Maybe DiagnosticReason, FileDiagnostic)
+tagDiag (w@(Just (WarningWithFlag warning)), (nfp, sh, fd))
+#else
 tagDiag :: (WarnReason, FileDiagnostic) -> (WarnReason, FileDiagnostic)
-tagDiag (Reason warning, (nfp, sh, fd))
+tagDiag (w@(Reason warning), (nfp, sh, fd))
+#endif
   | Just tag <- requiresTag warning
-  = (Reason warning, (nfp, sh, fd { _tags = addTag tag (_tags fd) }))
+  = (w, (nfp, sh, fd { _tags = addTag tag (_tags fd) }))
   where
     requiresTag :: WarningFlag -> Maybe DiagnosticTag
     requiresTag Opt_WarnWarningsDeprecations
@@ -695,7 +797,12 @@ generateHieAsts hscEnv tcm =
         insts = tcg_insts ts :: [ClsInst]
         tcs = tcg_tcs ts :: [TyCon]
     run ts $
-      Just <$> GHC.enrichHie (fake_splice_binds `Util.unionBags` real_binds) (tmrRenamed tcm) top_ev_binds insts tcs
+#if MIN_VERSION_ghc(9,3,0)
+      pure $ Just $
+#else
+      Just <$>
+#endif
+          GHC.enrichHie (fake_splice_binds `Util.unionBags` real_binds) (tmrRenamed tcm) top_ev_binds insts tcs
 #else
     Just <$> GHC.enrichHie (fake_splice_binds `Util.unionBags` real_binds) (tmrRenamed tcm)
 #endif
@@ -703,7 +810,7 @@ generateHieAsts hscEnv tcm =
     dflags = hsc_dflags hscEnv
 #if MIN_VERSION_ghc(9,0,0)
     run ts =
-#if MIN_VERSION_ghc(9,2,0)
+#if MIN_VERSION_ghc(9,2,0) && !MIN_VERSION_ghc(9,3,0)
         fmap (join . snd) . liftIO . initDs hscEnv ts
 #else
         id
@@ -905,18 +1012,64 @@ loadModulesHome
     -> HscEnv
     -> HscEnv
 loadModulesHome mod_infos e =
+#if MIN_VERSION_ghc(9,3,0)
+  hscUpdateHUG (\hug -> foldr addHomeModInfoToHug hug mod_infos) (e { hsc_type_env_vars = emptyKnotVars })
+#else
   let !new_modules = addListToHpt (hsc_HPT e) [(mod_name x, x) | x <- mod_infos]
   in e { hsc_HPT = new_modules
-      , hsc_type_env_var = Nothing }
+       , hsc_type_env_var = Nothing
+       }
     where
       mod_name = moduleName . mi_module . hm_iface
+#endif
 
 -- Merge the HPTs, module graphs and FinderCaches
-mergeEnvs :: HscEnv -> [ModSummary] -> [HomeModInfo] -> [HscEnv] -> IO HscEnv
-mergeEnvs env extraModSummaries extraMods envs = do
+-- See Note [GhcSessionDeps] in Development.IDE.Core.Rules
+-- Add the current ModSummary to the graph, along with the
+-- HomeModInfo's of all direct dependencies (by induction hypothesis all
+-- transitive dependencies will be contained in envs)
+#if MIN_VERSION_ghc(9,3,0)
+mergeEnvs :: HscEnv -> (ModSummary, [NodeKey]) -> [HomeModInfo] -> [HscEnv] -> IO HscEnv
+mergeEnvs env (ms, deps) extraMods envs = do
+    let im  = Compat.installedModule (toUnitId $ moduleUnit $ ms_mod ms) (moduleName (ms_mod ms))
+        ifr = InstalledFound (ms_location ms) im
+        curFinderCache = Compat.extendInstalledModuleEnv Compat.emptyInstalledModuleEnv im ifr
+        -- Very important to force this as otherwise the hsc_mod_graph field is not
+        -- forced and ends up retaining a reference to all the old hsc_envs we have merged to get
+        -- this new one, which in turn leads to the EPS referencing the HPT.
+        module_graph_nodes =
+          nubOrdOn mkNodeKey (ModuleNode deps ms : concatMap (mgModSummaries' . hsc_mod_graph) envs)
+
+    newFinderCache <- concatFC curFinderCache (map hsc_FC envs)
+    liftRnf rwhnf module_graph_nodes `seq` (return $ loadModulesHome extraMods $
+      let newHug = foldl' mergeHUG (hsc_HUG env) (map hsc_HUG envs) in
+      (hscUpdateHUG (const newHug) env){
+          hsc_FC = newFinderCache,
+          hsc_mod_graph = mkModuleGraph module_graph_nodes
+      })
+
+    where
+        mergeHUG (UnitEnvGraph a) (UnitEnvGraph b) = UnitEnvGraph $ Map.unionWith mergeHUE a b
+        mergeHUE a b = a { homeUnitEnv_hpt = mergeUDFM (homeUnitEnv_hpt a) (homeUnitEnv_hpt b) }
+        mergeUDFM = plusUDFM_C combineModules
+
+        combineModules a b
+          | HsSrcFile <- mi_hsc_src (hm_iface a) = a
+          | otherwise = b
+        concatFC :: FinderCacheState -> [FinderCache] -> IO FinderCache
+        concatFC cur xs = do
+          fcModules <- mapM (readIORef . fcModuleCache) xs
+          fcFiles <- mapM (readIORef . fcFileCache) xs
+          fcModules' <- newIORef $! foldl' (plusInstalledModuleEnv const) cur fcModules
+          fcFiles' <- newIORef $! Map.unions fcFiles
+          pure $ FinderCache fcModules' fcFiles'
+
+#else
+mergeEnvs :: HscEnv -> ModSummary -> [HomeModInfo] -> [HscEnv] -> IO HscEnv
+mergeEnvs env ms extraMods envs = do
     prevFinderCache <- concatFC <$> mapM (readIORef . hsc_FC) envs
-    let ims  = map (\ms -> Compat.installedModule (toUnitId $ moduleUnit $ ms_mod ms)  (moduleName (ms_mod ms))) extraModSummaries
-        ifrs = zipWith (\ms -> InstalledFound (ms_location ms)) extraModSummaries ims
+    let im  = Compat.installedModule (toUnitId $ moduleUnit $ ms_mod ms) (moduleName (ms_mod ms))
+        ifr = InstalledFound (ms_location ms) im
         -- Very important to force this as otherwise the hsc_mod_graph field is not
         -- forced and ends up retaining a reference to all the old hsc_envs we have merged to get
         -- this new one, which in turn leads to the EPS referencing the HPT.
@@ -927,17 +1080,16 @@ mergeEnvs env extraModSummaries extraMods envs = do
         -- This may have to change in the future.
           map extendModSummaryNoDeps $
 #endif
-          extraModSummaries ++ nubOrdOn ms_mod (concatMap (mgModSummaries . hsc_mod_graph) envs)
-
-    newFinderCache <- newIORef $
-            foldl'
-                (\fc (im, ifr) -> Compat.extendInstalledModuleEnv fc im ifr) prevFinderCache
-                $ zip ims ifrs
-    liftRnf rwhnf module_graph_nodes `seq` (return $ loadModulesHome extraMods $ env{
-        hsc_HPT = foldMapBy mergeUDFM emptyUDFM hsc_HPT envs,
-        hsc_FC = newFinderCache,
-        hsc_mod_graph = mkModuleGraph module_graph_nodes
-    })
+          nubOrdOn ms_mod (ms : concatMap (mgModSummaries . hsc_mod_graph) envs)
+
+    newFinderCache <- newIORef $! Compat.extendInstalledModuleEnv prevFinderCache im ifr
+    liftRnf rwhnf module_graph_nodes `seq` (return $ loadModulesHome extraMods $
+      env{
+          hsc_HPT = foldMapBy mergeUDFM emptyUDFM hsc_HPT envs,
+          hsc_FC = newFinderCache,
+          hsc_mod_graph = mkModuleGraph module_graph_nodes
+      })
+
     where
         mergeUDFM = plusUDFM_C combineModules
         combineModules a b
@@ -950,6 +1102,7 @@ mergeEnvs env extraModSummaries extraMods envs = do
     -- To remove this, I plan to upstream the missing Monoid instance
         concatFC :: [FinderCache] -> FinderCache
         concatFC = unsafeCoerce (mconcat @(Map InstalledModule InstalledFindResult))
+#endif
 
 withBootSuffix :: HscSource -> ModLocation -> ModLocation
 withBootSuffix HsBootFile = addBootSuffixLocnOut
@@ -978,26 +1131,45 @@ getModSummaryFromImports env fp modTime contents = do
         (src_idecls, ord_idecls) = partition ((== IsBoot) . ideclSource.unLoc) imps
 
         -- GHC.Prim doesn't exist physically, so don't go looking for it.
-        ordinary_imps = filter ((/= moduleName gHC_PRIM) . unLoc
-                                . ideclName . unLoc)
-                               ord_idecls
+        (ordinary_imps, ghc_prim_imports)
+          = partition ((/= moduleName gHC_PRIM) . unLoc
+                      . ideclName . unLoc)
+                      ord_idecls
 
         implicit_prelude = xopt LangExt.ImplicitPrelude dflags
         implicit_imports = mkPrelImports mod main_loc
                                          implicit_prelude imps
 
-        convImport (L _ i) = (fmap sl_fs (ideclPkgQual i)
-                                         , reLoc $ ideclName i)
 
+        convImport (L _ i) = (
+#if !MIN_VERSION_ghc (9,3,0)
+                               fmap sl_fs
+#endif
+                               (ideclPkgQual i)
+                             , reLoc $ ideclName i)
+
+        msrImports = implicit_imports ++ imps
+
+#if MIN_VERSION_ghc (9,3,0)
+        rn_pkg_qual = renameRawPkgQual (hsc_unit_env env)
+        rn_imps = fmap (\(pk, lmn@(L _ mn)) -> (rn_pkg_qual mn pk, lmn))
+        srcImports = rn_imps $ map convImport src_idecls
+        textualImports = rn_imps $ map convImport (implicit_imports ++ ordinary_imps)
+        ghc_prim_import = not (null ghc_prim_imports)
+#else
         srcImports = map convImport src_idecls
         textualImports = map convImport (implicit_imports ++ ordinary_imps)
+#endif
 
-        msrImports = implicit_imports ++ imps
 
     -- Force bits that might keep the string buffer and DynFlags alive unnecessarily
     liftIO $ evaluate $ rnf srcImports
     liftIO $ evaluate $ rnf textualImports
 
+#if MIN_VERSION_ghc (9,3,0)
+    !src_hash <- liftIO $ fingerprintFromStringBuffer contents
+#endif
+
     modLoc <- liftIO $ if mod == mAIN_NAME
         -- specially in tests it's common to have lots of nameless modules
         -- mkHomeModLocation will map them to the same hi/hie locations
@@ -1012,7 +1184,14 @@ getModSummaryFromImports env fp modTime contents = do
 #if MIN_VERSION_ghc(8,8,0)
                 , ms_hie_date     = Nothing
 #endif
+#if MIN_VERSION_ghc(9,3,0)
+                , ms_dyn_obj_date    = Nothing
+                , ms_ghc_prim_import = ghc_prim_import
+                , ms_hs_hash      = src_hash
+
+#else
                 , ms_hs_date      = modTime
+#endif
                 , ms_hsc_src      = sourceType
                 -- The contents are used by the GetModSummary rule
                 , ms_hspp_buf     = Just contents
@@ -1036,7 +1215,14 @@ getModSummaryFromImports env fp modTime contents = do
                   put $ Util.uniq $ moduleNameFS $ moduleName ms_mod
                   forM_ (ms_srcimps ++ ms_textual_imps) $ \(mb_p, m) -> do
                     put $ Util.uniq $ moduleNameFS $ unLoc m
+#if MIN_VERSION_ghc(9,3,0)
+                    case mb_p of
+                      G.NoPkgQual -> pure ()
+                      G.ThisPkg uid  -> put $ getKey $ getUnique uid
+                      G.OtherPkg uid -> put $ getKey $ getUnique uid
+#else
                     whenJust mb_p $ put . Util.uniq
+#endif
             return $! Util.fingerprintFingerprints $
                     [ Util.fingerprintString fp
                     , fingerPrintImports
@@ -1130,7 +1316,12 @@ parseFileContents env customPreprocessor filename ms = do
                --   - filter out the .hs/.lhs source filename if we have one
                --
                let n_hspp  = normalise filename
-                   srcs0 = nubOrd $ filter (not . (tmpDir dflags `isPrefixOf`))
+#if MIN_VERSION_ghc(9,3,0)
+                   TempDir tmp_dir = tmpDir dflags
+#else
+                   tmp_dir = tmpDir dflags
+#endif
+                   srcs0 = nubOrd $ filter (not . (tmp_dir `isPrefixOf`))
                                   $ filter (/= n_hspp)
                                   $ map normalise
                                   $ filter (not . isPrefixOf "<")
@@ -1272,7 +1463,13 @@ loadInterface session ms linkableNeeded RecompilationInfo{..} = do
     -- If mb_old_iface is nothing then checkOldIface will load it for us
     -- given that the source is unmodified
     (recomp_iface_reqd, mb_checked_iface)
+#if MIN_VERSION_ghc(9,3,0)
+      <- liftIO $ checkOldIface sessionWithMsDynFlags ms mb_old_iface >>= \case
+        UpToDateItem x -> pure (UpToDate, Just x)
+        OutOfDateItem reason x -> pure (NeedsRecompile reason, x)
+#else
       <- liftIO $ checkOldIface sessionWithMsDynFlags ms sourceMod mb_old_iface
+#endif
 
     let do_regenerate _reason = withTrace "regenerate interface" $ \setTag -> do
           setTag "Module" $ moduleNameString $ moduleName mod
@@ -1309,14 +1506,14 @@ loadInterface session ms linkableNeeded RecompilationInfo{..} = do
                      readBinCoreFile (mkUpdater $ hsc_NC session) core_file
                    if cf_iface_hash == getModuleHash iface
                    then return ([], Just $ mkHiFileResult ms iface details runtime_deps (Just (core_file, fingerprintToBS core_hash)))
-                   else do_regenerate (RecompBecause "Core file out of date (doesn't match iface hash)")
+                   else do_regenerate (recompBecause "Core file out of date (doesn't match iface hash)")
                  | otherwise -> return ([], Just $ mkHiFileResult ms iface details runtime_deps Nothing)
                  where handleErrs = flip catches
-                         [Handler $ \(e :: IOException) -> do_regenerate (RecompBecause $ "Reading core file failed (" ++ show e ++ ")")
+                         [Handler $ \(e :: IOException) -> do_regenerate (recompBecause $ "Reading core file failed (" ++ show e ++ ")")
                          ,Handler $ \(e :: GhcException) -> case e of
                             Signal _ -> throw e
                             Panic _  -> throw e
-                            _        -> do_regenerate (RecompBecause $ "Reading core file failed (" ++ show e ++ ")")
+                            _        -> do_regenerate (recompBecause $ "Reading core file failed (" ++ show e ++ ")")
                          ]
       (_, _reason) -> do_regenerate _reason
 
@@ -1351,18 +1548,36 @@ checkLinkableDependencies get_linkable_hashes graph runtime_deps = do
       let out_of_date = [core_file | ((core_file, expected_hash), actual_hash) <- zip fs store_hashes, expected_hash /= actual_hash]
       case out_of_date of
         [] -> pure Nothing
-        _ -> pure $ Just $
-          RecompBecause $ "out of date runtime dependencies: " ++ intercalate ", " (map show out_of_date)
+        _ -> pure $ Just $ recompBecause
+              $ "out of date runtime dependencies: " ++ intercalate ", " (map show out_of_date)
+
+recompBecause =
+#if MIN_VERSION_ghc(9,3,0)
+                NeedsRecompile .
+#endif
+                RecompBecause
+#if MIN_VERSION_ghc(9,3,0)
+              . CustomReason
+#endif
+
+#if MIN_VERSION_ghc(9,3,0)
+data SourceModified = SourceModified | SourceUnmodified deriving (Eq, Ord, Show)
+#endif
 
 showReason :: RecompileRequired -> String
 showReason UpToDate          = "UpToDate"
+#if MIN_VERSION_ghc(9,3,0)
+showReason (NeedsRecompile MustCompile)    = "MustCompile"
+showReason (NeedsRecompile s) = printWithoutUniques s
+#else
 showReason MustCompile       = "MustCompile"
 showReason (RecompBecause s) = s
+#endif
 
 mkDetailsFromIface :: HscEnv -> ModIface -> IO ModDetails
 mkDetailsFromIface session iface = do
   fixIO $ \details -> do
-    let hsc' = session { hsc_HPT = addToHpt (hsc_HPT session) (moduleName $ mi_module iface) (HomeModInfo iface details Nothing) }
+    let hsc' = hscUpdateHPT (\hpt -> addToHpt hpt (moduleName $ mi_module iface) (HomeModInfo iface details Nothing)) session
     initIfaceLoad hsc' (typecheckIface iface)
 
 coreFileToCgGuts :: HscEnv -> ModIface -> ModDetails -> CoreFile -> IO CgGuts
@@ -1371,28 +1586,26 @@ coreFileToCgGuts session iface details core_file = do
                              (HomeModInfo iface details Nothing)
       this_mod = mi_module iface
   types_var <- newIORef (md_types details)
-  let kv = Just (this_mod, types_var)
-      hsc_env' = session { hsc_HPT = act (hsc_HPT session)
-                         , hsc_type_env_var = kv }
+  let hsc_env' = hscUpdateHPT act (session {
+#if MIN_VERSION_ghc(9,3,0)
+        hsc_type_env_vars = knotVarsFromModuleEnv (mkModuleEnv [(this_mod, types_var)])
+#else
+        hsc_type_env_var = Just (this_mod, types_var)
+#endif
+        })
   core_binds <- initIfaceCheck (text "l") hsc_env' $ typecheckCoreFile this_mod types_var core_file
       -- Implicit binds aren't saved, so we need to regenerate them ourselves.
   let implicit_binds = concatMap getImplicitBinds tyCons
       tyCons = typeEnvTyCons (md_types details)
+#if MIN_VERSION_ghc(9,3,0)
+  pure $ CgGuts this_mod tyCons (implicit_binds ++ core_binds) [] NoStubs [] mempty (emptyHpcInfo False) Nothing []
+#else
   pure $ CgGuts this_mod tyCons (implicit_binds ++ core_binds) NoStubs [] [] (emptyHpcInfo False) Nothing []
+#endif
 
 coreFileToLinkable :: LinkableType -> HscEnv -> ModSummary -> ModIface -> ModDetails -> CoreFile -> UTCTime -> IO ([FileDiagnostic], Maybe HomeModInfo)
 coreFileToLinkable linkableType session ms iface details core_file t = do
-  let act hpt = addToHpt hpt (moduleName this_mod)
-                             (HomeModInfo iface details Nothing)
-      this_mod = mi_module iface
-  types_var <- newIORef (md_types details)
-  let kv = Just (this_mod, types_var)
-      hsc_env' = session { hsc_HPT = act (hsc_HPT session)
-                         , hsc_type_env_var = kv }
-  core_binds <- initIfaceCheck (text "l") hsc_env' $ typecheckCoreFile this_mod types_var core_file
-  let implicit_binds = concatMap getImplicitBinds tyCons
-      tyCons = typeEnvTyCons (md_types details)
-  let cgi_guts = CgGuts this_mod tyCons (implicit_binds ++ core_binds) NoStubs [] [] (emptyHpcInfo False) Nothing []
+  cgi_guts <- coreFileToCgGuts session iface details core_file
   (warns, lb) <- case linkableType of
     BCOLinkable    -> generateByteCode (CoreFileTime t) session ms cgi_guts
     ObjectLinkable -> generateObjectCode session ms cgi_guts
@@ -1405,27 +1618,55 @@ getDocsBatch
   :: HscEnv
   -> Module  -- ^ a moudle where the names are in scope
   -> [Name]
+#if MIN_VERSION_ghc(9,3,0)
+  -> IO [Either String (Maybe [HsDoc GhcRn], IntMap (HsDoc GhcRn))]
+#else
   -> IO [Either String (Maybe HsDocString, IntMap HsDocString)]
+#endif
 getDocsBatch hsc_env _mod _names = do
     (msgs, res) <- initTc hsc_env HsSrcFile False _mod fakeSpan $ forM _names $ \name ->
         case nameModule_maybe name of
             Nothing -> return (Left $ NameHasNoModule name)
             Just mod -> do
-             ModIface { mi_doc_hdr = mb_doc_hdr
+             ModIface {
+#if MIN_VERSION_ghc(9,3,0)
+                        mi_docs = Just Docs{ docs_mod_hdr = mb_doc_hdr
+                                      , docs_decls = dmap
+                                      , docs_args = amap
+                                      }
+#else
+                        mi_doc_hdr = mb_doc_hdr
                       , mi_decl_docs = DeclDocMap dmap
                       , mi_arg_docs = ArgDocMap amap
+#endif
                       } <- loadModuleInterface "getModuleInterface" mod
+#if MIN_VERSION_ghc(9,3,0)
+             if isNothing mb_doc_hdr && isNullUniqMap dmap && isNullUniqMap amap
+#else
              if isNothing mb_doc_hdr && Map.null dmap && null amap
+#endif
                then pure (Left (NoDocsInIface mod $ compiled name))
-               else pure (Right ( Map.lookup name dmap ,
+               else pure (Right (
+#if MIN_VERSION_ghc(9,3,0)
+                                  lookupUniqMap dmap name,
+#else
+                                  Map.lookup name dmap ,
+#endif
 #if !MIN_VERSION_ghc(9,2,0)
                                   IntMap.fromAscList $ Map.toAscList $
 #endif
+#if MIN_VERSION_ghc(9,3,0)
+                                  lookupWithDefaultUniqMap amap mempty name))
+#else
                                   Map.findWithDefault mempty name amap))
+#endif
     case res of
-        Just x  -> return $ map (first $ T.unpack . printOutputable) x
+        Just x  -> return $ map (first $ T.unpack . printOutputable)
+                          $ x
         Nothing -> throwErrors
-#if MIN_VERSION_ghc(9,2,0)
+#if MIN_VERSION_ghc(9,3,0)
+                     $ fmap GhcTcRnMessage msgs
+#elif MIN_VERSION_ghc(9,2,0)
                      $ Error.getErrorMessages msgs
 #else
                      $ snd msgs
diff --git a/ghcide/src/Development/IDE/Core/IdeConfiguration.hs b/ghcide/src/Development/IDE/Core/IdeConfiguration.hs
index c3b5323548d..45f6e8c3da0 100644
--- a/ghcide/src/Development/IDE/Core/IdeConfiguration.hs
+++ b/ghcide/src/Development/IDE/Core/IdeConfiguration.hs
@@ -56,8 +56,8 @@ parseConfiguration InitializeParams {..} =
   clientSettings = hashed _initializationOptions
 
 parseWorkspaceFolder :: WorkspaceFolder -> NormalizedUri
-parseWorkspaceFolder =
-  toNormalizedUri . Uri . (_uri :: WorkspaceFolder -> Text)
+parseWorkspaceFolder WorkspaceFolder{_uri} =
+  toNormalizedUri (Uri _uri)
 
 modifyWorkspaceFolders
   :: IdeState -> (HashSet NormalizedUri -> HashSet NormalizedUri) -> IO ()
diff --git a/ghcide/src/Development/IDE/Core/Preprocessor.hs b/ghcide/src/Development/IDE/Core/Preprocessor.hs
index 678471c9c15..08a41b0ed43 100644
--- a/ghcide/src/Development/IDE/Core/Preprocessor.hs
+++ b/ghcide/src/Development/IDE/Core/Preprocessor.hs
@@ -1,5 +1,6 @@
 -- Copyright (c) 2019 The DAML Authors. All rights reserved.
 -- SPDX-License-Identifier: Apache-2.0
+{-# LANGUAGE CPP        #-}
 
 module Development.IDE.Core.Preprocessor
   ( preprocessor
@@ -28,6 +29,10 @@ import           Development.IDE.Types.Location
 import qualified GHC.LanguageExtensions            as LangExt
 import           System.FilePath
 import           System.IO.Extra
+#if MIN_VERSION_ghc(9,3,0)
+import GHC.Utils.Logger (LogFlags(..))
+import GHC.Utils.Outputable (renderWithContext)
+#endif
 
 -- | Given a file and some contents, apply any necessary preprocessors,
 --   e.g. unlit/cpp. Return the resulting buffer and the DynFlags it implies.
@@ -76,10 +81,15 @@ preprocessor env0 filename mbContents = do
   where
     logAction :: IORef [CPPLog] -> LogActionCompat
     logAction cppLogs dflags _reason severity srcSpan _style msg = do
+#if MIN_VERSION_ghc(9,3,0)
+      let log = CPPLog (fromMaybe SevWarning severity) srcSpan $ T.pack $ renderWithContext (log_default_user_context dflags) msg
+#else
       let log = CPPLog severity srcSpan $ T.pack $ showSDoc dflags msg
+#endif
       modifyIORef cppLogs (log :)
 
 
+
 data CPPLog = CPPLog Severity SrcSpan Text
   deriving (Show)
 
@@ -133,7 +143,11 @@ parsePragmasIntoDynFlags
     -> Util.StringBuffer
     -> IO (Either [FileDiagnostic] ([String], DynFlags))
 parsePragmasIntoDynFlags env fp contents = catchSrcErrors dflags0 "pragmas" $ do
+#if MIN_VERSION_ghc(9,3,0)
+    let (_warns,opts) = getOptions (initParserOpts dflags0) contents fp
+#else
     let opts = getOptions dflags0 contents fp
+#endif
 
     -- Force bits that might keep the dflags and stringBuffer alive unnecessarily
     evaluate $ rnf opts
diff --git a/ghcide/src/Development/IDE/Core/Rules.hs b/ghcide/src/Development/IDE/Core/Rules.hs
index e3f1c4aaa31..72313a4661b 100644
--- a/ghcide/src/Development/IDE/Core/Rules.hs
+++ b/ghcide/src/Development/IDE/Core/Rules.hs
@@ -67,6 +67,7 @@ import           Control.Applicative                          (liftA2)
 #endif
 import           Control.Concurrent.Async                     (concurrently)
 import           Control.Concurrent.Strict
+import           Control.DeepSeq
 import           Control.Exception.Safe
 import           Control.Monad.Extra
 import           Control.Monad.Reader
@@ -119,7 +120,6 @@ import           Development.IDE.GHC.Compat                   hiding
 import qualified Development.IDE.GHC.Compat                   as Compat hiding (vcat, nest)
 import qualified Development.IDE.GHC.Compat.Util              as Util
 import           Development.IDE.GHC.Error
-import           Development.IDE.GHC.ExactPrint hiding (LogShake, Log)
 import           Development.IDE.GHC.Util                     hiding
                                                               (modifyDynFlags)
 import           Development.IDE.Graph
@@ -154,12 +154,15 @@ import System.Info.Extra (isWindows)
 import HIE.Bios.Ghc.Gap (hostIsDynamic)
 import Development.IDE.Types.Logger (Recorder, logWith, cmapWithPrio, WithPriority, Pretty (pretty), (<+>), nest, vcat)
 import qualified Development.IDE.Core.Shake as Shake
-import qualified Development.IDE.GHC.ExactPrint as ExactPrint hiding (LogShake)
 import qualified Development.IDE.Types.Logger as Logger
 import qualified Development.IDE.Types.Shake as Shake
 import           Development.IDE.GHC.CoreFile
 import           Data.Time.Clock.POSIX             (posixSecondsToUTCTime, utcTimeToPOSIXSeconds)
 import Control.Monad.IO.Unlift
+#if MIN_VERSION_ghc(9,3,0)
+import GHC.Unit.Module.Graph
+import GHC.Unit.Env
+#endif
 
 data Log
   = LogShake Shake.Log
@@ -167,7 +170,6 @@ data Log
   | LogLoadingHieFile !NormalizedFilePath
   | LogLoadingHieFileFail !FilePath !SomeException
   | LogLoadingHieFileSuccess !FilePath
-  | LogExactPrint ExactPrint.Log
   | LogTypecheckedFOI !NormalizedFilePath
   deriving Show
 
@@ -185,7 +187,6 @@ instance Pretty Log where
           , pretty (displayException e) ]
     LogLoadingHieFileSuccess path ->
       "SUCCEEDED LOADING HIE FILE FOR" <+> pretty path
-    LogExactPrint log -> pretty log
     LogTypecheckedFOI path -> vcat
       [ "Typechecked a file which is not currently open in the editor:" <+> pretty (fromNormalizedFilePath path)
       , "This can indicate a bug which results in excessive memory usage."
@@ -758,6 +759,11 @@ instance Default GhcSessionDepsConfig where
     { checkForImportCycles = True
     }
 
+-- | Note [GhcSessionDeps]
+-- For a file 'Foo', GhcSessionDeps "Foo.hs" results in an HscEnv which includes
+-- 1. HomeModInfo's (in the HUG/HPT) for all modules in the transitive closure of "Foo", **NOT** including "Foo" itself.
+-- 2. ModSummary's (in the ModuleGraph) for all modules in the transitive closure of "Foo", including "Foo" itself.
+-- 3. ModLocation's (in the FinderCache) all modules in the transitive closure of "Foo", including "Foo" itself.
 ghcSessionDepsDefinition
     :: -- | full mod summary
         Bool ->
@@ -770,15 +776,26 @@ ghcSessionDepsDefinition fullModSummary GhcSessionDepsConfig{..} env file = do
         Nothing -> return Nothing
         Just deps -> do
             when checkForImportCycles $ void $ uses_ ReportImportCycles deps
-            mss <- map msrModSummary <$> if fullModSummary
-                then uses_ GetModSummary deps
-                else uses_ GetModSummaryWithoutTimestamps deps
+            ms <- msrModSummary <$> if fullModSummary
+                then use_ GetModSummary file
+                else use_ GetModSummaryWithoutTimestamps file
 
             depSessions <- map hscEnv <$> uses_ (GhcSessionDeps_ fullModSummary) deps
             ifaces <- uses_ GetModIface deps
-
-            let            inLoadOrder = map (\HiFileResult{..} -> HomeModInfo hirModIface hirModDetails Nothing) ifaces
-            session' <- liftIO $ mergeEnvs hsc mss inLoadOrder depSessions
+            let inLoadOrder = map (\HiFileResult{..} -> HomeModInfo hirModIface hirModDetails Nothing) ifaces
+#if MIN_VERSION_ghc(9,3,0)
+            -- On GHC 9.4+, the module graph contains not only ModSummary's but each `ModuleNode` in the graph
+            -- also points to all the direct descendents of the current module. To get the keys for the descendents
+            -- we must get their `ModSummary`s
+            !final_deps <- do
+              dep_mss <- map msrModSummary <$> uses_ GetModSummaryWithoutTimestamps deps
+             -- Don't want to retain references to the entire ModSummary when just the key will do
+              return $!! map (NodeKey_Module . msKey) dep_mss
+            let moduleNode = (ms, final_deps)
+#else
+            let moduleNode = ms
+#endif
+            session' <- liftIO $ mergeEnvs hsc moduleNode inLoadOrder depSessions
 
             Just <$> liftIO (newHscEnvEqWithImportPaths (envImportPaths env) session' [])
 
@@ -884,8 +901,12 @@ getModSummaryRule displayTHWarning recorder = do
                 when (uses_th_qq $ msrModSummary res) $ do
                     DisplayTHWarning act <- getIdeGlobalAction
                     liftIO act
+#if MIN_VERSION_ghc(9,3,0)
+                let bufFingerPrint = ms_hs_hash (msrModSummary res)
+#else
                 bufFingerPrint <- liftIO $
                     fingerprintFromStringBuffer $ fromJust $ ms_hspp_buf $ msrModSummary res
+#endif
                 let fingerPrint = Util.fingerprintFingerprints
                         [ msrFingerprint res, bufFingerPrint ]
                 return ( Just (fingerprintToBS fingerPrint) , ([], Just res))
@@ -896,7 +917,9 @@ getModSummaryRule displayTHWarning recorder = do
         case ms of
             Just res@ModSummaryResult{..} -> do
                 let ms = msrModSummary {
+#if !MIN_VERSION_ghc(9,3,0)
                     ms_hs_date = error "use GetModSummary instead of GetModSummaryWithoutTimestamps",
+#endif
                     ms_hspp_buf = error "use GetModSummary instead of GetModSummaryWithoutTimestamps"
                     }
                     fp = fingerprintToBS msrFingerprint
@@ -1230,7 +1253,6 @@ mainRule recorder RulesConfig{..} = do
       else defineNoDiagnostics (cmapWithPrio LogShake recorder) $ \NeedsCompilation _ -> return $ Just Nothing
     generateCoreRule recorder
     getImportMapRule recorder
-    getAnnotatedParsedSourceRule (cmapWithPrio LogExactPrint recorder)
     persistentHieFileRule recorder
     persistentDocMapRule
     persistentImportMapRule
diff --git a/ghcide/src/Development/IDE/Core/Service.hs b/ghcide/src/Development/IDE/Core/Service.hs
index 8ef090e84e1..9118dc68d74 100644
--- a/ghcide/src/Development/IDE/Core/Service.hs
+++ b/ghcide/src/Development/IDE/Core/Service.hs
@@ -41,6 +41,7 @@ import           Development.IDE.Core.Shake       hiding (Log)
 import qualified Development.IDE.Core.Shake       as Shake
 import           Development.IDE.Types.Monitoring (Monitoring)
 import           Development.IDE.Types.Shake      (WithHieDb)
+import           Ide.Types                        (IdePlugins)
 import           System.Environment               (lookupEnv)
 
 data Log
@@ -61,6 +62,7 @@ instance Pretty Log where
 -- | Initialise the Compiler Service.
 initialise :: Recorder (WithPriority Log)
            -> Config
+           -> IdePlugins IdeState
            -> Rules ()
            -> Maybe (LSP.LanguageContextEnv Config)
            -> Logger
@@ -70,7 +72,7 @@ initialise :: Recorder (WithPriority Log)
            -> IndexQueue
            -> Monitoring
            -> IO IdeState
-initialise recorder defaultConfig mainRule lspEnv logger debouncer options withHieDb hiedbChan metrics = do
+initialise recorder defaultConfig plugins mainRule lspEnv logger debouncer options withHieDb hiedbChan metrics = do
     shakeProfiling <- do
         let fromConf = optShakeProfiling options
         fromEnv <- lookupEnv "GHCIDE_BUILD_PROFILING"
@@ -79,6 +81,7 @@ initialise recorder defaultConfig mainRule lspEnv logger debouncer options withH
         (cmapWithPrio LogShake recorder)
         lspEnv
         defaultConfig
+        plugins
         logger
         debouncer
         shakeProfiling
diff --git a/ghcide/src/Development/IDE/Core/Shake.hs b/ghcide/src/Development/IDE/Core/Shake.hs
index d341838e0a5..0b31b83ac72 100644
--- a/ghcide/src/Development/IDE/Core/Shake.hs
+++ b/ghcide/src/Development/IDE/Core/Shake.hs
@@ -10,6 +10,7 @@
 {-# LANGUAGE RankNTypes                #-}
 {-# LANGUAGE RecursiveDo               #-}
 {-# LANGUAGE TypeFamilies              #-}
+{-# LANGUAGE CPP                       #-}
 
 -- | A Shake implementation of the compiler service.
 --
@@ -129,8 +130,11 @@ import           Development.IDE.GHC.Compat             (NameCache,
                                                          NameCacheUpdater (..),
                                                          initNameCache,
                                                          knownKeyNames,
-                                                         mkSplitUniqSupply,
-                                                         upNameCache)
+#if !MIN_VERSION_ghc(9,3,0)
+                                                         upNameCache,
+#endif
+                                                         mkSplitUniqSupply
+                                                         )
 import           Development.IDE.GHC.Orphans            ()
 import           Development.IDE.Graph                  hiding (ShakeValue)
 import qualified Development.IDE.Graph                  as Shake
@@ -158,7 +162,7 @@ import           GHC.Stack                              (HasCallStack)
 import           HieDb.Types
 import           Ide.Plugin.Config
 import qualified Ide.PluginUtils                        as HLS
-import           Ide.Types                              (PluginId)
+import           Ide.Types                              (PluginId, IdePlugins)
 import           Language.LSP.Diagnostics
 import qualified Language.LSP.Server                    as LSP
 import           Language.LSP.Types
@@ -239,6 +243,7 @@ data ShakeExtras = ShakeExtras
      lspEnv :: Maybe (LSP.LanguageContextEnv Config)
     ,debouncer :: Debouncer NormalizedUri
     ,logger :: Logger
+    ,idePlugins :: IdePlugins IdeState
     ,globals :: TVar (HMap.HashMap TypeRep Dynamic)
       -- ^ Registry of global state used by rules.
       -- Small and immutable after startup, so not worth using an STM.Map.
@@ -261,7 +266,11 @@ data ShakeExtras = ShakeExtras
         -> String
         -> [DelayedAction ()]
         -> IO ()
+#if MIN_VERSION_ghc(9,3,0)
+    ,ideNc :: NameCache
+#else
     ,ideNc :: IORef NameCache
+#endif
     -- | A mapping of module name to known target (or candidate targets, if missing)
     ,knownTargetsVar :: TVar (Hashed KnownTargets)
     -- | A mapping of exported identifiers for local modules. Updated on kick
@@ -552,6 +561,7 @@ seqValue val = case val of
 shakeOpen :: Recorder (WithPriority Log)
           -> Maybe (LSP.LanguageContextEnv Config)
           -> Config
+          -> IdePlugins IdeState
           -> Logger
           -> Debouncer NormalizedUri
           -> Maybe FilePath
@@ -563,15 +573,19 @@ shakeOpen :: Recorder (WithPriority Log)
           -> Monitoring
           -> Rules ()
           -> IO IdeState
-shakeOpen recorder lspEnv defaultConfig logger debouncer
+shakeOpen recorder lspEnv defaultConfig idePlugins logger debouncer
   shakeProfileDir (IdeReportProgress reportProgress)
   ideTesting@(IdeTesting testing)
   withHieDb indexQueue opts monitoring rules = mdo
     let log :: Logger.Priority -> Log -> IO ()
         log = logWith recorder
 
+#if MIN_VERSION_ghc(9,3,0)
+    ideNc <- initNameCache 'r' knownKeyNames
+#else
     us <- mkSplitUniqSupply 'r'
     ideNc <- newIORef (initNameCache us knownKeyNames)
+#endif
     shakeExtras <- do
         globals <- newTVarIO HMap.empty
         state <- STM.newIO
@@ -957,8 +971,14 @@ runIdeAction _herald s i = runReaderT (runIdeActionT i) s
 askShake :: IdeAction ShakeExtras
 askShake = ask
 
+
+#if MIN_VERSION_ghc(9,3,0)
+mkUpdater :: NameCache -> NameCacheUpdater
+mkUpdater = id
+#else
 mkUpdater :: IORef NameCache -> NameCacheUpdater
 mkUpdater ref = NCU (upNameCache ref)
+#endif
 
 -- | A (maybe) stale result now, and an up to date one later
 data FastResult a = FastResult { stale :: Maybe (a,PositionMapping), uptoDate :: IO (Maybe a)  }
diff --git a/ghcide/src/Development/IDE/GHC/CPP.hs b/ghcide/src/Development/IDE/GHC/CPP.hs
index 788e93ea8d4..fc18450292a 100644
--- a/ghcide/src/Development/IDE/GHC/CPP.hs
+++ b/ghcide/src/Development/IDE/GHC/CPP.hs
@@ -34,6 +34,9 @@ import           ToolSettings
 import           DynFlags
 #endif
 #endif
+#if MIN_VERSION_ghc(9,3,0)
+import qualified GHC.Driver.Pipeline.Execute as Pipeline
+#endif
 
 addOptP :: String -> DynFlags -> DynFlags
 #if MIN_VERSION_ghc (8,10,0)
diff --git a/ghcide/src/Development/IDE/GHC/Compat.hs b/ghcide/src/Development/IDE/GHC/Compat.hs
index 8bb3c5fd1c0..157ddcde4c4 100644
--- a/ghcide/src/Development/IDE/GHC/Compat.hs
+++ b/ghcide/src/Development/IDE/GHC/Compat.hs
@@ -9,12 +9,19 @@
 
 -- | Attempt at hiding the GHC version differences we can.
 module Development.IDE.GHC.Compat(
-    NameCacheUpdater(..),
+    mkHomeModLocation,
     hPutStringBuffer,
     addIncludePathsQuote,
     getModuleHash,
     setUpTypedHoles,
+    NameCacheUpdater(..),
+#if MIN_VERSION_ghc(9,3,0)
+    getMessages,
+    diagnosticMessage,
+    nameEnvElts,
+#else
     upNameCache,
+#endif
     disableWarningsAsErrors,
     reLoc,
     reLocA,
@@ -27,8 +34,10 @@ module Development.IDE.GHC.Compat(
 #endif
 
 #if MIN_VERSION_ghc(9,2,0)
+#if !MIN_VERSION_ghc(9,3,0)
     extendModSummaryNoDeps,
     emsModSummary,
+#endif
     myCoreToStgExpr,
 #endif
 
@@ -63,7 +72,6 @@ module Development.IDE.GHC.Compat(
     -- * Compat modules
     module Development.IDE.GHC.Compat.Core,
     module Development.IDE.GHC.Compat.Env,
-    module Development.IDE.GHC.Compat.ExactPrint,
     module Development.IDE.GHC.Compat.Iface,
     module Development.IDE.GHC.Compat.Logger,
     module Development.IDE.GHC.Compat.Outputable,
@@ -88,7 +96,11 @@ module Development.IDE.GHC.Compat(
     icInteractiveModule,
     HomePackageTable,
     lookupHpt,
+#if MIN_VERSION_ghc(9,3,0)
+    Dependencies(dep_direct_mods),
+#else
     Dependencies(dep_mods),
+#endif
     bcoFreeNames,
     ModIfaceAnnotation,
     pattern Annotation,
@@ -117,9 +129,8 @@ module Development.IDE.GHC.Compat(
     ) where
 
 import           Data.Bifunctor
-import           Development.IDE.GHC.Compat.Core
+import           Development.IDE.GHC.Compat.Core hiding (moduleUnitId)
 import           Development.IDE.GHC.Compat.Env
-import           Development.IDE.GHC.Compat.ExactPrint
 import           Development.IDE.GHC.Compat.Iface
 import           Development.IDE.GHC.Compat.Logger
 import           Development.IDE.GHC.Compat.Outputable
@@ -149,7 +160,11 @@ import           GHC.Linker.Types                      (isObjectLinkable)
 import           GHC.Runtime.Context                   (icInteractiveModule)
 import           GHC.Unit.Home.ModInfo                 (HomePackageTable,
                                                         lookupHpt)
-import           GHC.Unit.Module.Deps                  (Dependencies (dep_mods))
+#if MIN_VERSION_ghc(9,3,0)
+import GHC.Unit.Module.Deps (Dependencies(dep_direct_mods))
+#else
+import GHC.Unit.Module.Deps (Dependencies(dep_mods))
+#endif
 #else
 import           GHC.CoreToByteCode                    (coreExprToBCOs)
 import           GHC.Driver.Types                      (Dependencies (dep_mods),
@@ -257,16 +272,37 @@ import           GHC.Types.CostCentre
 import           GHC.Types.IPE
 #endif
 
+#if MIN_VERSION_ghc(9,3,0)
+import GHC.Types.Error
+import GHC.Driver.Config.Stg.Pipeline
+#endif
+
 type ModIfaceAnnotation = Annotation
 
+#if MIN_VERSION_ghc(9,3,0)
+nameEnvElts :: NameEnv a -> [a]
+nameEnvElts = nonDetNameEnvElts
+#endif
+
 #if MIN_VERSION_ghc(9,2,0)
 myCoreToStgExpr :: Logger -> DynFlags -> InteractiveContext
+#if MIN_VERSION_ghc(9,3,0)
+            -> Bool
+#endif
                 -> Module -> ModLocation -> CoreExpr
                 -> IO ( Id
-                      , [StgTopBinding]
+#if MIN_VERSION_ghc(9,3,0)
+                      ,[CgStgTopBinding] -- output program
+#else
+                      ,[StgTopBinding] -- output program
+#endif
                       , InfoTableProvMap
                       , CollectedCCs )
-myCoreToStgExpr logger dflags ictxt this_mod ml prepd_expr = do
+myCoreToStgExpr logger dflags ictxt
+#if MIN_VERSION_ghc(9,3,0)
+                for_bytecode
+#endif
+                this_mod ml prepd_expr = do
     {- Create a temporary binding (just because myCoreToStg needs a
        binding for the stg2stg step) -}
     let bco_tmp_id = mkSysLocal (fsLit "BCO_toplevel")
@@ -277,24 +313,46 @@ myCoreToStgExpr logger dflags ictxt this_mod ml prepd_expr = do
        myCoreToStg logger
                    dflags
                    ictxt
+#if MIN_VERSION_ghc(9,3,0)
+                   for_bytecode
+#endif
                    this_mod
                    ml
                    [NonRec bco_tmp_id prepd_expr]
     return (bco_tmp_id, stg_binds, prov_map, collected_ccs)
 
 myCoreToStg :: Logger -> DynFlags -> InteractiveContext
+#if MIN_VERSION_ghc(9,3,0)
+            -> Bool
+#endif
             -> Module -> ModLocation -> CoreProgram
+#if MIN_VERSION_ghc(9,3,0)
+            -> IO ( [CgStgTopBinding] -- output program
+#else
             -> IO ( [StgTopBinding] -- output program
+#endif
                   , InfoTableProvMap
                   , CollectedCCs )  -- CAF cost centre info (declared and used)
-myCoreToStg logger dflags ictxt this_mod ml prepd_binds = do
+myCoreToStg logger dflags ictxt
+#if MIN_VERSION_ghc(9,3,0)
+            for_bytecode
+#endif
+            this_mod ml prepd_binds = do
     let (stg_binds, denv, cost_centre_info)
          = {-# SCC "Core2Stg" #-}
            coreToStg dflags this_mod ml prepd_binds
 
+#if MIN_VERSION_ghc(9,4,2)
+    (stg_binds2,_)
+#else
     stg_binds2
+#endif
         <- {-# SCC "Stg2Stg" #-}
+#if MIN_VERSION_ghc(9,3,0)
+           stg2stg logger ictxt (initStgPipelineOpts dflags for_bytecode) this_mod stg_binds
+#else
            stg2stg logger dflags ictxt this_mod stg_binds
+#endif
 
     return (stg_binds2, denv, cost_centre_info)
 #endif
@@ -309,7 +367,9 @@ reLocA = id
 #endif
 
 getDependentMods :: ModIface -> [ModuleName]
-#if MIN_VERSION_ghc(9,0,0)
+#if MIN_VERSION_ghc(9,3,0)
+getDependentMods = map (gwib_mod . snd) . S.toList . dep_direct_mods . mi_deps
+#elif MIN_VERSION_ghc(9,0,0)
 getDependentMods = map gwib_mod . dep_mods . mi_deps
 #else
 getDependentMods = map fst . dep_mods . mi_deps
@@ -335,9 +395,15 @@ hPutStringBuffer hdl (StringBuffer buf len cur)
 #if MIN_VERSION_ghc(9,2,0)
 type ErrMsg  = MsgEnvelope DecoratedSDoc
 #endif
+#if MIN_VERSION_ghc(9,3,0)
+type WarnMsg  = MsgEnvelope DecoratedSDoc
+#endif
 
 getMessages' :: PState -> DynFlags -> (Bag WarnMsg, Bag ErrMsg)
 getMessages' pst dflags =
+#if MIN_VERSION_ghc(9,3,0)
+  bimap (fmap (fmap diagnosticMessage) . getMessages) (fmap (fmap diagnosticMessage) . getMessages) $ getPsMessages pst
+#else
 #if MIN_VERSION_ghc(9,2,0)
                  bimap (fmap pprWarning) (fmap pprError) $
 #endif
@@ -345,11 +411,16 @@ getMessages' pst dflags =
 #if !MIN_VERSION_ghc(9,2,0)
                    dflags
 #endif
+#endif
 
 #if MIN_VERSION_ghc(9,2,0)
 pattern PFailedWithErrorMessages :: forall a b. (b -> Bag (MsgEnvelope DecoratedSDoc)) -> ParseResult a
 pattern PFailedWithErrorMessages msgs
+#if MIN_VERSION_ghc(9,3,0)
+     <- PFailed (const . fmap (fmap diagnosticMessage) . getMessages . getPsErrorMessages -> msgs)
+#else
      <- PFailed (const . fmap pprError . getErrorMessages -> msgs)
+#endif
 #elif MIN_VERSION_ghc(8,10,0)
 pattern PFailedWithErrorMessages :: (DynFlags -> ErrorMessages) -> ParseResult a
 pattern PFailedWithErrorMessages msgs
@@ -362,7 +433,7 @@ pattern PFailedWithErrorMessages msgs
 mkPlainErrMsgIfPFailed (PFailed _ pst err) = Just (\dflags -> mkPlainErrMsg dflags pst err)
 mkPlainErrMsgIfPFailed _ = Nothing
 #endif
-{-# COMPLETE PFailedWithErrorMessages #-}
+{-# COMPLETE POk, PFailedWithErrorMessages #-}
 
 supportsHieFiles :: Bool
 supportsHieFiles = True
@@ -370,7 +441,9 @@ supportsHieFiles = True
 hieExportNames :: HieFile -> [(SrcSpan, Name)]
 hieExportNames = nameListFromAvails . hie_exports
 
-
+#if MIN_VERSION_ghc(9,3,0)
+type NameCacheUpdater = NameCache
+#else
 upNameCache :: IORef NameCache -> (NameCache -> (NameCache, c)) -> IO c
 #if MIN_VERSION_ghc(8,8,0)
 upNameCache = updNameCache
@@ -378,6 +451,7 @@ upNameCache = updNameCache
 upNameCache ref upd_fn
   = atomicModifyIORef' ref upd_fn
 #endif
+#endif
 
 #if !MIN_VERSION_ghc(9,0,1)
 type RefMap a = Map.Map Identifier [(Span, IdentifierDetails a)]
@@ -537,13 +611,16 @@ data GhcVersion
   | GHC810
   | GHC90
   | GHC92
+  | GHC94
   deriving (Eq, Ord, Show)
 
 ghcVersionStr :: String
 ghcVersionStr = VERSION_ghc
 
 ghcVersion :: GhcVersion
-#if MIN_VERSION_GLASGOW_HASKELL(9,2,0,0)
+#if MIN_VERSION_GLASGOW_HASKELL(9,4,0,0)
+ghcVersion = GHC94
+#elif MIN_VERSION_GLASGOW_HASKELL(9,2,0,0)
 ghcVersion = GHC92
 #elif MIN_VERSION_GLASGOW_HASKELL(9,0,0,0)
 ghcVersion = GHC90
diff --git a/ghcide/src/Development/IDE/GHC/Compat/Core.hs b/ghcide/src/Development/IDE/GHC/Compat/Core.hs
index 222be572e67..173759a5f88 100644
--- a/ghcide/src/Development/IDE/GHC/Compat/Core.hs
+++ b/ghcide/src/Development/IDE/GHC/Compat/Core.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE ConstraintKinds   #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE PatternSynonyms   #-}
+{-# LANGUAGE ViewPatterns   #-}
 -- TODO: remove
 {-# OPTIONS -Wno-dodgy-imports -Wno-unused-imports #-}
 
@@ -61,7 +62,9 @@ module Development.IDE.GHC.Compat.Core (
     pattern ExposePackage,
     parseDynamicFlagsCmdLine,
     parseDynamicFilePragma,
+#if !MIN_VERSION_ghc(9,3,0)
     WarnReason(..),
+#endif
     wWarningFlags,
     updOptLevel,
     -- slightly unsafe
@@ -84,7 +87,9 @@ module Development.IDE.GHC.Compat.Core (
     HscSource(..),
     WhereFrom(..),
     loadInterface,
+#if !MIN_VERSION_ghc(9,3,0)
     SourceModified(..),
+#endif
     loadModuleInterface,
     RecompileRequired(..),
 #if MIN_VERSION_ghc(8,10,0)
@@ -188,12 +193,17 @@ module Development.IDE.GHC.Compat.Core (
     hscInteractive,
     hscSimplify,
     hscTypecheckRename,
-    makeSimpleDetails,
+    Development.IDE.GHC.Compat.Core.makeSimpleDetails,
     -- * Typecheck utils
     Development.IDE.GHC.Compat.Core.tcSplitForAllTyVars,
     Development.IDE.GHC.Compat.Core.tcSplitForAllTyVarBinder_maybe,
     typecheckIface,
-    mkIfaceTc,
+    Development.IDE.GHC.Compat.Core.mkIfaceTc,
+    Development.IDE.GHC.Compat.Core.mkBootModDetailsTc,
+    Development.IDE.GHC.Compat.Core.initTidyOpts,
+    hscUpdateHPT,
+    driverNoStop,
+    tidyProgram,
     ImportedModsVal(..),
     importedByUser,
     GHC.TypecheckedSource,
@@ -297,7 +307,6 @@ module Development.IDE.GHC.Compat.Core (
     Warn(..),
     -- * ModLocation
     GHC.ModLocation,
-    pattern ModLocation,
     Module.ml_hs_file,
     Module.ml_obj_file,
     Module.ml_hi_file,
@@ -349,7 +358,6 @@ module Development.IDE.GHC.Compat.Core (
     module GHC.HsToCore.Expr,
     module GHC.HsToCore.Monad,
 
-    module GHC.Iface.Tidy,
     module GHC.Iface.Syntax,
 
 #if MIN_VERSION_ghc(9,2,0)
@@ -430,7 +438,6 @@ module Development.IDE.GHC.Compat.Core (
     module TcRnTypes,
     module TcRnDriver,
     module TcRnMonad,
-    module TidyPgm,
     module TyCon,
     module TysPrim,
     module TysWiredIn,
@@ -466,11 +473,46 @@ module Development.IDE.GHC.Compat.Core (
     module ExtractDocs,
     module Parser,
     module Lexer,
+#endif
+#if MIN_VERSION_ghc(9,3,0)
+    CompileReason(..),
+    hsc_type_env_vars,
+    hscUpdateHUG, hscUpdateHPT, hsc_HUG,
+    GhcMessage(..),
+    getKey,
+    module GHC.Driver.Env.KnotVars,
+    module GHC.Iface.Recomp,
+    module GHC.Linker.Types,
+    module GHC.Unit.Module.Graph,
+    module GHC.Types.Unique.Map,
+    module GHC.Utils.TmpFs,
+    module GHC.Utils.Panic,
+    module GHC.Unit.Finder.Types,
+    module GHC.Unit.Env,
+    module GHC.Driver.Phases,
 #endif
     ) where
 
 import qualified GHC
 
+#if MIN_VERSION_ghc(9,3,0)
+import GHC.Iface.Recomp (CompileReason(..))
+import GHC.Driver.Env.Types (hsc_type_env_vars)
+import GHC.Driver.Env (hscUpdateHUG, hscUpdateHPT, hsc_HUG)
+import GHC.Driver.Env.KnotVars
+import GHC.Iface.Recomp
+import GHC.Linker.Types
+import GHC.Unit.Module.Graph
+import GHC.Driver.Errors.Types
+import GHC.Types.Unique.Map
+import GHC.Types.Unique
+import GHC.Utils.TmpFs
+import GHC.Utils.Panic
+import GHC.Unit.Finder.Types
+import GHC.Unit.Env
+import GHC.Driver.Phases
+#endif
+
 #if MIN_VERSION_ghc(9,0,0)
 import           GHC.Builtin.Names            hiding (Unique, printName)
 import           GHC.Builtin.Types
@@ -484,6 +526,10 @@ import qualified GHC.Core.DataCon             as DataCon
 import           GHC.Core.FamInstEnv          hiding (pprFamInst)
 import           GHC.Core.InstEnv
 import           GHC.Types.Unique.FM
+#if MIN_VERSION_ghc(9,3,0)
+import qualified GHC.Driver.Config.Tidy       as GHC
+import qualified GHC.Data.Strict              as Strict
+#endif
 #if MIN_VERSION_ghc(9,2,0)
 import           GHC.Data.Bag
 import           GHC.Core.Multiplicity        (scaledThing)
@@ -505,13 +551,13 @@ import           GHC.Core.Utils
 #if MIN_VERSION_ghc(9,2,0)
 import           GHC.Driver.Env
 #else
-import           GHC.Driver.Finder
+import           GHC.Driver.Finder hiding     (mkHomeModLocation)
 import           GHC.Driver.Types
 import           GHC.Driver.Ways
 #endif
 import           GHC.Driver.CmdLine           (Warn (..))
 import           GHC.Driver.Hooks
-import           GHC.Driver.Main
+import           GHC.Driver.Main              as GHC
 import           GHC.Driver.Monad
 import           GHC.Driver.Phases
 import           GHC.Driver.Pipeline
@@ -537,11 +583,11 @@ import           GHC.HsToCore.Docs
 import           GHC.HsToCore.Expr
 import           GHC.HsToCore.Monad
 import           GHC.Iface.Load
-import           GHC.Iface.Make               (mkFullIface, mkIfaceTc,
-                                               mkPartialIface)
+import           GHC.Iface.Make               (mkFullIface, mkPartialIface)
+import           GHC.Iface.Make               as GHC
 import           GHC.Iface.Recomp
 import           GHC.Iface.Syntax
-import           GHC.Iface.Tidy
+import           GHC.Iface.Tidy               as GHC
 import           GHC.IfaceToCore
 import           GHC.Parser
 import           GHC.Parser.Header            hiding (getImports)
@@ -588,7 +634,10 @@ import qualified GHC.Types.Name.Reader        as RdrName
 #if MIN_VERSION_ghc(9,2,0)
 import           GHC.Types.Name.Set
 import           GHC.Types.SourceFile         (HscSource (..),
-                                               SourceModified (..))
+#if !MIN_VERSION_ghc(9,3,0)
+                                               SourceModified(..)
+#endif
+                                               )
 import           GHC.Types.SourceText
 import           GHC.Types.Target             (Target (..), TargetId (..))
 import           GHC.Types.TyThing
@@ -604,7 +653,7 @@ import           GHC.Types.Unique.Supply
 import           GHC.Types.Var                (Var (varName), setTyVarUnique,
                                                setVarUnique)
 #if MIN_VERSION_ghc(9,2,0)
-import           GHC.Unit.Finder
+import           GHC.Unit.Finder              hiding (mkHomeModLocation)
 import           GHC.Unit.Home.ModInfo
 #endif
 import           GHC.Unit.Info                (PackageName (..))
@@ -644,7 +693,7 @@ import           ErrUtils                     hiding (logInfo, mkWarnMsg)
 import           ExtractDocs
 import           FamInst
 import           FamInstEnv
-import           Finder
+import           Finder                       hiding (mkHomeModLocation)
 #if MIN_VERSION_ghc(8,10,0)
 import           GHC.Hs                       hiding (HsLet, LetStmt)
 #endif
@@ -652,7 +701,7 @@ import qualified GHCi
 import           GhcMonad
 import           HeaderInfo                   hiding (getImports)
 import           Hooks
-import           HscMain
+import           HscMain                      as GHC
 import           HscTypes
 #if !MIN_VERSION_ghc(8,10,0)
 -- Syntax imports
@@ -674,7 +723,7 @@ import           InstEnv
 import           Lexer                        hiding (getSrcLoc)
 import qualified Linker
 import           LoadIface
-import           MkIface
+import           MkIface                      as GHC
 import           Module                       hiding (ModLocation (..), UnitId,
                                                addBootSuffixLocnOut,
                                                moduleUnitId)
@@ -716,7 +765,7 @@ import           TcRnMonad                    hiding (Applicative (..), IORef,
 import           TcRnTypes
 import           TcType                       hiding (mkVisFunTys)
 import qualified TcType
-import           TidyPgm
+import           TidyPgm                     as GHC
 import qualified TyCoRep
 import           TyCon
 import           Type                         hiding (mkVisFunTys)
@@ -750,14 +799,48 @@ import           System.FilePath
 #if MIN_VERSION_ghc(9,2,0)
 import           Language.Haskell.Syntax hiding (FunDep)
 #endif
+#if MIN_VERSION_ghc(9,3,0)
+import GHC.Driver.Env as GHCi
+#endif
+
+import Data.Foldable (toList)
+
+#if MIN_VERSION_ghc(9,3,0)
+import qualified GHC.Unit.Finder as GHC
+import qualified GHC.Driver.Config.Finder as GHC
+#elif MIN_VERSION_ghc(9,2,0)
+import qualified GHC.Unit.Finder as GHC
+#elif MIN_VERSION_ghc(9,0,0)
+import qualified GHC.Driver.Finder as GHC
+#else
+import qualified Finder as GHC
+#endif
+
+
+mkHomeModLocation :: DynFlags -> ModuleName -> FilePath -> IO Module.ModLocation
+#if MIN_VERSION_ghc(9,3,0)
+mkHomeModLocation df mn f = pure $ GHC.mkHomeModLocation (GHC.initFinderOpts df) mn f
+#else
+mkHomeModLocation = GHC.mkHomeModLocation
+#endif
+
 
 #if !MIN_VERSION_ghc(9,0,0)
 type BufSpan = ()
 type BufPos = ()
 #endif
 
+#if MIN_VERSION_ghc(9,3,0)
 pattern RealSrcSpan :: SrcLoc.RealSrcSpan -> Maybe BufSpan -> SrcLoc.SrcSpan
-#if MIN_VERSION_ghc(9,0,0)
+#else
+pattern RealSrcSpan :: SrcLoc.RealSrcSpan -> Maybe BufSpan -> SrcLoc.SrcSpan
+#endif
+
+#if MIN_VERSION_ghc(9,3,0)
+pattern RealSrcSpan x y <- SrcLoc.RealSrcSpan x ((\case Strict.Nothing -> Nothing; Strict.Just a -> Just a) -> y) where
+  RealSrcSpan x y = SrcLoc.RealSrcSpan x (case y of Nothing -> Strict.Nothing; Just a -> Strict.Just a)
+
+#elif MIN_VERSION_ghc(9,0,0)
 pattern RealSrcSpan x y = SrcLoc.RealSrcSpan x y
 #else
 pattern RealSrcSpan x y <- ((,Nothing) -> (SrcLoc.RealSrcSpan x, y)) where
@@ -765,7 +848,11 @@ pattern RealSrcSpan x y <- ((,Nothing) -> (SrcLoc.RealSrcSpan x, y)) where
 #endif
 {-# COMPLETE RealSrcSpan, UnhelpfulSpan #-}
 
+#if MIN_VERSION_ghc(9,3,0)
+pattern RealSrcLoc :: SrcLoc.RealSrcLoc -> Strict.Maybe BufPos-> SrcLoc.SrcLoc
+#else
 pattern RealSrcLoc :: SrcLoc.RealSrcLoc -> Maybe BufPos-> SrcLoc.SrcLoc
+#endif
 #if MIN_VERSION_ghc(9,0,0)
 pattern RealSrcLoc x y = SrcLoc.RealSrcLoc x y
 #else
@@ -936,14 +1023,6 @@ tcSplitForAllTyVarBinder_maybe =
   tcSplitForAllTy_maybe
 #endif
 
-pattern ModLocation :: Maybe FilePath -> FilePath -> FilePath -> GHC.ModLocation
-#if MIN_VERSION_ghc(8,8,0)
-pattern ModLocation a b c <-
-    GHC.ModLocation a b c _ where ModLocation a b c = GHC.ModLocation a b c ""
-#else
-pattern ModLocation a b c <-
-    GHC.ModLocation a b c where ModLocation a b c = GHC.ModLocation a b c
-#endif
 
 #if !MIN_VERSION_ghc(8,10,0)
 noExtField :: GHC.NoExt
@@ -1015,6 +1094,7 @@ unload hsc_env linkables =
 #endif
     hsc_env linkables
 
+#if !MIN_VERSION_ghc(9,3,0)
 setOutputFile :: FilePath -> DynFlags -> DynFlags
 setOutputFile f d = d {
 #if MIN_VERSION_ghc(9,2,0)
@@ -1023,6 +1103,7 @@ setOutputFile f d = d {
   outputFile     = Just f
 #endif
   }
+#endif
 
 isSubspanOfA :: LocatedAn la a -> LocatedAn lb b -> Bool
 #if MIN_VERSION_ghc(9,2,0)
@@ -1072,7 +1153,7 @@ pattern GRE :: Name -> Parent -> Bool -> [ImportSpec] -> RdrName.GlobalRdrElt
 #if MIN_VERSION_ghc(9,2,0)
 pattern GRE{gre_name, gre_par, gre_lcl, gre_imp} <- RdrName.GRE
     {gre_name = (greNamePrintableName -> gre_name)
-    ,gre_par, gre_lcl, gre_imp}
+    ,gre_par, gre_lcl, gre_imp = (toList -> gre_imp)}
 #else
 pattern GRE{gre_name, gre_par, gre_lcl, gre_imp} = RdrName.GRE{..}
 #endif
@@ -1091,3 +1172,55 @@ pattern LetStmt xlet localBinds <- GHC.LetStmt xlet (SrcLoc.unLoc -> localBinds)
 rationalFromFractionalLit :: FractionalLit -> Rational
 rationalFromFractionalLit = fl_value
 #endif
+
+makeSimpleDetails :: HscEnv -> TcGblEnv -> IO ModDetails
+makeSimpleDetails hsc_env =
+  GHC.makeSimpleDetails
+#if MIN_VERSION_ghc(9,3,0)
+              (hsc_logger hsc_env)
+#else
+              hsc_env
+#endif
+
+mkIfaceTc hsc_env sf details ms tcGblEnv =
+#if MIN_VERSION_ghc(8,10,0)
+  GHC.mkIfaceTc hsc_env sf details
+#if MIN_VERSION_ghc(9,3,0)
+              ms
+#endif
+              tcGblEnv
+#else
+  fst <$> GHC.mkIfaceTc hsc_env Nothing sf details tcGblEnv
+#endif
+
+mkBootModDetailsTc :: HscEnv -> TcGblEnv -> IO ModDetails
+mkBootModDetailsTc session = GHC.mkBootModDetailsTc
+#if MIN_VERSION_ghc(9,3,0)
+          (hsc_logger session)
+#else
+          session
+#endif
+
+#if !MIN_VERSION_ghc(9,3,0)
+type TidyOpts = HscEnv
+#endif
+
+initTidyOpts :: HscEnv -> IO TidyOpts
+initTidyOpts =
+#if MIN_VERSION_ghc(9,3,0)
+  GHC.initTidyOpts
+#else
+  pure
+#endif
+
+driverNoStop =
+#if MIN_VERSION_ghc(9,3,0)
+                                         NoStop
+#else
+                                         StopLn
+#endif
+
+#if !MIN_VERSION_ghc(9,3,0)
+hscUpdateHPT :: (HomePackageTable -> HomePackageTable) -> HscEnv -> HscEnv
+hscUpdateHPT k session = session { hsc_HPT = k (hsc_HPT session) }
+#endif
diff --git a/ghcide/src/Development/IDE/GHC/Compat/Env.hs b/ghcide/src/Development/IDE/GHC/Compat/Env.hs
index 76625878985..0909e783660 100644
--- a/ghcide/src/Development/IDE/GHC/Compat/Env.hs
+++ b/ghcide/src/Development/IDE/GHC/Compat/Env.hs
@@ -3,7 +3,14 @@
 -- | Compat module for the main Driver types, such as 'HscEnv',
 -- 'UnitEnv' and some DynFlags compat functions.
 module Development.IDE.GHC.Compat.Env (
-    Env.HscEnv(hsc_FC, hsc_NC, hsc_IC, hsc_mod_graph, hsc_HPT, hsc_type_env_var),
+    Env.HscEnv(hsc_FC, hsc_NC, hsc_IC, hsc_mod_graph
+#if MIN_VERSION_ghc(9,3,0)
+              , hsc_type_env_vars
+#else
+              , hsc_type_env_var
+#endif
+              ),
+    Env.hsc_HPT,
     InteractiveContext(..),
     setInteractivePrintName,
     setInteractiveDynFlags,
@@ -51,7 +58,11 @@ import           GHC                  (setInteractiveDynFlags)
 #if MIN_VERSION_ghc(9,0,0)
 #if MIN_VERSION_ghc(9,2,0)
 import           GHC.Driver.Backend   as Backend
+#if MIN_VERSION_ghc(9,3,0)
+import           GHC.Driver.Env       (HscEnv)
+#else
 import           GHC.Driver.Env       (HscEnv, hsc_EPS)
+#endif
 import qualified GHC.Driver.Env       as Env
 import qualified GHC.Driver.Session   as Session
 import           GHC.Platform.Ways    hiding (hostFullWays)
@@ -80,6 +91,11 @@ import           HscTypes             as Env
 import           Module
 #endif
 
+#if MIN_VERSION_ghc(9,3,0)
+hsc_EPS :: HscEnv -> UnitEnv
+hsc_EPS = hsc_unit_env
+#endif
+
 #if MIN_VERSION_ghc(9,0,0)
 #if !MIN_VERSION_ghc(9,2,0)
 import qualified Data.Set             as Set
diff --git a/ghcide/src/Development/IDE/GHC/Compat/Iface.hs b/ghcide/src/Development/IDE/GHC/Compat/Iface.hs
index 36ac26a446e..e0b36a13a99 100644
--- a/ghcide/src/Development/IDE/GHC/Compat/Iface.hs
+++ b/ghcide/src/Development/IDE/GHC/Compat/Iface.hs
@@ -7,6 +7,9 @@ module Development.IDE.GHC.Compat.Iface (
     ) where
 
 import           GHC
+#if MIN_VERSION_ghc(9,3,0)
+import           GHC.Driver.Session (targetProfile)
+#endif
 #if MIN_VERSION_ghc(9,2,0)
 import qualified GHC.Iface.Load                        as Iface
 import           GHC.Unit.Finder.Types                 (FindResult)
@@ -24,7 +27,9 @@ import           Development.IDE.GHC.Compat.Env
 import           Development.IDE.GHC.Compat.Outputable
 
 writeIfaceFile :: HscEnv -> FilePath -> ModIface -> IO ()
-#if MIN_VERSION_ghc(9,2,0)
+#if MIN_VERSION_ghc(9,3,0)
+writeIfaceFile env fp iface = Iface.writeIface (hsc_logger env) (targetProfile $ hsc_dflags env) fp iface
+#elif MIN_VERSION_ghc(9,2,0)
 writeIfaceFile env fp iface = Iface.writeIface (hsc_logger env) (hsc_dflags env) fp iface
 #elif MIN_VERSION_ghc(9,0,0)
 writeIfaceFile env = Iface.writeIface (hsc_dflags env)
diff --git a/ghcide/src/Development/IDE/GHC/Compat/Logger.hs b/ghcide/src/Development/IDE/GHC/Compat/Logger.hs
index cb94532eb71..6e8c6dca522 100644
--- a/ghcide/src/Development/IDE/GHC/Compat/Logger.hs
+++ b/ghcide/src/Development/IDE/GHC/Compat/Logger.hs
@@ -24,6 +24,9 @@ import           GHC.Utils.Logger                      as Logger
 import           DynFlags
 import           Outputable                            (queryQual)
 #endif
+#if MIN_VERSION_ghc(9,3,0)
+import GHC.Types.Error
+#endif
 
 putLogHook :: Logger -> HscEnv -> HscEnv
 putLogHook logger env =
@@ -41,6 +44,15 @@ pushLogHook f logger =
   logger { Env.log_action = f (Env.log_action logger) }
 #endif
 
+#if MIN_VERSION_ghc(9,3,0)
+type LogActionCompat = LogFlags -> Maybe DiagnosticReason -> Maybe Severity -> SrcSpan -> PrintUnqualified -> SDoc -> IO ()
+
+-- alwaysQualify seems to still do the right thing here, according to the "unqualified warnings" test.
+logActionCompat :: LogActionCompat -> LogAction
+logActionCompat logAction logFlags (MCDiagnostic severity wr) loc = logAction logFlags (Just wr) (Just severity) loc alwaysQualify
+logActionCompat logAction logFlags _cls loc = logAction logFlags Nothing Nothing loc alwaysQualify
+
+#else
 #if MIN_VERSION_ghc(9,0,0)
 type LogActionCompat = DynFlags -> WarnReason -> Severity -> SrcSpan -> PrintUnqualified -> SDoc -> IO ()
 
@@ -54,3 +66,4 @@ type LogActionCompat = DynFlags -> WarnReason -> Severity -> SrcSpan -> PrintUnq
 logActionCompat :: LogActionCompat -> LogAction
 logActionCompat logAction dynFlags wr severity loc style = logAction dynFlags wr severity loc (queryQual style)
 #endif
+#endif
diff --git a/ghcide/src/Development/IDE/GHC/Compat/Outputable.hs b/ghcide/src/Development/IDE/GHC/Compat/Outputable.hs
index 88bd76934e1..084a48a04b5 100644
--- a/ghcide/src/Development/IDE/GHC/Compat/Outputable.hs
+++ b/ghcide/src/Development/IDE/GHC/Compat/Outputable.hs
@@ -17,8 +17,12 @@ module Development.IDE.GHC.Compat.Outputable (
     -- * Parser errors
     PsWarning,
     PsError,
+#if MIN_VERSION_ghc(9,3,0)
+    DiagnosticReason(..),
+#else
     pprWarning,
     pprError,
+#endif
     -- * Error infrastructure
     DecoratedSDoc,
     MsgEnvelope,
@@ -35,7 +39,11 @@ module Development.IDE.GHC.Compat.Outputable (
 import           GHC.Driver.Env
 import           GHC.Driver.Ppr
 import           GHC.Driver.Session
+#if !MIN_VERSION_ghc(9,3,0)
 import           GHC.Parser.Errors
+#else
+import           GHC.Parser.Errors.Types
+#endif
 import qualified GHC.Parser.Errors.Ppr           as Ppr
 import qualified GHC.Types.Error                 as Error
 import           GHC.Types.Name.Ppr
@@ -69,6 +77,11 @@ import           Outputable                      as Out hiding
 import qualified Outputable                      as Out
 import           SrcLoc
 #endif
+#if MIN_VERSION_ghc(9,3,0)
+import GHC.Utils.Logger
+import GHC.Driver.Config.Diagnostic
+import Data.Maybe
+#endif
 
 -- | A compatible function to print `Outputable` instances
 -- without unique symbols.
@@ -125,6 +138,7 @@ oldFormatErrDoc :: DynFlags -> Err.ErrDoc -> Out.SDoc
 oldFormatErrDoc = Err.formatErrDoc
 #endif
 
+#if !MIN_VERSION_ghc(9,3,0)
 pprWarning :: PsWarning -> MsgEnvelope DecoratedSDoc
 pprWarning =
 #if MIN_VERSION_ghc(9,2,0)
@@ -140,18 +154,27 @@ pprError =
 #else
   id
 #endif
+#endif
 
 formatErrorWithQual :: DynFlags -> MsgEnvelope DecoratedSDoc -> String
 formatErrorWithQual dflags e =
 #if MIN_VERSION_ghc(9,2,0)
   showSDoc dflags (pprNoLocMsgEnvelope e)
 
+#if MIN_VERSION_ghc(9,3,0)
+pprNoLocMsgEnvelope :: MsgEnvelope DecoratedSDoc -> SDoc
+#else
 pprNoLocMsgEnvelope :: Error.RenderableDiagnostic e => MsgEnvelope e -> SDoc
+#endif
 pprNoLocMsgEnvelope (MsgEnvelope { errMsgDiagnostic = e
                                  , errMsgContext   = unqual })
   = sdocWithContext $ \ctx ->
     withErrStyle unqual $
+#if MIN_VERSION_ghc(9,3,0)
+      (formatBulleted ctx $ e)
+#else
       (formatBulleted ctx $ Error.renderDiagnostic e)
+#endif
 
 #else
   Out.showSDoc dflags
@@ -178,13 +201,18 @@ mkPrintUnqualifiedDefault env =
   HscTypes.mkPrintUnqualified (hsc_dflags env)
 #endif
 
-mkWarnMsg :: DynFlags -> SrcSpan -> PrintUnqualified -> SDoc -> MsgEnvelope DecoratedSDoc
-mkWarnMsg =
+#if MIN_VERSION_ghc(9,3,0)
+mkWarnMsg :: DynFlags -> Maybe DiagnosticReason -> b -> SrcSpan -> PrintUnqualified -> SDoc -> MsgEnvelope DecoratedSDoc
+mkWarnMsg df reason _logFlags l st doc = fmap diagnosticMessage $ mkMsgEnvelope (initDiagOpts df) l st (mkPlainDiagnostic (fromMaybe WarningWithoutFlag reason) [] doc)
+#else
+mkWarnMsg :: a -> b -> DynFlags -> SrcSpan -> PrintUnqualified -> SDoc -> MsgEnvelope DecoratedSDoc
+mkWarnMsg _ _ =
 #if MIN_VERSION_ghc(9,2,0)
   const Error.mkWarnMsg
 #else
   Err.mkWarnMsg
 #endif
+#endif
 
 defaultUserStyle :: PprStyle
 #if MIN_VERSION_ghc(9,0,0)
diff --git a/ghcide/src/Development/IDE/GHC/Compat/Parser.hs b/ghcide/src/Development/IDE/GHC/Compat/Parser.hs
index 91a925cb0bc..391ca9fb825 100644
--- a/ghcide/src/Development/IDE/GHC/Compat/Parser.hs
+++ b/ghcide/src/Development/IDE/GHC/Compat/Parser.hs
@@ -62,7 +62,11 @@ import           GHC                             (Anchor (anchor),
                                                   pm_mod_summary,
                                                   pm_parsed_source)
 import qualified GHC
+#if MIN_VERSION_ghc(9,3,0)
+import qualified GHC.Driver.Config.Parser        as Config
+#else
 import qualified GHC.Driver.Config               as Config
+#endif
 import           GHC.Hs                          (LEpaComment, hpm_module,
                                                   hpm_src_files)
 import           GHC.Parser.Lexer                hiding (initParserState)
diff --git a/ghcide/src/Development/IDE/GHC/Compat/Plugins.hs b/ghcide/src/Development/IDE/GHC/Compat/Plugins.hs
index 6fd5834f633..12cf035483a 100644
--- a/ghcide/src/Development/IDE/GHC/Compat/Plugins.hs
+++ b/ghcide/src/Development/IDE/GHC/Compat/Plugins.hs
@@ -24,6 +24,11 @@ import qualified GHC.Driver.Env                    as Env
 import           GHC.Driver.Plugins                (Plugin (..),
                                                     PluginWithArgs (..),
                                                     StaticPlugin (..),
+#if MIN_VERSION_ghc(9,3,0)
+                                                    staticPlugins,
+                                                    ParsedResult(..),
+                                                    PsMessages(..),
+#endif
                                                     defaultPlugin, withPlugins)
 import qualified GHC.Runtime.Loader                as Loader
 #elif MIN_VERSION_ghc(8,8,0)
@@ -42,15 +47,25 @@ applyPluginsParsedResultAction :: HscEnv -> DynFlags -> ModSummary -> Parser.Api
 applyPluginsParsedResultAction env dflags ms hpm_annotations parsed = do
   -- Apply parsedResultAction of plugins
   let applyPluginAction p opts = parsedResultAction p opts ms
+#if MIN_VERSION_ghc(9,3,0)
+  fmap (hpm_module . parsedResultModule) $
+#else
   fmap hpm_module $
+#endif
     runHsc env $ withPlugins
-#if MIN_VERSION_ghc(9,2,0)
+#if MIN_VERSION_ghc(9,3,0)
+      (Env.hsc_plugins env)
+#elif MIN_VERSION_ghc(9,2,0)
       env
 #else
       dflags
 #endif
       applyPluginAction
+#if MIN_VERSION_ghc(9,3,0)
+      (ParsedResult (HsParsedModule parsed [] hpm_annotations) (PsMessages mempty mempty))
+#else
       (HsParsedModule parsed [] hpm_annotations)
+#endif
 
 initializePlugins :: HscEnv -> IO HscEnv
 initializePlugins env = do
@@ -64,7 +79,9 @@ initializePlugins env = do
 
 #if MIN_VERSION_ghc(8,8,0)
 hsc_static_plugins :: HscEnv -> [StaticPlugin]
-#if MIN_VERSION_ghc(9,2,0)
+#if MIN_VERSION_ghc(9,3,0)
+hsc_static_plugins = staticPlugins . Env.hsc_plugins
+#elif MIN_VERSION_ghc(9,2,0)
 hsc_static_plugins = Env.hsc_static_plugins
 #else
 hsc_static_plugins = staticPlugins . hsc_dflags
diff --git a/ghcide/src/Development/IDE/GHC/Compat/Units.hs b/ghcide/src/Development/IDE/GHC/Compat/Units.hs
index 9077745aef5..c4a56bec5f5 100644
--- a/ghcide/src/Development/IDE/GHC/Compat/Units.hs
+++ b/ghcide/src/Development/IDE/GHC/Compat/Units.hs
@@ -5,7 +5,10 @@
 module Development.IDE.GHC.Compat.Units (
     -- * UnitState
     UnitState,
+#if MIN_VERSION_ghc(9,3,0)
     initUnits,
+#endif
+    oldInitUnits,
     unitState,
     getUnitName,
     explicitUnits,
@@ -39,7 +42,7 @@ module Development.IDE.GHC.Compat.Units (
     installedModule,
     -- * Module
     toUnitId,
-    moduleUnitId,
+    Development.IDE.GHC.Compat.Units.moduleUnitId,
     moduleUnit,
     -- * ExternalPackageState
     ExternalPackageState(..),
@@ -49,10 +52,18 @@ module Development.IDE.GHC.Compat.Units (
     showSDocForUser',
     ) where
 
+import qualified Data.List.NonEmpty as NE
+import qualified Data.Map.Strict as Map
+import Control.Monad
+#if MIN_VERSION_ghc(9,3,0)
+import GHC.Unit.Home.ModInfo
+#endif
 #if MIN_VERSION_ghc(9,0,0)
 #if MIN_VERSION_ghc(9,2,0)
 import qualified GHC.Data.ShortText              as ST
+#if !MIN_VERSION_ghc(9,3,0)
 import           GHC.Driver.Env                  (hsc_unit_dbs)
+#endif
 import           GHC.Driver.Ppr
 import           GHC.Unit.Env
 import           GHC.Unit.External
@@ -128,37 +139,69 @@ unitState = DynFlags.unitState . hsc_dflags
 unitState = DynFlags.pkgState . hsc_dflags
 #endif
 
-initUnits :: HscEnv -> IO HscEnv
-initUnits env = do
-#if MIN_VERSION_ghc(9,2,0)
-  let dflags1         = hsc_dflags env
-  -- Copied from GHC.setSessionDynFlags
-  let cached_unit_dbs = hsc_unit_dbs env
-  (dbs,unit_state,home_unit,mconstants) <- State.initUnits (hsc_logger env) dflags1 cached_unit_dbs
-
-  dflags <- DynFlags.updatePlatformConstants dflags1 mconstants
-
-
+#if MIN_VERSION_ghc(9,3,0)
+createUnitEnvFromFlags :: NE.NonEmpty DynFlags -> HomeUnitGraph
+createUnitEnvFromFlags unitDflags =
+  let
+    newInternalUnitEnv dflags = mkHomeUnitEnv dflags emptyHomePackageTable Nothing
+    unitEnvList = NE.map (\dflags -> (homeUnitId_ dflags, newInternalUnitEnv dflags)) unitDflags
+  in
+    unitEnv_new (Map.fromList (NE.toList (unitEnvList)))
+
+initUnits :: [DynFlags] -> HscEnv -> IO HscEnv
+initUnits unitDflags env = do
+  let dflags0         = hsc_dflags env
+  -- additionally, set checked dflags so we don't lose fixes
+  let initial_home_graph = createUnitEnvFromFlags (dflags0 NE.:| unitDflags)
+      home_units = unitEnv_keys initial_home_graph
+  home_unit_graph <- forM initial_home_graph $ \homeUnitEnv -> do
+    let cached_unit_dbs = homeUnitEnv_unit_dbs homeUnitEnv
+        dflags = homeUnitEnv_dflags homeUnitEnv
+        old_hpt = homeUnitEnv_hpt homeUnitEnv
+
+    (dbs,unit_state,home_unit,mconstants) <- State.initUnits (hsc_logger env) dflags cached_unit_dbs home_units
+
+    updated_dflags <- DynFlags.updatePlatformConstants dflags mconstants
+    pure HomeUnitEnv
+      { homeUnitEnv_units = unit_state
+      , homeUnitEnv_unit_dbs = Just dbs
+      , homeUnitEnv_dflags = updated_dflags
+      , homeUnitEnv_hpt = old_hpt
+      , homeUnitEnv_home_unit = Just home_unit
+      }
+
+  let dflags1 = homeUnitEnv_dflags $ unitEnv_lookup (homeUnitId_ dflags0) home_unit_graph
   let unit_env = UnitEnv
-        { ue_platform  = targetPlatform dflags
-        , ue_namever   = DynFlags.ghcNameVersion dflags
-        , ue_home_unit = home_unit
-        , ue_units     = unit_state
+        { ue_platform        = targetPlatform dflags1
+        , ue_namever         = GHC.ghcNameVersion dflags1
+        , ue_home_unit_graph = home_unit_graph
+        , ue_current_unit    = homeUnitId_ dflags0
+        , ue_eps             = ue_eps (hsc_unit_env env)
         }
-  pure $ hscSetFlags dflags $ hscSetUnitEnv unit_env env
-    { hsc_unit_dbs = Just dbs
-    }
+  pure $ hscSetFlags dflags1 $ hscSetUnitEnv unit_env env
+#endif
+
+-- | oldInitUnits only needs to modify DynFlags for GHC <9.2
+-- For GHC >= 9.2, we need to set the hsc_unit_env also, that is
+-- done later by initUnits
+oldInitUnits :: DynFlags -> IO DynFlags
+#if MIN_VERSION_ghc(9,2,0)
+oldInitUnits = pure
 #elif MIN_VERSION_ghc(9,0,0)
-  newFlags <- State.initUnits $ hsc_dflags env
-  pure $ hscSetFlags newFlags env
+oldInitUnits dflags = do
+  newFlags <- State.initUnits dflags
+  pure newFlags
 #else
-  newFlags <- fmap fst . Packages.initPackages $ hsc_dflags env
-  pure $ hscSetFlags newFlags env
+oldInitUnits dflags = do
+  newFlags <- fmap fst $ Packages.initPackages dflags
+  pure newFlags
 #endif
 
 explicitUnits :: UnitState -> [Unit]
 explicitUnits ue =
-#if MIN_VERSION_ghc(9,0,0)
+#if MIN_VERSION_ghc(9,3,0)
+  map fst $ State.explicitUnits ue
+#elif MIN_VERSION_ghc(9,0,0)
   State.explicitUnits ue
 #else
   Packages.explicitPackages ue
@@ -180,7 +223,15 @@ getUnitName env i =
   packageName <$> Packages.lookupPackage (hsc_dflags env) (definiteUnitId (defUnitId i))
 #endif
 
-lookupModuleWithSuggestions :: HscEnv -> ModuleName -> Maybe FastString -> LookupResult
+lookupModuleWithSuggestions
+  :: HscEnv
+  -> ModuleName
+#if MIN_VERSION_ghc(9,3,0)
+  -> GHC.PkgQual
+#else
+  -> Maybe FastString
+#endif
+  -> LookupResult
 lookupModuleWithSuggestions env modname mpkg =
 #if MIN_VERSION_ghc(9,0,0)
   State.lookupModuleWithSuggestions (unitState env) modname mpkg
diff --git a/ghcide/src/Development/IDE/GHC/Compat/Util.hs b/ghcide/src/Development/IDE/GHC/Compat/Util.hs
index 17799ea31d1..7c521e88e8d 100644
--- a/ghcide/src/Development/IDE/GHC/Compat/Util.hs
+++ b/ghcide/src/Development/IDE/GHC/Compat/Util.hs
@@ -24,7 +24,9 @@ module Development.IDE.GHC.Compat.Util (
     LBooleanFormula,
     BooleanFormula(..),
     -- * OverridingBool
+#if !MIN_VERSION_ghc(9,3,0)
     OverridingBool(..),
+#endif
     -- * Maybes
     MaybeErr(..),
     orElse,
diff --git a/ghcide/src/Development/IDE/GHC/Error.hs b/ghcide/src/Development/IDE/GHC/Error.hs
index 74a72148c8c..89c527e404b 100644
--- a/ghcide/src/Development/IDE/GHC/Error.hs
+++ b/ghcide/src/Development/IDE/GHC/Error.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 -- Copyright (c) 2019 The DAML Authors. All rights reserved.
 -- SPDX-License-Identifier: Apache-2.0
 module Development.IDE.GHC.Error
@@ -121,13 +122,17 @@ p `isInsideSrcSpan` r = case srcSpanToRange r of
 -- | Convert a GHC severity to a DAML compiler Severity. Severities below
 -- "Warning" level are dropped (returning Nothing).
 toDSeverity :: GHC.Severity -> Maybe D.DiagnosticSeverity
+#if !MIN_VERSION_ghc(9,3,0)
 toDSeverity SevOutput      = Nothing
 toDSeverity SevInteractive = Nothing
 toDSeverity SevDump        = Nothing
 toDSeverity SevInfo        = Just DsInfo
+toDSeverity SevFatal       = Just DsError
+#else
+toDSeverity SevIgnore      = Nothing
+#endif
 toDSeverity SevWarning     = Just DsWarning
 toDSeverity SevError       = Just DsError
-toDSeverity SevFatal       = Just DsError
 
 
 -- | Produce a bag of GHC-style errors (@ErrorMessages@) from the given
@@ -167,7 +172,11 @@ catchSrcErrors dflags fromWhere ghcM = do
       Right <$> ghcM
     where
         ghcExceptionToDiagnostics dflags = return . Left . diagFromGhcException fromWhere dflags
-        sourceErrorToDiagnostics dflags = return . Left . diagFromErrMsgs fromWhere dflags . srcErrorMessages
+        sourceErrorToDiagnostics dflags = return . Left . diagFromErrMsgs fromWhere dflags
+#if MIN_VERSION_ghc(9,3,0)
+                                        . fmap (fmap Compat.diagnosticMessage) . Compat.getMessages
+#endif
+                                        . srcErrorMessages
 
 
 diagFromGhcException :: T.Text -> DynFlags -> GhcException -> [FileDiagnostic]
diff --git a/ghcide/src/Development/IDE/GHC/Orphans.hs b/ghcide/src/Development/IDE/GHC/Orphans.hs
index 9ec6bfb5b88..d4f5c519722 100644
--- a/ghcide/src/Development/IDE/GHC/Orphans.hs
+++ b/ghcide/src/Development/IDE/GHC/Orphans.hs
@@ -29,8 +29,6 @@ import           Unique                     (getKey)
 #endif
 
 
-import           Retrie.ExactPrint          (Annotated)
-
 import           Development.IDE.GHC.Compat
 import           Development.IDE.GHC.Util
 
@@ -45,6 +43,9 @@ import           GHC.ByteCode.Types
 #else
 import           ByteCodeTypes
 #endif
+#if MIN_VERSION_ghc(9,3,0)
+import GHC.Types.PkgQual
+#endif
 
 -- Orphan instances for types from the GHC API.
 instance Show CoreModule where show = unpack . printOutputable
@@ -87,7 +88,9 @@ instance NFData SB.StringBuffer where rnf = rwhnf
 instance Show Module where
     show = moduleNameString . moduleName
 
+#if !MIN_VERSION_ghc(9,3,0)
 instance Outputable a => Show (GenLocated SrcSpan a) where show = unpack . printOutputable
+#endif
 
 instance (NFData l, NFData e) => NFData (GenLocated l e) where
     rnf (L l e) = rnf l `seq` rnf e
@@ -128,10 +131,12 @@ instance Show HieFile where
 instance NFData HieFile where
     rnf = rwhnf
 
+#if !MIN_VERSION_ghc(9,3,0)
 deriving instance Eq SourceModified
 deriving instance Show SourceModified
 instance NFData SourceModified where
     rnf = rwhnf
+#endif
 
 #if !MIN_VERSION_ghc(9,2,0)
 instance Show ModuleName where
@@ -195,12 +200,6 @@ instance NFData ModGuts where
 instance NFData (ImportDecl GhcPs) where
     rnf = rwhnf
 
-instance Show (Annotated ParsedSource) where
-  show _ = "<Annotated ParsedSource>"
-
-instance NFData (Annotated ParsedSource) where
-  rnf = rwhnf
-
 #if MIN_VERSION_ghc(9,0,1)
 instance (NFData HsModule) where
 #else
@@ -215,3 +214,16 @@ instance Show HomeModInfo where show = show . mi_module . hm_iface
 
 instance NFData HomeModInfo where
   rnf (HomeModInfo iface dets link) = rwhnf iface `seq` rnf dets `seq` rnf link
+
+#if MIN_VERSION_ghc(9,3,0)
+instance NFData PkgQual where
+  rnf NoPkgQual = ()
+  rnf (ThisPkg uid) = rnf uid
+  rnf (OtherPkg uid) = rnf uid
+
+instance NFData UnitId where
+  rnf = rwhnf
+
+instance NFData NodeKey where
+  rnf = rwhnf
+#endif
diff --git a/ghcide/src/Development/IDE/GHC/Util.hs b/ghcide/src/Development/IDE/GHC/Util.hs
index 0ddd12faf6e..8dd99b8bde8 100644
--- a/ghcide/src/Development/IDE/GHC/Util.hs
+++ b/ghcide/src/Development/IDE/GHC/Util.hs
@@ -26,14 +26,13 @@ module Development.IDE.GHC.Util(
     setHieDir,
     dontWriteHieFiles,
     disableWarningsAsErrors,
-    traceAst,
     printOutputable
     ) where
 
 #if MIN_VERSION_ghc(9,2,0)
 import           GHC.Data.FastString
 import           GHC.Data.StringBuffer
-import           GHC.Driver.Env
+import           GHC.Driver.Env                    hiding (hscSetFlags)
 import           GHC.Driver.Monad
 import           GHC.Driver.Session                hiding (ExposePackage)
 import           GHC.Parser.Lexer
@@ -70,7 +69,6 @@ import           Debug.Trace
 import           Development.IDE.GHC.Compat        as GHC
 import qualified Development.IDE.GHC.Compat.Parser as Compat
 import qualified Development.IDE.GHC.Compat.Units  as Compat
-import           Development.IDE.GHC.Dump          (showAstDataHtml)
 import           Development.IDE.Types.Location
 import           Foreign.ForeignPtr
 import           Foreign.Ptr
@@ -281,36 +279,6 @@ ioe_dupHandlesNotCompatible h =
 --------------------------------------------------------------------------------
 -- Tracing exactprint terms
 
-{-# NOINLINE timestamp #-}
-timestamp :: POSIXTime
-timestamp = utcTimeToPOSIXSeconds $ unsafePerformIO getCurrentTime
-
-debugAST :: Bool
-debugAST = unsafePerformIO (getEnvDefault "GHCIDE_DEBUG_AST" "0") == "1"
-
--- | Prints an 'Outputable' value to stderr and to an HTML file for further inspection
-traceAst :: (Data a, ExactPrint a, Outputable a, HasCallStack) => String -> a -> a
-traceAst lbl x
-  | debugAST = trace doTrace x
-  | otherwise = x
-  where
-#if MIN_VERSION_ghc(9,2,0)
-    renderDump = renderWithContext defaultSDocContext{sdocStyle = defaultDumpStyle, sdocPprDebug = True}
-#else
-    renderDump = showSDocUnsafe . ppr
-#endif
-    htmlDump = showAstDataHtml x
-    doTrace = unsafePerformIO $ do
-        u <- U.newUnique
-        let htmlDumpFileName = printf "/tmp/hls/%s-%s-%d.html" (show timestamp) lbl (U.hashUnique u)
-        writeFile htmlDumpFileName $ renderDump htmlDump
-        return $ unlines
-            [prettyCallStack callStack ++ ":"
-#if MIN_VERSION_ghc(9,2,0)
-            , exactPrint x
-#endif
-            , "file://" ++ htmlDumpFileName]
-
 -- Should in `Development.IDE.GHC.Orphans`,
 -- leave it here to prevent cyclic module dependency
 #if !MIN_VERSION_ghc(8,10,0)
diff --git a/ghcide/src/Development/IDE/GHC/Warnings.hs b/ghcide/src/Development/IDE/GHC/Warnings.hs
index 720828fef3c..fa30373ce83 100644
--- a/ghcide/src/Development/IDE/GHC/Warnings.hs
+++ b/ghcide/src/Development/IDE/GHC/Warnings.hs
@@ -1,6 +1,7 @@
 -- Copyright (c) 2019 The DAML Authors. All rights reserved.
 -- SPDX-License-Identifier: Apache-2.0
 {-# LANGUAGE ExplicitNamespaces #-}
+{-# LANGUAGE CPP #-}
 
 module Development.IDE.GHC.Warnings(withWarnings) where
 
@@ -23,14 +24,18 @@ import           Language.LSP.Types                (type (|?) (..))
 --   https://github.com/ghc/ghc/blob/5f1d949ab9e09b8d95319633854b7959df06eb58/compiler/main/GHC.hs#L623-L640
 --   which basically says that log_action is taken from the ModSummary when GHC feels like it.
 --   The given argument lets you refresh a ModSummary log_action
+#if MIN_VERSION_ghc(9,3,0)
+withWarnings :: T.Text -> ((HscEnv -> HscEnv) -> IO a) -> IO ([(Maybe DiagnosticReason, FileDiagnostic)], a)
+#else
 withWarnings :: T.Text -> ((HscEnv -> HscEnv) -> IO a) -> IO ([(WarnReason, FileDiagnostic)], a)
+#endif
 withWarnings diagSource action = do
   warnings <- newVar []
-  let newAction :: LogActionCompat
-      newAction dynFlags wr _ loc prUnqual msg = do
-        let wr_d = map ((wr,) . third3 (attachReason wr)) $ diagFromErrMsg diagSource dynFlags $ mkWarnMsg dynFlags loc prUnqual msg
+  let newAction :: DynFlags -> LogActionCompat
+      newAction dynFlags logFlags wr _ loc prUnqual msg = do
+        let wr_d = map ((wr,) . third3 (attachReason wr)) $ diagFromErrMsg diagSource dynFlags $ mkWarnMsg dynFlags wr logFlags loc prUnqual msg
         modifyVar_ warnings $ return . (wr_d:)
-      newLogger env = pushLogHook (const (logActionCompat newAction)) (hsc_logger env)
+      newLogger env = pushLogHook (const (logActionCompat (newAction (hsc_dflags env)))) (hsc_logger env)
   res <- action $ \env -> putLogHook (newLogger env) env
   warns <- readVar warnings
   return (reverse $ concat warns, res)
@@ -38,6 +43,15 @@ withWarnings diagSource action = do
     third3 :: (c -> d) -> (a, b, c) -> (a, b, d)
     third3 f (a, b, c) = (a, b, f c)
 
+#if MIN_VERSION_ghc(9,3,0)
+attachReason :: Maybe DiagnosticReason -> Diagnostic -> Diagnostic
+attachReason Nothing d = d
+attachReason (Just wr) d = d{_code = InR <$> showReason wr}
+ where
+  showReason = \case
+    WarningWithFlag flag    -> showFlag flag
+    _ -> Nothing
+#else
 attachReason :: WarnReason -> Diagnostic -> Diagnostic
 attachReason wr d = d{_code = InR <$> showReason wr}
  where
@@ -45,6 +59,7 @@ attachReason wr d = d{_code = InR <$> showReason wr}
     NoReason       -> Nothing
     Reason flag    -> showFlag flag
     ErrReason flag -> showFlag =<< flag
+#endif
 
 showFlag :: WarningFlag -> Maybe T.Text
 showFlag flag = ("-W" <>) . T.pack . flagSpecName <$> find ((== flag) . flagSpecFlag) wWarningFlags
diff --git a/ghcide/src/Development/IDE/Import/FindImports.hs b/ghcide/src/Development/IDE/Import/FindImports.hs
index 101e21fe32d..2cc08b9f57d 100644
--- a/ghcide/src/Development/IDE/Import/FindImports.hs
+++ b/ghcide/src/Development/IDE/Import/FindImports.hs
@@ -27,6 +27,9 @@ import           Control.Monad.IO.Class
 import           Data.List                         (isSuffixOf)
 import           Data.Maybe
 import           System.FilePath
+#if MIN_VERSION_ghc(9,3,0)
+import GHC.Types.PkgQual
+#endif
 
 data Import
   = FileImport !ArtifactsLocation
@@ -37,11 +40,11 @@ data ArtifactsLocation = ArtifactsLocation
   { artifactFilePath    :: !NormalizedFilePath
   , artifactModLocation :: !(Maybe ModLocation)
   , artifactIsSource    :: !Bool          -- ^ True if a module is a source input
-  }
-    deriving (Show)
+  , artifactModule      :: !(Maybe Module)
+  } deriving Show
 
 instance NFData ArtifactsLocation where
-  rnf ArtifactsLocation{..} = rnf artifactFilePath `seq` rwhnf artifactModLocation `seq` rnf artifactIsSource
+  rnf ArtifactsLocation{..} = rnf artifactFilePath `seq` rwhnf artifactModLocation `seq` rnf artifactIsSource `seq` rnf artifactModule
 
 isBootLocation :: ArtifactsLocation -> Bool
 isBootLocation = not . artifactIsSource
@@ -51,28 +54,30 @@ instance NFData Import where
   rnf PackageImport  = ()
 
 modSummaryToArtifactsLocation :: NormalizedFilePath -> Maybe ModSummary -> ArtifactsLocation
-modSummaryToArtifactsLocation nfp ms = ArtifactsLocation nfp (ms_location <$> ms) source
+modSummaryToArtifactsLocation nfp ms = ArtifactsLocation nfp (ms_location <$> ms) source mod
   where
     isSource HsSrcFile = True
     isSource _         = False
     source = case ms of
       Nothing -> "-boot" `isSuffixOf` fromNormalizedFilePath nfp
       Just ms -> isSource (ms_hsc_src ms)
+    mod = ms_mod <$> ms
 
 -- | locate a module in the file system. Where we go from *daml to Haskell
 locateModuleFile :: MonadIO m
-             => [[FilePath]]
+             => [(UnitId, [FilePath])]
              -> [String]
              -> (ModuleName -> NormalizedFilePath -> m (Maybe NormalizedFilePath))
              -> Bool
              -> ModuleName
-             -> m (Maybe NormalizedFilePath)
+             -> m (Maybe (UnitId, NormalizedFilePath))
 locateModuleFile import_dirss exts targetFor isSource modName = do
   let candidates import_dirs =
         [ toNormalizedFilePath' (prefix </> moduleNameSlashes modName <.> maybeBoot ext)
            | prefix <- import_dirs , ext <- exts]
-  firstJustM (targetFor modName) (concatMap candidates import_dirss)
+  firstJustM go (concat [map (uid,) (candidates dirs) | (uid, dirs) <- import_dirss])
   where
+    go (uid, candidate) = fmap ((uid,) <$>) $ targetFor modName candidate
     maybeBoot ext
       | isSource = ext ++ "-boot"
       | otherwise = ext
@@ -81,8 +86,13 @@ locateModuleFile import_dirss exts targetFor isSource modName = do
 -- It only returns Just for unit-ids which are possible to import into the
 -- current module. In particular, it will return Nothing for 'main' components
 -- as they can never be imported into another package.
-mkImportDirs :: HscEnv -> (UnitId, DynFlags) -> Maybe (PackageName, [FilePath])
-mkImportDirs env (i, flags) = (, importPaths flags) <$> getUnitName env i
+#if MIN_VERSION_ghc(9,3,0)
+mkImportDirs :: HscEnv -> (UnitId, DynFlags) -> Maybe (UnitId, [FilePath])
+mkImportDirs env (i, flags) = Just (i, importPaths flags)
+#else
+mkImportDirs :: HscEnv -> (UnitId, DynFlags) -> Maybe (PackageName, (UnitId, [FilePath]))
+mkImportDirs env (i, flags) = (, (i, importPaths flags)) <$> getUnitName env i
+#endif
 
 -- | locate a module in either the file system or the package database. Where we go from *daml to
 -- Haskell
@@ -93,43 +103,72 @@ locateModule
     -> [String]                        -- ^ File extensions
     -> (ModuleName -> NormalizedFilePath -> m (Maybe NormalizedFilePath))  -- ^ does file exist predicate
     -> Located ModuleName              -- ^ Module name
+#if MIN_VERSION_ghc(9,3,0)
+    -> PkgQual                -- ^ Package name
+#else
     -> Maybe FastString                -- ^ Package name
+#endif
     -> Bool                            -- ^ Is boot module
     -> m (Either [FileDiagnostic] Import)
 locateModule env comp_info exts targetFor modName mbPkgName isSource = do
   case mbPkgName of
     -- "this" means that we should only look in the current package
+#if MIN_VERSION_ghc(9,3,0)
+    ThisPkg _ -> do
+#else
     Just "this" -> do
-      lookupLocal [importPaths dflags]
+#endif
+      lookupLocal (homeUnitId_ dflags) (importPaths dflags)
     -- if a package name is given we only go look for a package
+#if MIN_VERSION_ghc(9,3,0)
+    OtherPkg uid
+      | Just dirs <- lookup uid import_paths
+#else
     Just pkgName
-      | Just dirs <- lookup (PackageName pkgName) import_paths
-          -> lookupLocal [dirs]
+      | Just (uid, dirs) <- lookup (PackageName pkgName) import_paths
+#endif
+          -> lookupLocal uid dirs
       | otherwise -> lookupInPackageDB env
+#if MIN_VERSION_ghc(9,3,0)
+    NoPkgQual -> do
+#else
     Nothing -> do
+#endif
       -- first try to find the module as a file. If we can't find it try to find it in the package
       -- database.
       -- Here the importPaths for the current modules are added to the front of the import paths from the other components.
       -- This is particularly important for Paths_* modules which get generated for every component but unless you use it in
       -- each component will end up being found in the wrong place and cause a multi-cradle match failure.
-      mbFile <- locateModuleFile (importPaths dflags : map snd import_paths) exts targetFor isSource $ unLoc modName
+      let import_paths' =
+#if MIN_VERSION_ghc(9,3,0)
+            import_paths
+#else
+            map snd import_paths
+#endif
+
+      mbFile <- locateModuleFile ((homeUnitId_ dflags, importPaths dflags) : import_paths') exts targetFor isSource $ unLoc modName
       case mbFile of
         Nothing   -> lookupInPackageDB env
-        Just file -> toModLocation file
+        Just (uid, file) -> toModLocation uid file
   where
     dflags = hsc_dflags env
     import_paths = mapMaybe (mkImportDirs env) comp_info
-    toModLocation file = liftIO $ do
+    toModLocation uid file = liftIO $ do
         loc <- mkHomeModLocation dflags (unLoc modName) (fromNormalizedFilePath file)
-        return $ Right $ FileImport $ ArtifactsLocation file (Just loc) (not isSource)
-
-    lookupLocal dirs = do
-      mbFile <- locateModuleFile dirs exts targetFor isSource $ unLoc modName
+#if MIN_VERSION_ghc(9,0,0)
+        let mod = mkModule (RealUnit $ Definite uid) (unLoc modName)  -- TODO support backpack holes
+#else
+        let mod = mkModule uid (unLoc modName)
+#endif
+        return $ Right $ FileImport $ ArtifactsLocation file (Just loc) (not isSource) (Just mod)
+
+    lookupLocal uid dirs = do
+      mbFile <- locateModuleFile [(uid, dirs)] exts targetFor isSource $ unLoc modName
       case mbFile of
         Nothing   -> return $ Left $ notFoundErr env modName $ LookupNotFound []
-        Just file -> toModLocation file
+        Just (uid, file) -> toModLocation uid file
 
-    lookupInPackageDB env =
+    lookupInPackageDB env = do
       case Compat.lookupModuleWithSuggestions env (unLoc modName) mbPkgName of
         LookupFound _m _pkgConfig -> return $ Right PackageImport
         reason -> return $ Left $ notFoundErr env modName reason
diff --git a/ghcide/src/Development/IDE/LSP/Outline.hs b/ghcide/src/Development/IDE/LSP/Outline.hs
index 0a45688fefc..2ad518d5884 100644
--- a/ghcide/src/Development/IDE/LSP/Outline.hs
+++ b/ghcide/src/Development/IDE/LSP/Outline.hs
@@ -11,7 +11,7 @@ where
 
 import           Control.Monad.IO.Class
 import           Data.Functor
-import           Data.Generics
+import           Data.Generics                  hiding (Prefix)
 import           Data.Maybe
 import qualified Data.Text                      as T
 import           Development.IDE.Core.Rules
@@ -122,8 +122,16 @@ documentSymbolForDecl (L (locA -> (RealSrcSpan l _)) (TyClD _ DataDecl { tcdLNam
     }
   where
     cvtFld :: LFieldOcc GhcPs -> Maybe DocumentSymbol
+#if MIN_VERSION_ghc(9,3,0)
+    cvtFld (L (locA -> RealSrcSpan l _) n) = Just $ (defDocumentSymbol l :: DocumentSymbol)
+#else
     cvtFld (L (RealSrcSpan l _) n) = Just $ (defDocumentSymbol l :: DocumentSymbol)
+#endif
+#if MIN_VERSION_ghc(9,3,0)
+                { _name = printOutputable (unLoc (foLabel n))
+#else
                 { _name = printOutputable (unLoc (rdrNameFieldOcc n))
+#endif
                 , _kind = SkField
                 }
     cvtFld _  = Nothing
@@ -161,8 +169,13 @@ documentSymbolForDecl (L (locA -> (RealSrcSpan l _)) (InstD _ DataFamInstD { dfi
 documentSymbolForDecl (L (RealSrcSpan l _) (InstD _ DataFamInstD { dfid_inst = DataFamInstDecl HsIB { hsib_body = FamEqn { feqn_tycon, feqn_pats } } }))
 #endif
   = Just (defDocumentSymbol l :: DocumentSymbol)
-    { _name = printOutputable (unLoc feqn_tycon) <> " " <> T.unwords
+    { _name =
+#if MIN_VERSION_ghc(9,3,0)
+        printOutputable $ pprHsArgsApp (unLoc feqn_tycon) Prefix (feqn_pats)
+#else
+        printOutputable (unLoc feqn_tycon) <> " " <> T.unwords
                 (map printOutputable feqn_pats)
+#endif
     , _kind = SkInterface
     }
 #if MIN_VERSION_ghc(9,2,0)
@@ -171,8 +184,13 @@ documentSymbolForDecl (L (locA -> (RealSrcSpan l _)) (InstD _ TyFamInstD { tfid_
 documentSymbolForDecl (L (RealSrcSpan l _) (InstD _ TyFamInstD { tfid_inst = TyFamInstDecl HsIB { hsib_body = FamEqn { feqn_tycon, feqn_pats } } }))
 #endif
   = Just (defDocumentSymbol l :: DocumentSymbol)
-    { _name = printOutputable (unLoc feqn_tycon) <> " " <> T.unwords
+    { _name =
+#if MIN_VERSION_ghc(9,3,0)
+        printOutputable $ pprHsArgsApp (unLoc feqn_tycon) Prefix (feqn_pats)
+#else
+        printOutputable (unLoc feqn_tycon) <> " " <> T.unwords
                 (map printOutputable feqn_pats)
+#endif
     , _kind = SkInterface
     }
 documentSymbolForDecl (L (locA -> (RealSrcSpan l _)) (DerivD _ DerivDecl { deriv_type })) =
@@ -217,7 +235,7 @@ documentSymbolForImportSummary importSymbols =
     let
       -- safe because if we have no ranges then we don't take this branch
       mergeRanges xs = Range (minimum $ map _start xs) (maximum $ map _end xs)
-      importRange = mergeRanges $ map (_range :: DocumentSymbol -> Range) importSymbols
+      importRange = mergeRanges $ map (\DocumentSymbol{_range} -> _range) importSymbols
     in
       Just (defDocumentSymbol (rangeToRealSrcSpan "" importRange))
           { _name = "imports"
@@ -293,7 +311,11 @@ hsConDeclsBinders cons
 
     get_flds_gadt :: HsConDeclGADTDetails GhcPs
                   -> ([LFieldOcc GhcPs])
+#if MIN_VERSION_ghc(9,3,0)
+    get_flds_gadt (RecConGADT flds _) = get_flds (reLoc flds)
+#else
     get_flds_gadt (RecConGADT flds) = get_flds (reLoc flds)
+#endif
     get_flds_gadt _ = []
 
     get_flds :: Located [LConDeclField GhcPs]
diff --git a/ghcide/src/Development/IDE/Main.hs b/ghcide/src/Development/IDE/Main.hs
index d5e19856a73..d342b1bb5d8 100644
--- a/ghcide/src/Development/IDE/Main.hs
+++ b/ghcide/src/Development/IDE/Main.hs
@@ -378,6 +378,7 @@ defaultMain recorder Arguments{..} = withHeapStats (cmapWithPrio LogHeapStats re
                   initialise
                       (cmapWithPrio LogService recorder)
                       argsDefaultHlsConfig
+                      argsHlsPlugins
                       rules
                       (Just env)
                       logger
@@ -422,7 +423,7 @@ defaultMain recorder Arguments{..} = withHeapStats (cmapWithPrio LogHeapStats re
                         , optCheckProject = pure False
                         , optModifyDynFlags = optModifyDynFlags def_options <> pluginModifyDynflags plugins
                         }
-            ide <- initialise (cmapWithPrio LogService recorder) argsDefaultHlsConfig rules Nothing logger debouncer options hiedb hieChan mempty
+            ide <- initialise (cmapWithPrio LogService recorder) argsDefaultHlsConfig argsHlsPlugins rules Nothing logger debouncer options hiedb hieChan mempty
             shakeSessionInit (cmapWithPrio LogShake recorder) ide
             registerIdeConfiguration (shakeExtras ide) $ IdeConfiguration mempty (hashed Nothing)
 
@@ -475,7 +476,7 @@ defaultMain recorder Arguments{..} = withHeapStats (cmapWithPrio LogHeapStats re
                     , optCheckProject = pure False
                     , optModifyDynFlags = optModifyDynFlags def_options <> pluginModifyDynflags plugins
                     }
-            ide <- initialise (cmapWithPrio LogService recorder) argsDefaultHlsConfig rules Nothing logger debouncer options hiedb hieChan mempty
+            ide <- initialise (cmapWithPrio LogService recorder) argsDefaultHlsConfig argsHlsPlugins rules Nothing logger debouncer options hiedb hieChan mempty
             shakeSessionInit (cmapWithPrio LogShake recorder) ide
             registerIdeConfiguration (shakeExtras ide) $ IdeConfiguration mempty (hashed Nothing)
             c ide
diff --git a/ghcide/src/Development/IDE/Plugin/Completions.hs b/ghcide/src/Development/IDE/Plugin/Completions.hs
index 4e5e96a3bd7..8e95614a276 100644
--- a/ghcide/src/Development/IDE/Plugin/Completions.hs
+++ b/ghcide/src/Development/IDE/Plugin/Completions.hs
@@ -27,12 +27,8 @@ import           Development.IDE.Core.Shake                   hiding (Log)
 import qualified Development.IDE.Core.Shake                   as Shake
 import           Development.IDE.GHC.Compat
 import           Development.IDE.GHC.Error                    (rangeToSrcSpan)
-import           Development.IDE.GHC.ExactPrint               (GetAnnotatedParsedSource (GetAnnotatedParsedSource))
 import           Development.IDE.GHC.Util                     (printOutputable)
 import           Development.IDE.Graph
-import           Development.IDE.Plugin.CodeAction            (newImport,
-                                                               newImportToEdit)
-import           Development.IDE.Plugin.CodeAction.ExactPrint
 import           Development.IDE.Plugin.Completions.Logic
 import           Development.IDE.Plugin.Completions.Types
 import           Development.IDE.Types.Exports
@@ -66,7 +62,6 @@ descriptor :: Recorder (WithPriority Log) -> PluginId -> PluginDescriptor IdeSta
 descriptor recorder plId = (defaultPluginDescriptor plId)
   { pluginRules = produceCompletions recorder
   , pluginHandlers = mkPluginHandler STextDocumentCompletion getCompletionsLSP
-  , pluginCommands = [extendImportCommand]
   , pluginConfigDescriptor = defaultConfigDescriptor {configCustomConfig = mkCustomConfig properties}
   , pluginPriority = ghcideCompletionsPluginPriority
   }
@@ -155,8 +150,9 @@ getCompletionsLSP ide plId
                 -> return (InL $ List [])
               (Just pfix', _) -> do
                 let clientCaps = clientCapabilities $ shakeExtras ide
+                    plugins = idePlugins $ shakeExtras ide
                 config <- getCompletionsConfig plId
-                allCompletions <- liftIO $ getCompletions plId ideOpts cci' parsedMod bindMap pfix' clientCaps config moduleExports
+                allCompletions <- liftIO $ getCompletions plugins ideOpts cci' parsedMod bindMap pfix' clientCaps config moduleExports
                 pure $ InL (List $ orderedCompletions allCompletions)
               _ -> return (InL $ List [])
           _ -> return (InL $ List [])
@@ -201,76 +197,3 @@ toModueNameText :: KT.Target -> T.Text
 toModueNameText target = case target of
   KT.TargetModule m -> T.pack $ moduleNameString m
   _                 -> T.empty
-
-extendImportCommand :: PluginCommand IdeState
-extendImportCommand =
-  PluginCommand (CommandId extendImportCommandId) "additional edits for a completion" extendImportHandler
-
-extendImportHandler :: CommandFunction IdeState ExtendImport
-extendImportHandler ideState edit@ExtendImport {..} = do
-  res <- liftIO $ runMaybeT $ extendImportHandler' ideState edit
-  whenJust res $ \(nfp, wedit@WorkspaceEdit {_changes}) -> do
-    let (_, List (head -> TextEdit {_range})) = fromJust $ _changes >>= listToMaybe . toList
-        srcSpan = rangeToSrcSpan nfp _range
-    LSP.sendNotification SWindowShowMessage $
-      ShowMessageParams MtInfo $
-        "Import "
-          <> maybe ("‘" <> newThing) (\x -> "‘" <> x <> " (" <> newThing <> ")") thingParent
-          <> "’ from "
-          <> importName
-          <> " (at "
-          <> printOutputable srcSpan
-          <> ")"
-    void $ LSP.sendRequest SWorkspaceApplyEdit (ApplyWorkspaceEditParams Nothing wedit) (\_ -> pure ())
-  return $ Right Null
-
-extendImportHandler' :: IdeState -> ExtendImport -> MaybeT IO (NormalizedFilePath, WorkspaceEdit)
-extendImportHandler' ideState ExtendImport {..}
-  | Just fp <- uriToFilePath doc,
-    nfp <- toNormalizedFilePath' fp =
-    do
-      (ModSummaryResult {..}, ps, contents) <- MaybeT $ liftIO $
-        runAction "extend import" ideState $
-          runMaybeT $ do
-            -- We want accurate edits, so do not use stale data here
-            msr <- MaybeT $ use GetModSummaryWithoutTimestamps nfp
-            ps <- MaybeT $ use GetAnnotatedParsedSource nfp
-            (_, contents) <- MaybeT $ use GetFileContents nfp
-            return (msr, ps, contents)
-      let df = ms_hspp_opts msrModSummary
-          wantedModule = mkModuleName (T.unpack importName)
-          wantedQual = mkModuleName . T.unpack <$> importQual
-          existingImport = find (isWantedModule wantedModule wantedQual) msrImports
-      case existingImport of
-        Just imp -> do
-            fmap (nfp,) $ liftEither $
-              rewriteToWEdit df doc
-#if !MIN_VERSION_ghc(9,2,0)
-                (annsA ps)
-#endif
-                $
-                  extendImport (T.unpack <$> thingParent) (T.unpack newThing) (makeDeltaAst imp)
-        Nothing -> do
-            let n = newImport importName sym importQual False
-                sym = if isNothing importQual then Just it else Nothing
-                it = case thingParent of
-                  Nothing -> newThing
-                  Just p  -> p <> "(" <> newThing <> ")"
-            t <- liftMaybe $ snd <$> newImportToEdit n ps (fromMaybe "" contents)
-            return (nfp, WorkspaceEdit {_changes=Just (fromList [(doc,List [t])]), _documentChanges=Nothing, _changeAnnotations=Nothing})
-  | otherwise =
-    mzero
-
-isWantedModule :: ModuleName -> Maybe ModuleName -> GenLocated l (ImportDecl GhcPs) -> Bool
-isWantedModule wantedModule Nothing (L _ it@ImportDecl{ideclName, ideclHiding = Just (False, _)}) =
-    not (isQualifiedImport it) && unLoc ideclName == wantedModule
-isWantedModule wantedModule (Just qual) (L _ ImportDecl{ideclAs, ideclName, ideclHiding = Just (False, _)}) =
-    unLoc ideclName == wantedModule && (wantedModule == qual || (unLoc . reLoc <$> ideclAs) == Just qual)
-isWantedModule _ _ _ = False
-
-liftMaybe :: Monad m => Maybe a -> MaybeT m a
-liftMaybe a = MaybeT $ pure a
-
-liftEither :: Monad m => Either e a -> MaybeT m a
-liftEither (Left _)  = mzero
-liftEither (Right x) = return x
diff --git a/ghcide/src/Development/IDE/Plugin/Completions/Logic.hs b/ghcide/src/Development/IDE/Plugin/Completions/Logic.hs
index 2269cb3914a..415743d0823 100644
--- a/ghcide/src/Development/IDE/Plugin/Completions/Logic.hs
+++ b/ghcide/src/Development/IDE/Plugin/Completions/Logic.hs
@@ -59,7 +59,7 @@ import           GHC.Plugins                              (Depth (AllTheWay),
 #endif
 import           Ide.PluginUtils                          (mkLspCommand)
 import           Ide.Types                                (CommandId (..),
-                                                           PluginId)
+                                                           IdePlugins(..), PluginId)
 import           Language.LSP.Types
 import           Language.LSP.Types.Capabilities
 import qualified Language.LSP.VFS                         as VFS
@@ -161,7 +161,8 @@ occNameToComKind ty oc
 showModName :: ModuleName -> T.Text
 showModName = T.pack . moduleNameString
 
-mkCompl :: PluginId -> IdeOptions -> CompItem -> CompletionItem
+mkCompl :: Maybe PluginId -- ^ Plugin to use for the extend import command
+        -> IdeOptions -> CompItem -> CompletionItem
 mkCompl
   pId
   IdeOptions {..}
@@ -175,7 +176,7 @@ mkCompl
       docs,
       additionalTextEdits
     } = do
-  let mbCommand = mkAdditionalEditsCommand pId `fmap` additionalTextEdits
+  let mbCommand = mkAdditionalEditsCommand pId =<< additionalTextEdits
   let ci = CompletionItem
                  {_label = label,
                   _kind = kind,
@@ -217,9 +218,9 @@ mkCompl
             "line " <> printOutputable (srcLocLine loc) <> ", column " <> printOutputable (srcLocCol loc)
 
 
-mkAdditionalEditsCommand :: PluginId -> ExtendImport -> Command
-mkAdditionalEditsCommand pId edits =
-  mkLspCommand pId (CommandId extendImportCommandId) "extend import" (Just [toJSON edits])
+mkAdditionalEditsCommand :: Maybe PluginId -> ExtendImport -> Maybe Command
+mkAdditionalEditsCommand (Just pId) edits = Just $ mkLspCommand pId (CommandId extendImportCommandId) "extend import" (Just [toJSON edits])
+mkAdditionalEditsCommand _ _ = Nothing
 
 mkNameCompItem :: Uri -> Maybe T.Text -> OccName -> Provenance -> Maybe Type -> Maybe Backtick -> SpanDoc -> Maybe (LImportDecl GhcPs) -> CompItem
 mkNameCompItem doc thingParent origName provenance thingType isInfix docs !imp = CI {..}
@@ -525,7 +526,11 @@ findRecordCompl uri pmod mn DataDecl {tcdLName, tcdDataDefn} = result
             --
             -- is encoded as @[[arg1, arg2], [arg3], [arg4]]@
             -- Hence, we must concat nested arguments into one to get all the fields.
+#if MIN_VERSION_ghc(9,3,0)
+            = map (foLabel . unLoc) cd_fld_names
+#else
             = map (rdrNameFieldOcc . unLoc) cd_fld_names
+#endif
         -- XConDeclField
         extract _ = []
 findRecordCompl _ _ _ _ = []
@@ -553,7 +558,7 @@ removeSnippetsWhen condition x =
 
 -- | Returns the cached completions for the given module and position.
 getCompletions
-    :: PluginId
+    :: IdePlugins a
     -> IdeOptions
     -> CachedCompletions
     -> Maybe (ParsedModule, PositionMapping)
@@ -563,7 +568,7 @@ getCompletions
     -> CompletionsConfig
     -> HM.HashMap T.Text (HashSet.HashSet IdentInfo)
     -> IO [Scored CompletionItem]
-getCompletions plId ideOpts CC {allModNamesAsNS, anyQualCompls, unqualCompls, qualCompls, importableModules}
+getCompletions plugins ideOpts CC {allModNamesAsNS, anyQualCompls, unqualCompls, qualCompls, importableModules}
                maybe_parsed (localBindings, bmapping) prefixInfo caps config moduleExportsMap = do
   let VFS.PosPrefixInfo { fullLine, prefixModule, prefixText } = prefixInfo
       enteredQual = if T.null prefixModule then "" else prefixModule <> "."
@@ -663,7 +668,8 @@ getCompletions plId ideOpts CC {allModNamesAsNS, anyQualCompls, unqualCompls, qu
     | otherwise -> do
         -- assumes that nubOrdBy is stable
         let uniqueFiltCompls = nubOrdBy (uniqueCompl `on` snd . Fuzzy.original) filtCompls
-        let compls = (fmap.fmap.fmap) (mkCompl plId ideOpts) uniqueFiltCompls
+        let compls = (fmap.fmap.fmap) (mkCompl pId ideOpts) uniqueFiltCompls
+            pId = lookupCommandProvider plugins (CommandId extendImportCommandId)
         return $
           (fmap.fmap) snd $
           sortBy (compare `on` lexicographicOrdering) $
diff --git a/ghcide/src/Development/IDE/Plugin/HLS.hs b/ghcide/src/Development/IDE/Plugin/HLS.hs
index ea30eb2c53d..8749a9efda4 100644
--- a/ghcide/src/Development/IDE/Plugin/HLS.hs
+++ b/ghcide/src/Development/IDE/Plugin/HLS.hs
@@ -127,7 +127,7 @@ executeCommandPlugins recorder ecs = mempty { P.pluginHandlers = executeCommandH
 executeCommandHandlers :: Recorder (WithPriority Log) -> [(PluginId, [PluginCommand IdeState])] -> LSP.Handlers (ServerM Config)
 executeCommandHandlers recorder ecs = requestHandler SWorkspaceExecuteCommand execCmd
   where
-    pluginMap = Map.fromList ecs
+    pluginMap = Map.fromListWith (++) ecs
 
     parseCmdId :: T.Text -> Maybe (PluginId, CommandId)
     parseCmdId x = case T.splitOn ":" x of
diff --git a/ghcide/src/Development/IDE/Plugin/HLS/GhcIde.hs b/ghcide/src/Development/IDE/Plugin/HLS/GhcIde.hs
index 83f1f071309..7e6d924d162 100644
--- a/ghcide/src/Development/IDE/Plugin/HLS/GhcIde.hs
+++ b/ghcide/src/Development/IDE/Plugin/HLS/GhcIde.hs
@@ -12,7 +12,6 @@ import           Development.IDE
 import           Development.IDE.LSP.HoverDefinition
 import qualified Development.IDE.LSP.Notifications   as Notifications
 import           Development.IDE.LSP.Outline
-import qualified Development.IDE.Plugin.CodeAction   as CodeAction
 import qualified Development.IDE.Plugin.Completions  as Completions
 import qualified Development.IDE.Plugin.TypeLenses   as TypeLenses
 import           Ide.Types
@@ -35,10 +34,6 @@ instance Pretty Log where
 descriptors :: Recorder (WithPriority Log) -> [PluginDescriptor IdeState]
 descriptors recorder =
   [ descriptor "ghcide-hover-and-symbols",
-    CodeAction.iePluginDescriptor "ghcide-code-actions-imports-exports",
-    CodeAction.typeSigsPluginDescriptor "ghcide-code-actions-type-signatures",
-    CodeAction.bindingsPluginDescriptor "ghcide-code-actions-bindings",
-    CodeAction.fillHolePluginDescriptor "ghcide-code-actions-fill-holes",
     Completions.descriptor (cmapWithPrio LogCompletions recorder) "ghcide-completions",
     TypeLenses.descriptor (cmapWithPrio LogTypeLenses recorder) "ghcide-type-lenses",
     Notifications.descriptor (cmapWithPrio LogNotifications recorder) "ghcide-core"
diff --git a/ghcide/src/Development/IDE/Spans/Common.hs b/ghcide/src/Development/IDE/Spans/Common.hs
index dd241e7fc9d..701074b3ac5 100644
--- a/ghcide/src/Development/IDE/Spans/Common.hs
+++ b/ghcide/src/Development/IDE/Spans/Common.hs
@@ -50,7 +50,11 @@ safeTyThingId _                                = Nothing
 
 -- Possible documentation for an element in the code
 data SpanDoc
+#if MIN_VERSION_ghc(9,3,0)
+  = SpanDocString [HsDocString] SpanDocUris
+#else
   = SpanDocString HsDocString SpanDocUris
+#endif
   | SpanDocText   [T.Text] SpanDocUris
   deriving stock (Eq, Show, Generic)
   deriving anyclass NFData
@@ -86,7 +90,12 @@ emptySpanDoc = SpanDocText [] (SpanDocUris Nothing Nothing)
 spanDocToMarkdown :: SpanDoc -> [T.Text]
 spanDocToMarkdown = \case
     (SpanDocString docs uris) ->
-        let doc = T.pack $ haddockToMarkdown $ H.toRegular $ H._doc $ H.parseParas Nothing $ unpackHDS docs
+        let doc = T.pack $ haddockToMarkdown $ H.toRegular $ H._doc $ H.parseParas Nothing $
+#if MIN_VERSION_ghc(9,3,0)
+                      renderHsDocStrings docs
+#else
+                      unpackHDS docs
+#endif
         in  go [doc] uris
     (SpanDocText txt uris) -> go txt uris
   where
diff --git a/ghcide/src/Development/IDE/Spans/Documentation.hs b/ghcide/src/Development/IDE/Spans/Documentation.hs
index c5a91906524..08ad918bc40 100644
--- a/ghcide/src/Development/IDE/Spans/Documentation.hs
+++ b/ghcide/src/Development/IDE/Spans/Documentation.hs
@@ -33,6 +33,9 @@ import           System.Directory
 import           System.FilePath
 
 import           Language.LSP.Types              (filePathToUri, getUri)
+#if MIN_VERSION_ghc(9,3,0)
+import GHC.Types.Unique.Map
+#endif
 
 mkDocMap
   :: HscEnv
@@ -41,12 +44,18 @@ mkDocMap
   -> IO DocAndKindMap
 mkDocMap env rm this_mod =
   do
-#if MIN_VERSION_ghc(9,2,0)
+#if MIN_VERSION_ghc(9,3,0)
+     (Just Docs{docs_decls = UniqMap this_docs}) <- extractDocs (hsc_dflags env) this_mod
+#elif MIN_VERSION_ghc(9,2,0)
      (_ , DeclDocMap this_docs, _) <- extractDocs this_mod
 #else
      let (_ , DeclDocMap this_docs, _) = extractDocs this_mod
 #endif
+#if MIN_VERSION_ghc(9,3,0)
+     d <- foldrM getDocs (fmap (\(_, x) -> (map hsDocString x) `SpanDocString` SpanDocUris Nothing Nothing) this_docs) names
+#else
      d <- foldrM getDocs (mkNameEnv $ M.toList $ fmap (`SpanDocString` SpanDocUris Nothing Nothing) this_docs) names
+#endif
      k <- foldrM getType (tcg_type_env this_mod) names
      pure $ DKMap d k
   where
@@ -69,7 +78,7 @@ lookupKind env mod =
     fmap (fromRight Nothing) . catchSrcErrors (hsc_dflags env) "span" . lookupName env mod
 
 getDocumentationTryGhc :: HscEnv -> Module -> Name -> IO SpanDoc
-getDocumentationTryGhc env mod n = head <$> getDocumentationsTryGhc env mod [n]
+getDocumentationTryGhc env mod n = fromMaybe emptySpanDoc . listToMaybe <$> getDocumentationsTryGhc env mod [n]
 
 getDocumentationsTryGhc :: HscEnv -> Module -> [Name] -> IO [SpanDoc]
 getDocumentationsTryGhc env mod names = do
@@ -78,7 +87,11 @@ getDocumentationsTryGhc env mod names = do
       Left _    -> return []
       Right res -> zipWithM unwrap res names
   where
+#if MIN_VERSION_ghc(9,3,0)
+    unwrap (Right (Just docs, _)) n = SpanDocString (map hsDocString docs) <$> getUris n
+#else
     unwrap (Right (Just docs, _)) n = SpanDocString docs <$> getUris n
+#endif
     unwrap _ n                      = mkSpanDocText n
 
     mkSpanDocText name =
diff --git a/ghcide/test/LICENSE b/ghcide/test/LICENSE
new file mode 100644
index 00000000000..d1f5c9033f6
--- /dev/null
+++ b/ghcide/test/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2019 Digital Asset (Switzerland) GmbH and/or its affiliates
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/ghcide/test/exe/Main.hs b/ghcide/test/exe/Main.hs
index 787e6941c47..384efce9858 100644
--- a/ghcide/test/exe/Main.hs
+++ b/ghcide/test/exe/Main.hs
@@ -40,7 +40,6 @@ import           Development.IDE.GHC.Compat               (GhcVersion (..),
                                                            ghcVersion)
 import           Development.IDE.GHC.Util
 import qualified Development.IDE.Main                     as IDE
-import           Development.IDE.Plugin.Completions.Types (extendImportCommandId)
 import           Development.IDE.Plugin.TypeLenses        (typeLensCommandId)
 import           Development.IDE.Spans.Common
 import           Development.IDE.Test                     (Cursor,
@@ -50,7 +49,6 @@ import           Development.IDE.Test                     (Cursor,
                                                            expectCurrentDiagnostics,
                                                            expectDiagnostics,
                                                            expectDiagnosticsWithTags,
-                                                           expectMessages,
                                                            expectNoMoreDiagnostics,
                                                            flushMessages,
                                                            getInterfaceFilesDir,
@@ -103,7 +101,6 @@ import           Data.IORef.Extra                         (atomicModifyIORef_)
 import           Data.String                              (IsString (fromString))
 import           Data.Tuple.Extra
 import           Development.IDE.Core.FileStore           (getModTime)
-import           Development.IDE.Plugin.CodeAction        (matchRegExMultipleImports)
 import qualified Development.IDE.Plugin.HLS.GhcIde        as Ghcide
 import           Development.IDE.Plugin.Test              (TestRequest (BlockSeconds),
                                                            WaitForIdeRuleResult (..),
@@ -198,7 +195,6 @@ main = do
         waitForProgressBegin
         closeDoc doc
         waitForProgressDone
-    , codeActionTests
     , initializeResponseTests
     , completionTests
     , cppTests
@@ -225,7 +221,6 @@ main = do
     , rootUriTests
     , asyncTests
     , clientSettingsTest
-    , codeActionHelperFunctionTests
     , referenceTests
     , garbageCollectionTests
     , HieDbRetry.tests
@@ -255,7 +250,7 @@ initializeResponseTests = withResource acquire release tests where
     , chk "   doc highlight"     _documentHighlightProvider (Just $ InL True)
     , chk "   doc symbol"           _documentSymbolProvider (Just $ InL True)
     , chk "   workspace symbol"    _workspaceSymbolProvider (Just $ InL True)
-    , chk "   code action"             _codeActionProvider  (Just $ InL True)
+    , chk "   code action"             _codeActionProvider  (Just $ InL False)
     , chk "   code lens"                 _codeLensProvider  (Just $ CodeLensOptions (Just False) (Just False))
     , chk "NO doc formatting"   _documentFormattingProvider (Just $ InL False)
     , chk "NO doc range formatting"
@@ -264,11 +259,11 @@ initializeResponseTests = withResource acquire release tests where
                           _documentOnTypeFormattingProvider Nothing
     , chk "NO renaming"                     _renameProvider (Just $ InL False)
     , chk "NO doc link"               _documentLinkProvider Nothing
-    , chk "NO color"                         _colorProvider (Just $ InL False)
+    , chk "NO color"                   (^. L.colorProvider) (Just $ InL False)
     , chk "NO folding range"          _foldingRangeProvider (Just $ InL False)
-    , che "   execute command"      _executeCommandProvider [extendImportCommandId, typeLensCommandId, blockCommandId]
-    , chk "   workspace"                         _workspace (Just $ WorkspaceServerCapabilities (Just WorkspaceFoldersServerCapabilities{_supported = Just True, _changeNotifications = Just ( InR True )}))
-    , chk "NO experimental"                   _experimental Nothing
+    , che "   execute command"      _executeCommandProvider [typeLensCommandId, blockCommandId]
+    , chk "   workspace"                   (^. L.workspace) (Just $ WorkspaceServerCapabilities (Just WorkspaceFoldersServerCapabilities{_supported = Just True, _changeNotifications = Just ( InR True )}))
+    , chk "NO experimental"             (^. L.experimental) Nothing
     ] where
 
       tds = Just (InL (TextDocumentSyncOptions
@@ -569,13 +564,20 @@ diagnosticTests = testGroup "diagnostics"
             , "useBase = BaseList.map"
             , "wrong1 = ThisList.map"
             , "wrong2 = BaseList.x"
+            , "main = pure ()"
             ]
       _ <- createDoc "Data/List.hs" "haskell" thisDataListContent
       _ <- createDoc "Main.hs" "haskell" mainContent
       expectDiagnostics
         [ ( "Main.hs"
-          , [(DsError, (6, 9), "Not in scope: \8216ThisList.map\8217")
-            ,(DsError, (7, 9), "Not in scope: \8216BaseList.x\8217")
+          , [(DsError, (6, 9),
+                if ghcVersion >= GHC94
+                then "Variable not in scope: map" -- See https://gitlab.haskell.org/ghc/ghc/-/issues/22130
+                else "Not in scope: \8216ThisList.map\8217")
+            ,(DsError, (7, 9),
+                if ghcVersion >= GHC94
+                then "Variable not in scope: x" -- See https://gitlab.haskell.org/ghc/ghc/-/issues/22130
+                else "Not in scope: \8216BaseList.x\8217")
             ]
           )
         ]
@@ -593,7 +595,7 @@ diagnosticTests = testGroup "diagnostics"
       -- where appropriate. The warning should use an unqualified name 'Ord', not
       -- sometihng like 'GHC.Classes.Ord'. The choice of redundant-constraints to
       -- test this is fairly arbitrary.
-          , [(DsWarning, (2, 0), "Redundant constraint: Ord a")
+          , [(DsWarning, (2, if ghcVersion >= GHC94 then 7 else 0), "Redundant constraint: Ord a")
             ]
           )
         ]
@@ -626,7 +628,7 @@ diagnosticTests = testGroup "diagnostics"
           -- Check that if we put a lower-case drive in for A.A
           -- the diagnostics for A.B will also be lower-case.
           liftIO $ fileUri @?= uriB
-          let msg = _message (head (toList diags) :: Diagnostic)
+          let msg = head (toList diags) ^. L.message
           liftIO $ unless ("redundant" `T.isInfixOf` msg) $
               assertFailure ("Expected redundant import but got " <> T.unpack msg)
           closeDoc a
@@ -817,40 +819,6 @@ cancellationTemplate (edit, undoEdit) mbKey = testCase (maybe "-" fst mbKey) $ r
             -- flush messages to ensure current diagnostics state is updated
             flushMessages
 
-codeActionTests :: TestTree
-codeActionTests = testGroup "code actions"
-  [ insertImportTests
-  , extendImportTests
-  , renameActionTests
-  , typeWildCardActionTests
-  , removeImportTests
-  , suggestImportClassMethodTests
-  , suggestImportTests
-  , suggestHideShadowTests
-  , suggestImportDisambiguationTests
-  , fixConstructorImportTests
-  , fixModuleImportTypoTests
-  , importRenameActionTests
-  , fillTypedHoleTests
-  , addSigActionTests
-  , insertNewDefinitionTests
-  , deleteUnusedDefinitionTests
-  , addInstanceConstraintTests
-  , addFunctionConstraintTests
-  , removeRedundantConstraintsTests
-  , addTypeAnnotationsToLiteralsTest
-  , exportUnusedTests
-  , addImplicitParamsConstraintTests
-  , removeExportTests
-  ]
-
-codeActionHelperFunctionTests :: TestTree
-codeActionHelperFunctionTests = testGroup "code action helpers"
-    [
-    extendImportTestsRegEx
-    ]
-
-
 codeLensesTests :: TestTree
 codeLensesTests = testGroup "code lenses"
   [ addSigLensesTests
@@ -905,3291 +873,6 @@ watchedFilesTests = testGroup "watched files"
     ]
   ]
 
-insertImportTests :: TestTree
-insertImportTests = testGroup "insert import"
-  [ checkImport
-        "module where keyword lower in file no exports"
-        "WhereKeywordLowerInFileNoExports.hs"
-        "WhereKeywordLowerInFileNoExports.expected.hs"
-        "import Data.Int"
-  , checkImport
-        "module where keyword lower in file with exports"
-        "WhereDeclLowerInFile.hs"
-        "WhereDeclLowerInFile.expected.hs"
-        "import Data.Int"
-  , checkImport
-        "module where keyword lower in file with comments before it"
-        "WhereDeclLowerInFileWithCommentsBeforeIt.hs"
-        "WhereDeclLowerInFileWithCommentsBeforeIt.expected.hs"
-        "import Data.Int"
-  , expectFailBecause
-      "'findNextPragmaPosition' function doesn't account for case when shebang is not placed at top of file"
-      (checkImport
-         "Shebang not at top with spaces"
-         "ShebangNotAtTopWithSpaces.hs"
-         "ShebangNotAtTopWithSpaces.expected.hs"
-         "import Data.Monoid")
-  , expectFailBecause
-      "'findNextPragmaPosition' function doesn't account for case when shebang is not placed at top of file"
-      (checkImport
-         "Shebang not at top no space"
-         "ShebangNotAtTopNoSpace.hs"
-         "ShebangNotAtTopNoSpace.expected.hs"
-         "import Data.Monoid")
-  , expectFailBecause
-      ("'findNextPragmaPosition' function doesn't account for case "
-      ++ "when OPTIONS_GHC pragma is not placed at top of file")
-      (checkImport
-         "OPTIONS_GHC pragma not at top with spaces"
-         "OptionsNotAtTopWithSpaces.hs"
-         "OptionsNotAtTopWithSpaces.expected.hs"
-         "import Data.Monoid")
-  , expectFailBecause
-      ("'findNextPragmaPosition' function doesn't account for "
-      ++ "case when shebang is not placed at top of file")
-      (checkImport
-         "Shebang not at top of file"
-         "ShebangNotAtTop.hs"
-         "ShebangNotAtTop.expected.hs"
-         "import Data.Monoid")
-  , expectFailBecause
-      ("'findNextPragmaPosition' function doesn't account for case "
-      ++ "when OPTIONS_GHC is not placed at top of file")
-      (checkImport
-         "OPTIONS_GHC pragma not at top of file"
-         "OptionsPragmaNotAtTop.hs"
-         "OptionsPragmaNotAtTop.expected.hs"
-         "import Data.Monoid")
-  , expectFailBecause
-      ("'findNextPragmaPosition' function doesn't account for case when "
-      ++ "OPTIONS_GHC pragma is not placed at top of file")
-      (checkImport
-         "pragma not at top with comment at top"
-         "PragmaNotAtTopWithCommentsAtTop.hs"
-         "PragmaNotAtTopWithCommentsAtTop.expected.hs"
-         "import Data.Monoid")
-  , expectFailBecause
-      ("'findNextPragmaPosition' function doesn't account for case when "
-      ++ "OPTIONS_GHC pragma is not placed at top of file")
-      (checkImport
-         "pragma not at top multiple comments"
-         "PragmaNotAtTopMultipleComments.hs"
-         "PragmaNotAtTopMultipleComments.expected.hs"
-         "import Data.Monoid")
-  , expectFailBecause
-      "'findNextPragmaPosition' function doesn't account for case of multiline pragmas"
-      (checkImport
-         "after multiline language pragmas"
-         "MultiLinePragma.hs"
-         "MultiLinePragma.expected.hs"
-         "import Data.Monoid")
-  , checkImport
-      "pragmas not at top with module declaration"
-      "PragmaNotAtTopWithModuleDecl.hs"
-      "PragmaNotAtTopWithModuleDecl.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "pragmas not at top with imports"
-      "PragmaNotAtTopWithImports.hs"
-      "PragmaNotAtTopWithImports.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "above comment at top of module"
-      "CommentAtTop.hs"
-      "CommentAtTop.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "above multiple comments below"
-      "CommentAtTopMultipleComments.hs"
-      "CommentAtTopMultipleComments.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "above curly brace comment"
-      "CommentCurlyBraceAtTop.hs"
-      "CommentCurlyBraceAtTop.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "above multi-line comment"
-      "MultiLineCommentAtTop.hs"
-      "MultiLineCommentAtTop.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "above comment with no module explicit exports"
-      "NoExplicitExportCommentAtTop.hs"
-      "NoExplicitExportCommentAtTop.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "above two-dash comment with no pipe"
-      "TwoDashOnlyComment.hs"
-      "TwoDashOnlyComment.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "above comment with no (module .. where) decl"
-      "NoModuleDeclarationCommentAtTop.hs"
-      "NoModuleDeclarationCommentAtTop.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "comment not at top with no (module .. where) decl"
-      "NoModuleDeclaration.hs"
-      "NoModuleDeclaration.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "comment not at top (data dec is)"
-      "DataAtTop.hs"
-      "DataAtTop.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "comment not at top (newtype is)"
-      "NewTypeAtTop.hs"
-      "NewTypeAtTop.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "with no explicit module exports"
-      "NoExplicitExports.hs"
-      "NoExplicitExports.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "add to correctly placed exisiting import"
-      "ImportAtTop.hs"
-      "ImportAtTop.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "add to multiple correctly placed exisiting imports"
-      "MultipleImportsAtTop.hs"
-      "MultipleImportsAtTop.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "with language pragma at top of module"
-      "LangPragmaModuleAtTop.hs"
-      "LangPragmaModuleAtTop.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "with language pragma and explicit module exports"
-      "LangPragmaModuleWithComment.hs"
-      "LangPragmaModuleWithComment.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "with language pragma at top and no module declaration"
-      "LanguagePragmaAtTop.hs"
-      "LanguagePragmaAtTop.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "with multiple lang pragmas and no module declaration"
-      "MultipleLanguagePragmasNoModuleDeclaration.hs"
-      "MultipleLanguagePragmasNoModuleDeclaration.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "with pragmas and shebangs"
-      "LanguagePragmasThenShebangs.hs"
-      "LanguagePragmasThenShebangs.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "with pragmas and shebangs but no comment at top"
-      "PragmasAndShebangsNoComment.hs"
-      "PragmasAndShebangsNoComment.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "module decl no exports under pragmas and shebangs"
-      "PragmasShebangsAndModuleDecl.hs"
-      "PragmasShebangsAndModuleDecl.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "module decl with explicit import under pragmas and shebangs"
-      "PragmasShebangsModuleExplicitExports.hs"
-      "PragmasShebangsModuleExplicitExports.expected.hs"
-      "import Data.Monoid"
-  , checkImport
-      "module decl and multiple imports"
-      "ModuleDeclAndImports.hs"
-      "ModuleDeclAndImports.expected.hs"
-      "import Data.Monoid"
-  ]
-
-checkImport :: String -> FilePath -> FilePath -> T.Text -> TestTree
-checkImport testComment originalPath expectedPath action =
-  testSessionWithExtraFiles "import-placement" testComment $ \dir ->
-    check (dir </> originalPath) (dir </> expectedPath) action
-  where
-    check :: FilePath -> FilePath -> T.Text -> Session ()
-    check originalPath expectedPath action = do
-      oSrc <- liftIO $ readFileUtf8 originalPath
-      eSrc <- liftIO $  readFileUtf8 expectedPath
-      originalDoc <- createDoc originalPath "haskell" oSrc
-      _ <- waitForDiagnostics
-      shouldBeDoc <- createDoc expectedPath "haskell" eSrc
-      actionsOrCommands <- getAllCodeActions originalDoc
-      chosenAction <- liftIO $ pickActionWithTitle action actionsOrCommands
-      executeCodeAction chosenAction
-      originalDocAfterAction <- documentContents originalDoc
-      shouldBeDocContents <- documentContents shouldBeDoc
-      liftIO $ T.replace "\r\n" "\n" shouldBeDocContents @=? T.replace "\r\n" "\n" originalDocAfterAction
-
-renameActionTests :: TestTree
-renameActionTests = testGroup "rename actions"
-  [ testSession "change to local variable name" $ do
-      let content = T.unlines
-            [ "module Testing where"
-            , "foo :: Int -> Int"
-            , "foo argName = argNme"
-            ]
-      doc <- createDoc "Testing.hs" "haskell" content
-      _ <- waitForDiagnostics
-      action <- findCodeAction doc (Range (Position 2 14) (Position 2 20)) "Replace with ‘argName’"
-      executeCodeAction action
-      contentAfterAction <- documentContents doc
-      let expectedContentAfterAction = T.unlines
-            [ "module Testing where"
-            , "foo :: Int -> Int"
-            , "foo argName = argName"
-            ]
-      liftIO $ expectedContentAfterAction @=? contentAfterAction
-  , testSession "change to name of imported function" $ do
-      let content = T.unlines
-            [ "module Testing where"
-            , "import Data.Maybe (maybeToList)"
-            , "foo :: Maybe a -> [a]"
-            , "foo = maybToList"
-            ]
-      doc <- createDoc "Testing.hs" "haskell" content
-      _ <- waitForDiagnostics
-      action <- findCodeAction doc (Range (Position 3 6) (Position 3 16))  "Replace with ‘maybeToList’"
-      executeCodeAction action
-      contentAfterAction <- documentContents doc
-      let expectedContentAfterAction = T.unlines
-            [ "module Testing where"
-            , "import Data.Maybe (maybeToList)"
-            , "foo :: Maybe a -> [a]"
-            , "foo = maybeToList"
-            ]
-      liftIO $ expectedContentAfterAction @=? contentAfterAction
-  , testSession "suggest multiple local variable names" $ do
-      let content = T.unlines
-            [ "module Testing where"
-            , "foo :: Char -> Char -> Char -> Char"
-            , "foo argument1 argument2 argument3 = argumentX"
-            ]
-      doc <- createDoc "Testing.hs" "haskell" content
-      _ <- waitForDiagnostics
-      _ <- findCodeActions doc (Range (Position 2 36) (Position 2 45))
-                           ["Replace with ‘argument1’", "Replace with ‘argument2’", "Replace with ‘argument3’"]
-      return()
-  , testSession "change infix function" $ do
-      let content = T.unlines
-            [ "module Testing where"
-            , "monus :: Int -> Int"
-            , "monus x y = max 0 (x - y)"
-            , "foo x y = x `monnus` y"
-            ]
-      doc <- createDoc "Testing.hs" "haskell" content
-      _ <- waitForDiagnostics
-      actionsOrCommands <- getCodeActions doc (Range (Position 3 12) (Position 3 20))
-      [fixTypo] <- pure [action | InR action@CodeAction{ _title = actionTitle } <- actionsOrCommands, "monus" `T.isInfixOf` actionTitle ]
-      executeCodeAction fixTypo
-      contentAfterAction <- documentContents doc
-      let expectedContentAfterAction = T.unlines
-            [ "module Testing where"
-            , "monus :: Int -> Int"
-            , "monus x y = max 0 (x - y)"
-            , "foo x y = x `monus` y"
-            ]
-      liftIO $ expectedContentAfterAction @=? contentAfterAction
-  ]
-
-typeWildCardActionTests :: TestTree
-typeWildCardActionTests = testGroup "type wildcard actions"
-  [ testUseTypeSignature "global signature"
-        [ "func :: _"
-        , "func x = x"
-        ]
-        [ "func :: p -> p"
-        , "func x = x"
-        ]
-  , testUseTypeSignature "local signature"
-        [ "func :: Int -> Int"
-        , "func x ="
-        , "  let y :: _"
-        , "      y = x * 2"
-        , "  in y"
-        ]
-        [ "func :: Int -> Int"
-        , "func x ="
-        , "  let y :: Int"
-        , "      y = x * 2"
-        , "  in y"
-        ]
-  , testUseTypeSignature "multi-line message 1"
-        [ "func :: _"
-        , "func x y = x + y"
-        ]
-        [ "func :: Integer -> Integer -> Integer"
-        , "func x y = x + y"
-        ]
-  , testUseTypeSignature "type in parentheses"
-        [ "func :: a -> _"
-        , "func x = (x, const x)"
-        ]
-        [ "func :: a -> (a, b -> a)"
-        , "func x = (x, const x)"
-        ]
-  , testUseTypeSignature "type in brackets"
-        [ "func :: _ -> Maybe a"
-        , "func xs = head xs"
-        ]
-        [ "func :: [Maybe a] -> Maybe a"
-        , "func xs = head xs"
-        ]
-  , testUseTypeSignature "unit type"
-        [ "func :: IO _"
-        , "func = putChar 'H'"
-        ]
-        [ "func :: IO ()"
-        , "func = putChar 'H'"
-        ]
-  , testUseTypeSignature "no spaces around '::'"
-        [ "func::_"
-        , "func x y = x + y"
-        ]
-        [ "func::Integer -> Integer -> Integer"
-        , "func x y = x + y"
-        ]
-  , testGroup "add parens if hole is part of bigger type"
-    [ testUseTypeSignature "subtype 1"
-          [ "func :: _ -> Integer -> Integer"
-          , "func x y = x + y"
-          ]
-          [ "func :: Integer -> Integer -> Integer"
-          , "func x y = x + y"
-          ]
-    , testUseTypeSignature "subtype 2"
-          [ "func :: Integer -> _ -> Integer"
-          , "func x y = x + y"
-          ]
-          [ "func :: Integer -> Integer -> Integer"
-          , "func x y = x + y"
-          ]
-    , testUseTypeSignature "subtype 3"
-          [ "func :: Integer -> Integer -> _"
-          , "func x y = x + y"
-          ]
-          [ "func :: Integer -> Integer -> Integer"
-          , "func x y = x + y"
-          ]
-    , testUseTypeSignature "subtype 4"
-          [ "func :: Integer -> _"
-          , "func x y = x + y"
-          ]
-          [ "func :: Integer -> (Integer -> Integer)"
-          , "func x y = x + y"
-          ]
-    ]
-  ]
-  where
-    -- | Test session of given name, checking action "Use type signature..."
-    --   on a test file with given content and comparing to expected result.
-    testUseTypeSignature name textIn textOut = testSession name $ do
-        let fileStart = "module Testing where"
-            content = T.unlines $ fileStart : textIn
-            expectedContentAfterAction = T.unlines $ fileStart : textOut
-        doc <- createDoc "Testing.hs" "haskell" content
-        _ <- waitForDiagnostics
-        actionsOrCommands <- getAllCodeActions doc
-        let [addSignature] = [action | InR action@CodeAction { _title = actionTitle } <- actionsOrCommands
-                                    , "Use type signature" `T.isInfixOf` actionTitle
-                            ]
-        executeCodeAction addSignature
-        contentAfterAction <- documentContents doc
-        liftIO $ expectedContentAfterAction @=? contentAfterAction
-
-{-# HLINT ignore "Use nubOrd" #-}
-removeImportTests :: TestTree
-removeImportTests = testGroup "remove import actions"
-  [ testSession "redundant" $ do
-      let contentA = T.unlines
-            [ "module ModuleA where"
-            ]
-      _docA <- createDoc "ModuleA.hs" "haskell" contentA
-      let contentB = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            , "import ModuleA"
-            , "stuffB :: Integer"
-            , "stuffB = 123"
-            ]
-      docB <- createDoc "ModuleB.hs" "haskell" contentB
-      _ <- waitForDiagnostics
-      [InR action@CodeAction { _title = actionTitle }, _]
-          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
-      liftIO $ "Remove import" @=? actionTitle
-      executeCodeAction action
-      contentAfterAction <- documentContents docB
-      let expectedContentAfterAction = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            , "stuffB :: Integer"
-            , "stuffB = 123"
-            ]
-      liftIO $ expectedContentAfterAction @=? contentAfterAction
-  , testSession "qualified redundant" $ do
-      let contentA = T.unlines
-            [ "module ModuleA where"
-            ]
-      _docA <- createDoc "ModuleA.hs" "haskell" contentA
-      let contentB = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            , "import qualified ModuleA"
-            , "stuffB :: Integer"
-            , "stuffB = 123"
-            ]
-      docB <- createDoc "ModuleB.hs" "haskell" contentB
-      _ <- waitForDiagnostics
-      [InR action@CodeAction { _title = actionTitle }, _]
-          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
-      liftIO $ "Remove import" @=? actionTitle
-      executeCodeAction action
-      contentAfterAction <- documentContents docB
-      let expectedContentAfterAction = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            , "stuffB :: Integer"
-            , "stuffB = 123"
-            ]
-      liftIO $ expectedContentAfterAction @=? contentAfterAction
-  , testSession "redundant binding" $ do
-      let contentA = T.unlines
-            [ "module ModuleA where"
-            , "stuffA = False"
-            , "stuffB :: Integer"
-            , "stuffB = 123"
-            , "stuffC = ()"
-            , "_stuffD = '_'"
-            ]
-      _docA <- createDoc "ModuleA.hs" "haskell" contentA
-      let contentB = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            , "import ModuleA (stuffA, stuffB, _stuffD, stuffC, stuffA)"
-            , "main = print stuffB"
-            ]
-      docB <- createDoc "ModuleB.hs" "haskell" contentB
-      _ <- waitForDiagnostics
-      [InR action@CodeAction { _title = actionTitle }, _]
-          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
-      liftIO $ "Remove _stuffD, stuffA, stuffC from import" @=? actionTitle
-      executeCodeAction action
-      contentAfterAction <- documentContents docB
-      let expectedContentAfterAction = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            , "import ModuleA (stuffB)"
-            , "main = print stuffB"
-            ]
-      liftIO $ expectedContentAfterAction @=? contentAfterAction
-  , testSession "redundant binding - unicode regression " $ do
-      let contentA = T.unlines
-            [ "module ModuleA where"
-            , "data A = A"
-            , "ε :: Double"
-            , "ε = 0.5"
-            ]
-      _docA <- createDoc "ModuleA.hs" "haskell" contentA
-      let contentB = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            , "import ModuleA (A(..), ε)"
-            , "a = A"
-            ]
-      docB <- createDoc "ModuleB.hs" "haskell" contentB
-      _ <- waitForDiagnostics
-      [InR action@CodeAction { _title = actionTitle }, _]
-          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
-      liftIO $ "Remove ε from import" @=? actionTitle
-      executeCodeAction action
-      contentAfterAction <- documentContents docB
-      let expectedContentAfterAction = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            , "import ModuleA (A(..))"
-            , "a = A"
-            ]
-      liftIO $ expectedContentAfterAction @=? contentAfterAction
-  , testSession "redundant operator" $ do
-      let contentA = T.unlines
-            [ "module ModuleA where"
-            , "a !! _b = a"
-            , "a <?> _b = a"
-            , "stuffB :: Integer"
-            , "stuffB = 123"
-            ]
-      _docA <- createDoc "ModuleA.hs" "haskell" contentA
-      let contentB = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            , "import qualified ModuleA as A ((<?>), stuffB, (!!))"
-            , "main = print A.stuffB"
-            ]
-      docB <- createDoc "ModuleB.hs" "haskell" contentB
-      _ <- waitForDiagnostics
-      [InR action@CodeAction { _title = actionTitle }, _]
-          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
-      liftIO $ "Remove !!, <?> from import" @=? actionTitle
-      executeCodeAction action
-      contentAfterAction <- documentContents docB
-      let expectedContentAfterAction = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            , "import qualified ModuleA as A (stuffB)"
-            , "main = print A.stuffB"
-            ]
-      liftIO $ expectedContentAfterAction @=? contentAfterAction
-  , testSession "redundant all import" $ do
-      let contentA = T.unlines
-            [ "module ModuleA where"
-            , "data A = A"
-            , "stuffB :: Integer"
-            , "stuffB = 123"
-            ]
-      _docA <- createDoc "ModuleA.hs" "haskell" contentA
-      let contentB = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            , "import ModuleA (A(..), stuffB)"
-            , "main = print stuffB"
-            ]
-      docB <- createDoc "ModuleB.hs" "haskell" contentB
-      _ <- waitForDiagnostics
-      [InR action@CodeAction { _title = actionTitle }, _]
-          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
-      liftIO $ "Remove A from import" @=? actionTitle
-      executeCodeAction action
-      contentAfterAction <- documentContents docB
-      let expectedContentAfterAction = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            , "import ModuleA (stuffB)"
-            , "main = print stuffB"
-            ]
-      liftIO $ expectedContentAfterAction @=? contentAfterAction
-  , testSession "redundant constructor import" $ do
-      let contentA = T.unlines
-            [ "module ModuleA where"
-            , "data D = A | B"
-            , "data E = F"
-            ]
-      _docA <- createDoc "ModuleA.hs" "haskell" contentA
-      let contentB = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            , "import ModuleA (D(A,B), E(F))"
-            , "main = B"
-            ]
-      docB <- createDoc "ModuleB.hs" "haskell" contentB
-      _ <- waitForDiagnostics
-      [InR action@CodeAction { _title = actionTitle }, _]
-          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
-      liftIO $ "Remove A, E, F from import" @=? actionTitle
-      executeCodeAction action
-      contentAfterAction <- documentContents docB
-      let expectedContentAfterAction = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            , "import ModuleA (D(B))"
-            , "main = B"
-            ]
-      liftIO $ expectedContentAfterAction @=? contentAfterAction
-  , testSession "import containing the identifier Strict" $ do
-      let contentA = T.unlines
-            [ "module Strict where"
-            ]
-      _docA <- createDoc "Strict.hs" "haskell" contentA
-      let contentB = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            , "import Strict"
-            ]
-      docB <- createDoc "ModuleB.hs" "haskell" contentB
-      _ <- waitForDiagnostics
-      [InR action@CodeAction { _title = actionTitle }, _]
-          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
-      liftIO $ "Remove import" @=? actionTitle
-      executeCodeAction action
-      contentAfterAction <- documentContents docB
-      let expectedContentAfterAction = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            ]
-      liftIO $ expectedContentAfterAction @=? contentAfterAction
-  , testSession "remove all" $ do
-      let content = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleA where"
-            , "import Data.Function (fix, (&))"
-            , "import qualified Data.Functor.Const"
-            , "import Data.Functor.Identity"
-            , "import Data.Functor.Sum (Sum (InL, InR))"
-            , "import qualified Data.Kind as K (Constraint, Type)"
-            , "x = InL (Identity 123)"
-            , "y = fix id"
-            , "type T = K.Type"
-            ]
-      doc <- createDoc "ModuleC.hs" "haskell" content
-      _ <- waitForDiagnostics
-      [_, _, _, _, InR action@CodeAction { _title = actionTitle }]
-          <- nub <$> getAllCodeActions doc
-      liftIO $ "Remove all redundant imports" @=? actionTitle
-      executeCodeAction action
-      contentAfterAction <- documentContents doc
-      let expectedContentAfterAction = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleA where"
-            , "import Data.Function (fix)"
-            , "import Data.Functor.Identity"
-            , "import Data.Functor.Sum (Sum (InL))"
-            , "import qualified Data.Kind as K (Type)"
-            , "x = InL (Identity 123)"
-            , "y = fix id"
-            , "type T = K.Type"
-            ]
-      liftIO $ expectedContentAfterAction @=? contentAfterAction
-  , testSession "remove unused operators whose name ends with '.'" $ do
-      let contentA = T.unlines
-            [ "module ModuleA where"
-            , "(@.) = 0 -- Must have an operator whose name ends with '.'"
-            , "a = 1 -- .. but also something else"
-            ]
-      _docA <- createDoc "ModuleA.hs" "haskell" contentA
-      let contentB = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            , "import ModuleA (a, (@.))"
-            , "x = a -- Must use something from module A, but not (@.)"
-            ]
-      docB <- createDoc "ModuleB.hs" "haskell" contentB
-      _ <- waitForDiagnostics
-      [InR action@CodeAction { _title = actionTitle }, _]
-          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
-      liftIO $ "Remove @. from import" @=? actionTitle
-      executeCodeAction action
-      contentAfterAction <- documentContents docB
-      let expectedContentAfterAction = T.unlines
-            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
-            , "module ModuleB where"
-            , "import ModuleA (a)"
-            , "x = a -- Must use something from module A, but not (@.)"
-            ]
-      liftIO $ expectedContentAfterAction @=? contentAfterAction
-  ]
-
-extendImportTests :: TestTree
-extendImportTests = testGroup "extend import actions"
-  [ testGroup "with checkAll" $ tests True
-  , testGroup "without checkAll" $ tests False
-  ]
-  where
-    tests overrideCheckProject =
-        [ testSession "extend all constructors for record field" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "data A = B { a :: Int }"
-                    ])]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (A(B))"
-                    , "f = a"
-                    ])
-            (Range (Position 2 4) (Position 2 5))
-            [ "Add A(..) to the import list of ModuleA"
-            , "Add A(a) to the import list of ModuleA"
-            , "Add a to the import list of ModuleA"
-            ]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (A(..))"
-                    , "f = a"
-                    ])
-        , testSession "extend all constructors with sibling" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "data Foo"
-                    , "data Bar"
-                    , "data A = B | C"
-                    ])]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA ( Foo,  A (C) , Bar ) "
-                    , "f = B"
-                    ])
-            (Range (Position 2 4) (Position 2 5))
-            [ "Add A(..) to the import list of ModuleA"
-            , "Add A(B) to the import list of ModuleA"
-            ]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA ( Foo,  A (..) , Bar ) "
-                    , "f = B"
-                    ])
-        , testSession "extend all constructors with comment" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "data Foo"
-                    , "data Bar"
-                    , "data A = B | C"
-                    ])]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA ( Foo,  A (C{-comment--}) , Bar ) "
-                    , "f = B"
-                    ])
-            (Range (Position 2 4) (Position 2 5))
-            [ "Add A(..) to the import list of ModuleA"
-            , "Add A(B) to the import list of ModuleA"
-            ]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA ( Foo,  A (..{-comment--}) , Bar ) "
-                    , "f = B"
-                    ])
-        , testSession "extend all constructors for type operator" $ template
-            []
-            ("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "import Data.Type.Equality ((:~:))"
-                    , "x :: (:~:) [] []"
-                    , "x = Refl"
-                    ])
-            (Range (Position 3 17) (Position 3 18))
-            [ "Add (:~:)(..) to the import list of Data.Type.Equality"
-            , "Add type (:~:)(Refl) to the import list of Data.Type.Equality"]
-            (T.unlines
-                    [ "module ModuleA where"
-                    , "import Data.Type.Equality ((:~:) (..))"
-                    , "x :: (:~:) [] []"
-                    , "x = Refl"
-                    ])
-        , testSession "extend all constructors for class" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "class C a where"
-                    , "  m1 :: a -> a"
-                    , "  m2 :: a -> a"
-                    ])]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (C(m1))"
-                    , "b = m2"
-                    ])
-            (Range (Position 2 5) (Position 2 5))
-            [ "Add C(..) to the import list of ModuleA"
-            , "Add C(m2) to the import list of ModuleA"
-            , "Add m2 to the import list of ModuleA"
-            ]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (C(..))"
-                    , "b = m2"
-                    ])
-        , testSession "extend single line import with value" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "stuffA :: Double"
-                    , "stuffA = 0.00750"
-                    , "stuffB :: Integer"
-                    , "stuffB = 123"
-                    ])]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA as A (stuffB)"
-                    , "main = print (stuffA, stuffB)"
-                    ])
-            (Range (Position 2 17) (Position 2 18))
-            ["Add stuffA to the import list of ModuleA"]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA as A (stuffB, stuffA)"
-                    , "main = print (stuffA, stuffB)"
-                    ])
-        , testSession "extend single line import with operator" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "(.*) :: Integer -> Integer -> Integer"
-                    , "x .* y = x * y"
-                    , "stuffB :: Integer"
-                    , "stuffB = 123"
-                    ])]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA as A (stuffB)"
-                    , "main = print (stuffB .* stuffB)"
-                    ])
-            (Range (Position 2 17) (Position 2 18))
-            ["Add (.*) to the import list of ModuleA"]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA as A (stuffB, (.*))"
-                    , "main = print (stuffB .* stuffB)"
-                    ])
-        , testSession "extend single line import with infix constructor" $ template
-            []
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import Data.List.NonEmpty (fromList)"
-                    , "main = case (fromList []) of _ :| _ -> pure ()"
-                    ])
-            (Range (Position 2 5) (Position 2 6))
-            [ "Add NonEmpty((:|)) to the import list of Data.List.NonEmpty"
-            , "Add NonEmpty(..) to the import list of Data.List.NonEmpty"
-            ]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import Data.List.NonEmpty (fromList, NonEmpty ((:|)))"
-                    , "main = case (fromList []) of _ :| _ -> pure ()"
-                    ])
-        , testSession "extend single line import with prefix constructor" $ template
-            []
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import Prelude hiding (Maybe(..))"
-                    , "import Data.Maybe (catMaybes)"
-                    , "x = Just 10"
-                    ])
-            (Range (Position 3 5) (Position 2 6))
-            [ "Add Maybe(Just) to the import list of Data.Maybe"
-            , "Add Maybe(..) to the import list of Data.Maybe"
-            ]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import Prelude hiding (Maybe(..))"
-                    , "import Data.Maybe (catMaybes, Maybe (Just))"
-                    , "x = Just 10"
-                    ])
-        , testSession "extend single line import with type" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "type A = Double"
-                    ])]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA ()"
-                    , "b :: A"
-                    , "b = 0"
-                    ])
-            (Range (Position 2 5) (Position 2 5))
-            ["Add A to the import list of ModuleA"]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (A)"
-                    , "b :: A"
-                    , "b = 0"
-                    ])
-        , testSession "extend single line import with constructor" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "data A = Constructor"
-                    ])]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (A)"
-                    , "b :: A"
-                    , "b = Constructor"
-                    ])
-            (Range (Position 3 5) (Position 3 5))
-            [ "Add A(Constructor) to the import list of ModuleA"
-            , "Add A(..) to the import list of ModuleA"
-            ]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (A (Constructor))"
-                    , "b :: A"
-                    , "b = Constructor"
-                    ])
-        , testSession "extend single line import with constructor (with comments)" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "data A = Constructor"
-                    ])]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (A ({-Constructor-}))"
-                    , "b :: A"
-                    , "b = Constructor"
-                    ])
-            (Range (Position 3 5) (Position 3 5))
-            [ "Add A(Constructor) to the import list of ModuleA"
-            , "Add A(..) to the import list of ModuleA"
-            ]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (A (Constructor{-Constructor-}))"
-                    , "b :: A"
-                    , "b = Constructor"
-                    ])
-        , testSession "extend single line import with mixed constructors" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "data A = ConstructorFoo | ConstructorBar"
-                    , "a = 1"
-                    ])]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (A (ConstructorBar), a)"
-                    , "b :: A"
-                    , "b = ConstructorFoo"
-                    ])
-            (Range (Position 3 5) (Position 3 5))
-            [ "Add A(ConstructorFoo) to the import list of ModuleA"
-            , "Add A(..) to the import list of ModuleA"
-            ]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (A (ConstructorBar, ConstructorFoo), a)"
-                    , "b :: A"
-                    , "b = ConstructorFoo"
-                    ])
-        , testSession "extend single line qualified import with value" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "stuffA :: Double"
-                    , "stuffA = 0.00750"
-                    , "stuffB :: Integer"
-                    , "stuffB = 123"
-                    ])]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import qualified ModuleA as A (stuffB)"
-                    , "main = print (A.stuffA, A.stuffB)"
-                    ])
-            (Range (Position 2 17) (Position 2 18))
-            ["Add stuffA to the import list of ModuleA"]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import qualified ModuleA as A (stuffB, stuffA)"
-                    , "main = print (A.stuffA, A.stuffB)"
-                    ])
-        , testSession "extend multi line import with value" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "stuffA :: Double"
-                    , "stuffA = 0.00750"
-                    , "stuffB :: Integer"
-                    , "stuffB = 123"
-                    ])]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (stuffB"
-                    , "               )"
-                    , "main = print (stuffA, stuffB)"
-                    ])
-            (Range (Position 3 17) (Position 3 18))
-            ["Add stuffA to the import list of ModuleA"]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (stuffB, stuffA"
-                    , "               )"
-                    , "main = print (stuffA, stuffB)"
-                    ])
-        , testSession "extend multi line import with trailing comma" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "stuffA :: Double"
-                    , "stuffA = 0.00750"
-                    , "stuffB :: Integer"
-                    , "stuffB = 123"
-                    ])]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (stuffB,"
-                    , "               )"
-                    , "main = print (stuffA, stuffB)"
-                    ])
-            (Range (Position 3 17) (Position 3 18))
-            ["Add stuffA to the import list of ModuleA"]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (stuffB, stuffA,"
-                    , "               )"
-                    , "main = print (stuffA, stuffB)"
-                    ])
-        , testSession "extend single line import with method within class" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "class C a where"
-                    , "  m1 :: a -> a"
-                    , "  m2 :: a -> a"
-                    ])]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (C(m1))"
-                    , "b = m2"
-                    ])
-            (Range (Position 2 5) (Position 2 5))
-            [ "Add C(m2) to the import list of ModuleA"
-            , "Add m2 to the import list of ModuleA"
-            , "Add C(..) to the import list of ModuleA"
-            ]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (C(m1, m2))"
-                    , "b = m2"
-                    ])
-        , testSession "extend single line import with method without class" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "class C a where"
-                    , "  m1 :: a -> a"
-                    , "  m2 :: a -> a"
-                    ])]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (C(m1))"
-                    , "b = m2"
-                    ])
-            (Range (Position 2 5) (Position 2 5))
-            [ "Add m2 to the import list of ModuleA"
-            , "Add C(m2) to the import list of ModuleA"
-            , "Add C(..) to the import list of ModuleA"
-            ]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA (C(m1), m2)"
-                    , "b = m2"
-                    ])
-        , testSession "extend import list with multiple choices" $ template
-            [("ModuleA.hs", T.unlines
-                    --  this is just a dummy module to help the arguments needed for this test
-                    [  "module ModuleA (bar) where"
-                    , "bar = 10"
-                    ]),
-            ("ModuleB.hs", T.unlines
-                    --  this is just a dummy module to help the arguments needed for this test
-                    [  "module ModuleB (bar) where"
-                    , "bar = 10"
-                    ])]
-            ("ModuleC.hs", T.unlines
-                    [ "module ModuleC where"
-                    , "import ModuleB ()"
-                    , "import ModuleA ()"
-                    , "foo = bar"
-                    ])
-            (Range (Position 3 17) (Position 3 18))
-            ["Add bar to the import list of ModuleA",
-            "Add bar to the import list of ModuleB"]
-            (T.unlines
-                    [ "module ModuleC where"
-                    , "import ModuleB ()"
-                    , "import ModuleA (bar)"
-                    , "foo = bar"
-                    ])
-        , testSession "extend import list with constructor of type operator" $ template
-            []
-            ("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "import Data.Type.Equality ((:~:))"
-                    , "x :: (:~:) [] []"
-                    , "x = Refl"
-                    ])
-            (Range (Position 3 17) (Position 3 18))
-            [ "Add type (:~:)(Refl) to the import list of Data.Type.Equality"
-            , "Add (:~:)(..) to the import list of Data.Type.Equality"]
-            (T.unlines
-                    [ "module ModuleA where"
-                    , "import Data.Type.Equality ((:~:) (Refl))"
-                    , "x :: (:~:) [] []"
-                    , "x = Refl"
-                    ])
-        , expectFailBecause "importing pattern synonyms is unsupported"
-          $ testSession "extend import list with pattern synonym" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "{-# LANGUAGE PatternSynonyms #-}"
-                      , "module ModuleA where"
-                      , "pattern Some x = Just x"
-                    ])
-            ]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import A ()"
-                    , "k (Some x) = x"
-                    ])
-            (Range (Position 2 3) (Position 2 7))
-            ["Add pattern Some to the import list of A"]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import A (pattern Some)"
-                    , "k (Some x) = x"
-                    ])
-        , ignoreForGHC92 "Diagnostic message has no suggestions" $
-          testSession "type constructor name same as data constructor name" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "newtype Foo = Foo Int"
-                    ])]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA(Foo)"
-                    , "f :: Foo"
-                    , "f = Foo 1"
-                    ])
-            (Range (Position 3 4) (Position 3 6))
-            ["Add Foo(Foo) to the import list of ModuleA", "Add Foo(..) to the import list of ModuleA"]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA(Foo (Foo))"
-                    , "f :: Foo"
-                    , "f = Foo 1"
-                    ])
-        , testSession "type constructor name same as data constructor name, data constructor extraneous" $ template
-            [("ModuleA.hs", T.unlines
-                    [ "module ModuleA where"
-                    , "data Foo = Foo"
-                    ])]
-            ("ModuleB.hs", T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA()"
-                    , "f :: Foo"
-                    , "f = undefined"
-                    ])
-            (Range (Position 2 4) (Position 2 6))
-            ["Add Foo to the import list of ModuleA"]
-            (T.unlines
-                    [ "module ModuleB where"
-                    , "import ModuleA(Foo)"
-                    , "f :: Foo"
-                    , "f = undefined"
-                    ])
-        ]
-      where
-        codeActionTitle CodeAction{_title=x} = x
-
-        template setUpModules moduleUnderTest range expectedTitles expectedContentB = do
-            configureCheckProject overrideCheckProject
-
-            mapM_ (\x -> createDoc (fst x) "haskell" (snd x)) setUpModules
-            docB <- createDoc (fst moduleUnderTest) "haskell" (snd moduleUnderTest)
-            _  <- waitForDiagnostics
-            waitForProgressDone
-            actionsOrCommands <- getCodeActions docB range
-            let codeActions =
-                  filter
-                    (T.isPrefixOf "Add" . codeActionTitle)
-                    [ca | InR ca <- actionsOrCommands]
-                actualTitles = codeActionTitle <$> codeActions
-            -- Note that we are not testing the order of the actions, as the
-            -- order of the expected actions indicates which one we'll execute
-            -- in this test, i.e., the first one.
-            liftIO $ sort expectedTitles @=? sort actualTitles
-
-            -- Execute the action with the same title as the first expected one.
-            -- Since we tested that both lists have the same elements (possibly
-            -- in a different order), this search cannot fail.
-            let firstTitle:_ = expectedTitles
-                action = fromJust $
-                  find ((firstTitle ==) . codeActionTitle) codeActions
-            executeCodeAction action
-            contentAfterAction <- documentContents docB
-            liftIO $ expectedContentB @=? contentAfterAction
-
-fixModuleImportTypoTests :: TestTree
-fixModuleImportTypoTests = testGroup "fix module import typo"
-    [ testSession "works when single module suggested" $ do
-        doc <- createDoc "A.hs" "haskell" "import Data.Cha"
-        _ <- waitForDiagnostics
-        InR action@CodeAction { _title = actionTitle } : _  <- getCodeActions doc (R 0 0 0 10)
-        liftIO $ actionTitle @?= "replace with Data.Char"
-        executeCodeAction action
-        contentAfterAction <- documentContents doc
-        liftIO $ contentAfterAction @?= "import Data.Char"
-    , testSession "works when multiple modules suggested" $ do
-        doc <- createDoc "A.hs" "haskell" "import Data.I"
-        _ <- waitForDiagnostics
-        actions <- sortOn (\(InR CodeAction{_title=x}) -> x) <$> getCodeActions doc (R 0 0 0 10)
-        let actionTitles = [ title | InR CodeAction{_title=title} <- actions ]
-        liftIO $ actionTitles @?= [ "replace with Data.Eq"
-                                  , "replace with Data.Int"
-                                  , "replace with Data.Ix"
-                                  ]
-        let InR replaceWithDataEq : _ = actions
-        executeCodeAction replaceWithDataEq
-        contentAfterAction <- documentContents doc
-        liftIO $ contentAfterAction @?= "import Data.Eq"
-    ]
-
-extendImportTestsRegEx :: TestTree
-extendImportTestsRegEx = testGroup "regex parsing"
-    [
-      testCase "parse invalid multiple imports" $ template "foo bar foo" Nothing
-    , testCase "parse malformed import list" $ template
-                  "\n\8226 Perhaps you want to add \8216fromList\8217 to one of these import lists:\n    \8216Data.Map\8217)"
-                  Nothing
-    , testCase "parse multiple imports" $ template
-                 "\n\8226 Perhaps you want to add \8216fromList\8217 to one of these import lists:\n    \8216Data.Map\8217 (app/testlsp.hs:7:1-18)\n    \8216Data.HashMap.Strict\8217 (app/testlsp.hs:8:1-29)"
-                 $ Just ("fromList",[("Data.Map","app/testlsp.hs:7:1-18"),("Data.HashMap.Strict","app/testlsp.hs:8:1-29")])
-    ]
-    where
-        template message expected = do
-            liftIO $ matchRegExMultipleImports message @=? expected
-
-suggestImportClassMethodTests :: TestTree
-suggestImportClassMethodTests =
-  testGroup
-    "suggest import class methods"
-    [ testGroup
-        "new"
-        [ testSession "via parent" $
-            template'
-            "import Data.Semigroup (Semigroup(stimes))"
-            (Range (Position 4 2) (Position 4 8)),
-          testSession "top level" $
-            template'
-              "import Data.Semigroup (stimes)"
-              (Range (Position 4 2) (Position 4 8)),
-          testSession "all" $
-            template'
-              "import Data.Semigroup"
-              (Range (Position 4 2) (Position 4 8))
-        ],
-      testGroup
-        "extend"
-        [ testSession "via parent" $
-            template
-              [ "module A where",
-                "",
-                "import Data.Semigroup ()"
-              ]
-              (Range (Position 6 2) (Position 6 8))
-              "Add Semigroup(stimes) to the import list of Data.Semigroup"
-              [ "module A where",
-                "",
-                "import Data.Semigroup (Semigroup (stimes))"
-              ],
-          testSession "top level" $
-            template
-              [ "module A where",
-                "",
-                "import Data.Semigroup ()"
-              ]
-              (Range (Position 6 2) (Position 6 8))
-              "Add stimes to the import list of Data.Semigroup"
-              [ "module A where",
-                "",
-                "import Data.Semigroup (stimes)"
-              ]
-        ]
-    ]
-  where
-    decls =
-      [ "data X = X",
-        "instance Semigroup X where",
-        "  (<>) _ _ = X",
-        "  stimes _ _ = X"
-      ]
-    template beforeContent range executeTitle expectedContent = do
-      doc <- createDoc "A.hs" "haskell" $ T.unlines (beforeContent <> decls)
-      _ <- waitForDiagnostics
-      waitForProgressDone
-      actions <- getCodeActions doc range
-      let actions' = [x | InR x <- actions]
-          titles = [_title | CodeAction {_title} <- actions']
-      liftIO $ executeTitle `elem` titles @? T.unpack executeTitle <> " does not in " <> show titles
-      executeCodeAction $ fromJust $ find (\CodeAction {_title} -> _title == executeTitle) actions'
-      content <- documentContents doc
-      liftIO $ T.unlines (expectedContent <> decls) @=? content
-    template' executeTitle range = let c = ["module A where"] in template c range executeTitle $ c <> [executeTitle]
-
-suggestImportTests :: TestTree
-suggestImportTests = testGroup "suggest import actions"
-  [ testGroup "Dont want suggestion"
-    [ -- extend import
-      test False ["Data.List.NonEmpty ()"] "f = nonEmpty" []                "import Data.List.NonEmpty (nonEmpty)"
-      -- data constructor
-    , test False []                        "f = First"    []                "import Data.Monoid (First)"
-      -- internal module
-    , test False []         "f :: Typeable a => a"        ["f = undefined"] "import Data.Typeable.Internal (Typeable)"
-      -- package not in scope
-    , test False []         "f = quickCheck"              []                "import Test.QuickCheck (quickCheck)"
-      -- don't omit the parent data type of a constructor
-    , test False []         "f ExitSuccess = ()"          []                "import System.Exit (ExitSuccess)"
-      -- don't suggest data constructor when we only need the type
-    , test False []         "f :: Bar"                    []                "import Bar (Bar(Bar))"
-      -- don't suggest all data constructors for the data type
-    , test False []         "f :: Bar"                    []                "import Bar (Bar(..))"
-    ]
-  , testGroup "want suggestion"
-    [ wantWait  []          "f = foo"                     []                "import Foo (foo)"
-    , wantWait  []          "f = Bar"                     []                "import Bar (Bar(Bar))"
-    , wantWait  []          "f :: Bar"                    []                "import Bar (Bar)"
-    , wantWait  []          "f = Bar"                     []                "import Bar (Bar(..))"
-    , test True []          "f = nonEmpty"                []                "import Data.List.NonEmpty (nonEmpty)"
-    , test True []          "f = (:|)"                    []                "import Data.List.NonEmpty (NonEmpty((:|)))"
-    , test True []          "f :: Natural"                ["f = undefined"] "import Numeric.Natural (Natural)"
-    , test True []          "f :: Natural"                ["f = undefined"] "import Numeric.Natural"
-    , test True []          "f :: NonEmpty ()"            ["f = () :| []"]  "import Data.List.NonEmpty (NonEmpty)"
-    , test True []          "f :: NonEmpty ()"            ["f = () :| []"]  "import Data.List.NonEmpty"
-    , test True []          "f = First"                   []                "import Data.Monoid (First(First))"
-    , test True []          "f = Endo"                    []                "import Data.Monoid (Endo(Endo))"
-    , test True []          "f = Version"                 []                "import Data.Version (Version(Version))"
-    , test True []          "f ExitSuccess = ()"          []                "import System.Exit (ExitCode(ExitSuccess))"
-    , test True []          "f = AssertionFailed"         []                "import Control.Exception (AssertionFailed(AssertionFailed))"
-    , test True ["Prelude"] "f = nonEmpty"                []                "import Data.List.NonEmpty (nonEmpty)"
-    , test True []          "f :: Alternative f => f ()"  ["f = undefined"] "import Control.Applicative (Alternative)"
-    , test True []          "f :: Alternative f => f ()"  ["f = undefined"] "import Control.Applicative"
-    , test True []          "f = empty"                   []                "import Control.Applicative (Alternative(empty))"
-    , test True []          "f = empty"                   []                "import Control.Applicative (empty)"
-    , test True []          "f = empty"                   []                "import Control.Applicative"
-    , test True []          "f = (&)"                     []                "import Data.Function ((&))"
-    , test True []          "f = NE.nonEmpty"             []                "import qualified Data.List.NonEmpty as NE"
-    , test True []          "f = Data.List.NonEmpty.nonEmpty" []            "import qualified Data.List.NonEmpty"
-    , test True []          "f :: Typeable a => a"        ["f = undefined"] "import Data.Typeable (Typeable)"
-    , test True []          "f = pack"                    []                "import Data.Text (pack)"
-    , test True []          "f :: Text"                   ["f = undefined"] "import Data.Text (Text)"
-    , test True []          "f = [] & id"                 []                "import Data.Function ((&))"
-    , test True []          "f = (&) [] id"               []                "import Data.Function ((&))"
-    , test True []          "f = (.|.)"                   []                "import Data.Bits (Bits((.|.)))"
-    , test True []          "f = (.|.)"                   []                "import Data.Bits ((.|.))"
-    , test True []          "f :: a ~~ b"                 []                "import Data.Type.Equality (type (~~))"
-    , test True
-      ["qualified Data.Text as T"
-      ]                     "f = T.putStrLn"              []                "import qualified Data.Text.IO as T"
-    , test True
-      [ "qualified Data.Text as T"
-      , "qualified Data.Function as T"
-      ]                     "f = T.putStrLn"              []                "import qualified Data.Text.IO as T"
-    , test True
-      [ "qualified Data.Text as T"
-      , "qualified Data.Function as T"
-      , "qualified Data.Functor as T"
-      , "qualified Data.Data as T"
-      ]                     "f = T.putStrLn"              []                "import qualified Data.Text.IO as T"
-    , test True []          "f = (.|.)"                   []                "import Data.Bits (Bits(..))"
-    , test True []          "f = empty"                   []                "import Control.Applicative (Alternative(..))"
-    ]
-  , expectFailBecause "importing pattern synonyms is unsupported" $ test True [] "k (Some x) = x" [] "import B (pattern Some)"
-  ]
-  where
-    test = test' False
-    wantWait = test' True True
-
-    test' waitForCheckProject wanted imps def other newImp = testSessionWithExtraFiles "hover" (T.unpack def) $ \dir -> do
-      configureCheckProject waitForCheckProject
-      let before = T.unlines $ "module A where" : ["import " <> x | x <- imps] ++ def : other
-          after  = T.unlines $ "module A where" : ["import " <> x | x <- imps] ++ [newImp] ++ def : other
-          cradle = "cradle: {direct: {arguments: [-hide-all-packages, -package, base, -package, text, -package-env, -, A, Bar, Foo, B]}}"
-      liftIO $ writeFileUTF8 (dir </> "hie.yaml") cradle
-      liftIO $ writeFileUTF8 (dir </> "B.hs") $ unlines ["{-# LANGUAGE PatternSynonyms #-}", "module B where", "pattern Some x = Just x"]
-      doc <- createDoc "Test.hs" "haskell" before
-      waitForProgressDone
-      _ <- waitForDiagnostics
-      -- there isn't a good way to wait until the whole project is checked atm
-      when waitForCheckProject $ liftIO $ sleep 0.5
-      let defLine = fromIntegral $ length imps + 1
-          range = Range (Position defLine 0) (Position defLine maxBound)
-      actions <- getCodeActions doc range
-      if wanted
-         then do
-             action <- liftIO $ pickActionWithTitle newImp actions
-             executeCodeAction action
-             contentAfterAction <- documentContents doc
-             liftIO $ after @=? contentAfterAction
-          else
-              liftIO $ [_title | InR CodeAction{_title} <- actions, _title == newImp ] @?= []
-
-suggestImportDisambiguationTests :: TestTree
-suggestImportDisambiguationTests = testGroup "suggest import disambiguation actions"
-  [ testGroup "Hiding strategy works"
-    [ testGroup "fromList"
-        [ testCase "AVec" $
-            compareHideFunctionTo [(8,9),(10,8)]
-                "Use AVec for fromList, hiding other imports"
-                "HideFunction.expected.fromList.A.hs"
-        , testCase "BVec" $
-            compareHideFunctionTo [(8,9),(10,8)]
-                "Use BVec for fromList, hiding other imports"
-                "HideFunction.expected.fromList.B.hs"
-        ]
-    , testGroup "(++)"
-        [ testCase "EVec" $
-            compareHideFunctionTo [(8,9),(10,8)]
-                "Use EVec for ++, hiding other imports"
-                "HideFunction.expected.append.E.hs"
-        , testCase "Hide functions without local" $
-            compareTwo
-                "HideFunctionWithoutLocal.hs" [(8,8)]
-                "Use local definition for ++, hiding other imports"
-                "HideFunctionWithoutLocal.expected.hs"
-        , testCase "Prelude" $
-            compareHideFunctionTo [(8,9),(10,8)]
-                "Use Prelude for ++, hiding other imports"
-                "HideFunction.expected.append.Prelude.hs"
-        , testCase "Prelude and local definition, infix" $
-            compareTwo
-                "HidePreludeLocalInfix.hs" [(2,19)]
-                "Use local definition for ++, hiding other imports"
-                "HidePreludeLocalInfix.expected.hs"
-        , testCase "AVec, indented" $
-            compareTwo "HidePreludeIndented.hs" [(3,8)]
-            "Use AVec for ++, hiding other imports"
-            "HidePreludeIndented.expected.hs"
-
-        ]
-    , testGroup "Vec (type)"
-        [ testCase "AVec" $
-            compareTwo
-                "HideType.hs" [(8,15)]
-                "Use AVec for Vec, hiding other imports"
-                "HideType.expected.A.hs"
-        , testCase "EVec" $
-            compareTwo
-                "HideType.hs" [(8,15)]
-                "Use EVec for Vec, hiding other imports"
-                "HideType.expected.E.hs"
-        ]
-    ]
-  , testGroup "Qualify strategy"
-    [ testCase "won't suggest full name for qualified module" $
-      withHideFunction [(8,9),(10,8)] $ \_ actions -> do
-        liftIO $
-            assertBool "EVec.fromList must not be suggested" $
-                "Replace with qualified: EVec.fromList" `notElem`
-                [ actionTitle
-                | InR CodeAction { _title = actionTitle } <- actions
-                ]
-        liftIO $
-            assertBool "EVec.++ must not be suggested" $
-                "Replace with qualified: EVec.++" `notElem`
-                [ actionTitle
-                | InR CodeAction { _title = actionTitle } <- actions
-                ]
-    , testGroup "fromList"
-        [ testCase "EVec" $
-            compareHideFunctionTo [(8,9),(10,8)]
-                "Replace with qualified: E.fromList"
-                "HideFunction.expected.qualified.fromList.E.hs"
-        , testCase "Hide DuplicateRecordFields" $
-            compareTwo
-                "HideQualifyDuplicateRecordFields.hs" [(9, 9)]
-                "Replace with qualified: AVec.fromList"
-                "HideQualifyDuplicateRecordFields.expected.hs"
-        , testCase "Duplicate record fields should not be imported" $ do
-          withTarget ("HideQualifyDuplicateRecordFields" <.> ".hs") [(9, 9)] $
-            \_ actions -> do
-              liftIO $
-                assertBool "Hidings should not be presented while DuplicateRecordFields exists" $
-                  all not [ actionTitle =~ T.pack "Use ([A-Za-z][A-Za-z0-9]*) for fromList, hiding other imports"
-                      | InR CodeAction { _title = actionTitle } <- actions]
-          withTarget ("HideQualifyDuplicateRecordFieldsSelf" <.> ".hs") [(4, 4)] $
-            \_ actions -> do
-              liftIO $
-                assertBool "ambiguity from DuplicateRecordFields should not be imported" $
-                  null actions
-        ]
-    , testGroup "(++)"
-        [ testCase "Prelude, parensed" $
-            compareHideFunctionTo [(8,9),(10,8)]
-                "Replace with qualified: Prelude.++"
-                "HideFunction.expected.qualified.append.Prelude.hs"
-        , testCase "Prelude, infix" $
-            compareTwo
-                "HideQualifyInfix.hs" [(4,19)]
-                "Replace with qualified: Prelude.++"
-                "HideQualifyInfix.expected.hs"
-        , testCase "Prelude, left section" $
-            compareTwo
-                "HideQualifySectionLeft.hs" [(4,15)]
-                "Replace with qualified: Prelude.++"
-                "HideQualifySectionLeft.expected.hs"
-        , testCase "Prelude, right section" $
-            compareTwo
-                "HideQualifySectionRight.hs" [(4,18)]
-                "Replace with qualified: Prelude.++"
-                "HideQualifySectionRight.expected.hs"
-        ]
-    ]
-  ]
-  where
-    hidingDir = "test/data/hiding"
-    compareTwo original locs cmd expected =
-        withTarget original locs $ \doc actions -> do
-            expected <- liftIO $
-                readFileUtf8 (hidingDir </> expected)
-            action <- liftIO $ pickActionWithTitle cmd actions
-            executeCodeAction action
-            contentAfterAction <- documentContents doc
-            liftIO $ T.replace "\r\n" "\n" expected @=? contentAfterAction
-    compareHideFunctionTo = compareTwo "HideFunction.hs"
-    auxFiles = ["AVec.hs", "BVec.hs", "CVec.hs", "DVec.hs", "EVec.hs", "FVec.hs"]
-    withTarget file locs k = withTempDir $ \dir -> runInDir dir $ do
-        liftIO $ mapM_ (\fp -> copyFile (hidingDir </> fp) $ dir </> fp)
-            $ file : auxFiles
-        doc <- openDoc file "haskell"
-        waitForProgressDone
-        void $ expectDiagnostics [(file, [(DsError, loc, "Ambiguous occurrence") | loc <- locs])]
-        actions <- getAllCodeActions doc
-        k doc actions
-    withHideFunction = withTarget ("HideFunction" <.> "hs")
-
-suggestHideShadowTests :: TestTree
-suggestHideShadowTests =
-  testGroup
-    "suggest hide shadow"
-    [ testGroup
-        "single"
-        [ testOneCodeAction
-            "hide unsued"
-            "Hide on from Data.Function"
-            (1, 2)
-            (1, 4)
-            [ "import Data.Function"
-            , "f on = on"
-            , "g on = on"
-            ]
-            [ "import Data.Function hiding (on)"
-            , "f on = on"
-            , "g on = on"
-            ]
-        , testOneCodeAction
-            "extend hiding unsued"
-            "Hide on from Data.Function"
-            (1, 2)
-            (1, 4)
-            [ "import Data.Function hiding ((&))"
-            , "f on = on"
-            ]
-            [ "import Data.Function hiding (on, (&))"
-            , "f on = on"
-            ]
-        , testOneCodeAction
-            "delete unsued"
-            "Hide on from Data.Function"
-            (1, 2)
-            (1, 4)
-            [ "import Data.Function ((&), on)"
-            , "f on = on"
-            ]
-            [ "import Data.Function ((&))"
-            , "f on = on"
-            ]
-        , testOneCodeAction
-            "hide operator"
-            "Hide & from Data.Function"
-            (1, 2)
-            (1, 5)
-            [ "import Data.Function"
-            , "f (&) = (&)"
-            ]
-            [ "import Data.Function hiding ((&))"
-            , "f (&) = (&)"
-            ]
-        , testOneCodeAction
-            "remove operator"
-            "Hide & from Data.Function"
-            (1, 2)
-            (1, 5)
-            [ "import Data.Function ((&), on)"
-            , "f (&) = (&)"
-            ]
-            [ "import Data.Function ( on)"
-            , "f (&) = (&)"
-            ]
-        , noCodeAction
-            "don't remove already used"
-            (2, 2)
-            (2, 4)
-            [ "import Data.Function"
-            , "g = on"
-            , "f on = on"
-            ]
-        ]
-    , testGroup
-        "multi"
-        [ testOneCodeAction
-            "hide from B"
-            "Hide ++ from B"
-            (2, 2)
-            (2, 6)
-            [ "import B"
-            , "import C"
-            , "f (++) = (++)"
-            ]
-            [ "import B hiding ((++))"
-            , "import C"
-            , "f (++) = (++)"
-            ]
-        , testOneCodeAction
-            "hide from C"
-            "Hide ++ from C"
-            (2, 2)
-            (2, 6)
-            [ "import B"
-            , "import C"
-            , "f (++) = (++)"
-            ]
-            [ "import B"
-            , "import C hiding ((++))"
-            , "f (++) = (++)"
-            ]
-        , testOneCodeAction
-            "hide from Prelude"
-            "Hide ++ from Prelude"
-            (2, 2)
-            (2, 6)
-            [ "import B"
-            , "import C"
-            , "f (++) = (++)"
-            ]
-            [ "import B"
-            , "import C"
-            , "import Prelude hiding ((++))"
-            , "f (++) = (++)"
-            ]
-        , testMultiCodeActions
-            "manual hide all"
-            [ "Hide ++ from Prelude"
-            , "Hide ++ from C"
-            , "Hide ++ from B"
-            ]
-            (2, 2)
-            (2, 6)
-            [ "import B"
-            , "import C"
-            , "f (++) = (++)"
-            ]
-            [ "import B hiding ((++))"
-            , "import C hiding ((++))"
-            , "import Prelude hiding ((++))"
-            , "f (++) = (++)"
-            ]
-        , testOneCodeAction
-            "auto hide all"
-            "Hide ++ from all occurence imports"
-            (2, 2)
-            (2, 6)
-            [ "import B"
-            , "import C"
-            , "f (++) = (++)"
-            ]
-            [ "import B hiding ((++))"
-            , "import C hiding ((++))"
-            , "import Prelude hiding ((++))"
-            , "f (++) = (++)"
-            ]
-        ]
-    ]
- where
-  testOneCodeAction testName actionName start end origin expected =
-    helper testName start end origin expected $ \cas -> do
-      action <- liftIO $ pickActionWithTitle actionName cas
-      executeCodeAction action
-  noCodeAction testName start end origin =
-    helper testName start end origin origin $ \cas -> do
-      liftIO $ cas @?= []
-  testMultiCodeActions testName actionNames start end origin expected =
-    helper testName start end origin expected $ \cas -> do
-      let r = [ca | (InR ca) <- cas, ca ^. L.title `elem` actionNames]
-      liftIO $
-        (length r == length actionNames)
-          @? "Expected " <> show actionNames <> ", but got " <> show cas <> " which is not its superset"
-      forM_ r executeCodeAction
-  helper testName (line1, col1) (line2, col2) origin expected k = testSession testName $ do
-    void $ createDoc "B.hs" "haskell" $ T.unlines docB
-    void $ createDoc "C.hs" "haskell" $ T.unlines docC
-    doc <- createDoc "A.hs" "haskell" $ T.unlines (header <> origin)
-    void waitForDiagnostics
-    waitForProgressDone
-    cas <- getCodeActions doc (Range (Position (fromIntegral $ line1 + length header) col1) (Position (fromIntegral $ line2 + length header) col2))
-    void $ k [x | x@(InR ca) <- cas, "Hide" `T.isPrefixOf` (ca ^. L.title)]
-    contentAfter <- documentContents doc
-    liftIO $ contentAfter @?= T.unlines (header <> expected)
-  header =
-    [ "{-# OPTIONS_GHC -Wname-shadowing #-}"
-    , "module A where"
-    , ""
-    ]
-  -- for multi group
-  docB =
-    [ "module B where"
-    , "(++) = id"
-    ]
-  docC =
-    [ "module C where"
-    , "(++) = id"
-    ]
-
-insertNewDefinitionTests :: TestTree
-insertNewDefinitionTests = testGroup "insert new definition actions"
-  [ testSession "insert new function definition" $ do
-      let txtB =
-            ["foo True = select [True]"
-            , ""
-            ,"foo False = False"
-            ]
-          txtB' =
-            [""
-            ,"someOtherCode = ()"
-            ]
-      docB <- createDoc "ModuleB.hs" "haskell" (T.unlines $ txtB ++ txtB')
-      _ <- waitForDiagnostics
-      InR action@CodeAction { _title = actionTitle } : _
-                  <- sortOn (\(InR CodeAction{_title=x}) -> x) <$>
-                     getCodeActions docB (R 0 0 0 50)
-      liftIO $ actionTitle @?= "Define select :: [Bool] -> Bool"
-      executeCodeAction action
-      contentAfterAction <- documentContents docB
-      liftIO $ contentAfterAction @?= T.unlines (txtB ++
-        [ ""
-        , "select :: [Bool] -> Bool"
-        , "select = _"
-        ]
-        ++ txtB')
-  , testSession "define a hole" $ do
-      let txtB =
-            ["foo True = _select [True]"
-            , ""
-            ,"foo False = False"
-            ]
-          txtB' =
-            [""
-            ,"someOtherCode = ()"
-            ]
-      docB <- createDoc "ModuleB.hs" "haskell" (T.unlines $ txtB ++ txtB')
-      _ <- waitForDiagnostics
-      InR action@CodeAction { _title = actionTitle } : _
-                  <- sortOn (\(InR CodeAction{_title=x}) -> x) <$>
-                     getCodeActions docB (R 0 0 0 50)
-      liftIO $ actionTitle @?= "Define select :: [Bool] -> Bool"
-      executeCodeAction action
-      contentAfterAction <- documentContents docB
-      liftIO $ contentAfterAction @?= T.unlines (
-        ["foo True = select [True]"
-        , ""
-        ,"foo False = False"
-        , ""
-        , "select :: [Bool] -> Bool"
-        , "select = _"
-        ]
-        ++ txtB')
-  , testSession "insert new function definition - Haddock comments" $ do
-    let start =  ["foo :: Int -> Bool"
-                 , "foo x = select (x + 1)"
-                 , ""
-                 , "-- | This is a haddock comment"
-                 , "haddock :: Int -> Int"
-                 , "haddock = undefined"
-                 ]
-    let expected =  ["foo :: Int -> Bool"
-             , "foo x = select (x + 1)"
-             , ""
-             , "select :: Int -> Bool"
-             , "select = _"
-             , ""
-             , "-- | This is a haddock comment"
-             , "haddock :: Int -> Int"
-             , "haddock = undefined"]
-    docB <- createDoc "ModuleB.hs" "haskell" (T.unlines start)
-    _ <- waitForDiagnostics
-    InR action@CodeAction { _title = actionTitle } : _
-                <- sortOn (\(InR CodeAction{_title=x}) -> x) <$>
-                    getCodeActions docB (R 1 0 0 50)
-    liftIO $ actionTitle @?= "Define select :: Int -> Bool"
-    executeCodeAction action
-    contentAfterAction <- documentContents docB
-    liftIO $ contentAfterAction @?= T.unlines expected
-  , testSession "insert new function definition - normal comments" $ do
-    let start =  ["foo :: Int -> Bool"
-                 , "foo x = select (x + 1)"
-                 , ""
-                 , "-- This is a normal comment"
-                 , "normal :: Int -> Int"
-                 , "normal = undefined"
-                 ]
-    let expected =  ["foo :: Int -> Bool"
-             , "foo x = select (x + 1)"
-             , ""
-             , "select :: Int -> Bool"
-             , "select = _"
-             , ""
-             , "-- This is a normal comment"
-             , "normal :: Int -> Int"
-             , "normal = undefined"]
-    docB <- createDoc "ModuleB.hs" "haskell" (T.unlines start)
-    _ <- waitForDiagnostics
-    InR action@CodeAction { _title = actionTitle } : _
-                <- sortOn (\(InR CodeAction{_title=x}) -> x) <$>
-                    getCodeActions docB (R 1 0 0 50)
-    liftIO $ actionTitle @?= "Define select :: Int -> Bool"
-    executeCodeAction action
-    contentAfterAction <- documentContents docB
-    liftIO $ contentAfterAction @?= T.unlines expected
-  ]
-
-
-deleteUnusedDefinitionTests :: TestTree
-deleteUnusedDefinitionTests = testGroup "delete unused definition action"
-  [ testSession "delete unused top level binding" $
-    testFor
-    (T.unlines [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-               , "module A (some) where"
-               , ""
-               , "f :: Int -> Int"
-               , "f 1 = let a = 1"
-               , "      in a"
-               , "f 2 = 2"
-               , ""
-               , "some = ()"
-               ])
-    (4, 0)
-    "Delete ‘f’"
-    (T.unlines [
-        "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-        , "module A (some) where"
-        , ""
-        , "some = ()"
-        ])
-
-  , testSession "delete unused top level binding defined in infix form" $
-    testFor
-    (T.unlines [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-               , "module A (some) where"
-               , ""
-               , "myPlus :: Int -> Int -> Int"
-               , "a `myPlus` b = a + b"
-               , ""
-               , "some = ()"
-               ])
-    (4, 2)
-    "Delete ‘myPlus’"
-    (T.unlines [
-        "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-        , "module A (some) where"
-        , ""
-        , "some = ()"
-      ])
-  , testSession "delete unused binding in where clause" $
-    testFor
-    (T.unlines [ "{-# OPTIONS_GHC -Wunused-binds #-}"
-               , "module A (h, g) where"
-               , ""
-               , "h :: Int"
-               , "h = 3"
-               , ""
-               , "g :: Int"
-               , "g = 6"
-               , "  where"
-               , "    h :: Int"
-               , "    h = 4"
-               , ""
-               ])
-    (10, 4)
-    "Delete ‘h’"
-    (T.unlines [ "{-# OPTIONS_GHC -Wunused-binds #-}"
-               , "module A (h, g) where"
-               , ""
-               , "h :: Int"
-               , "h = 3"
-               , ""
-               , "g :: Int"
-               , "g = 6"
-               , "  where"
-               , ""
-               ])
-  , testSession "delete unused binding with multi-oneline signatures front" $
-    testFor
-    (T.unlines [ "{-# OPTIONS_GHC -Wunused-binds #-}"
-               , "module A (b, c) where"
-               , ""
-               , "a, b, c :: Int"
-               , "a = 3"
-               , "b = 4"
-               , "c = 5"
-               ])
-    (4, 0)
-    "Delete ‘a’"
-    (T.unlines [ "{-# OPTIONS_GHC -Wunused-binds #-}"
-               , "module A (b, c) where"
-               , ""
-               , "b, c :: Int"
-               , "b = 4"
-               , "c = 5"
-               ])
-  , testSession "delete unused binding with multi-oneline signatures mid" $
-    testFor
-    (T.unlines [ "{-# OPTIONS_GHC -Wunused-binds #-}"
-               , "module A (a, c) where"
-               , ""
-               , "a, b, c :: Int"
-               , "a = 3"
-               , "b = 4"
-               , "c = 5"
-               ])
-    (5, 0)
-    "Delete ‘b’"
-    (T.unlines [ "{-# OPTIONS_GHC -Wunused-binds #-}"
-               , "module A (a, c) where"
-               , ""
-               , "a, c :: Int"
-               , "a = 3"
-               , "c = 5"
-               ])
-  , testSession "delete unused binding with multi-oneline signatures end" $
-    testFor
-    (T.unlines [ "{-# OPTIONS_GHC -Wunused-binds #-}"
-               , "module A (a, b) where"
-               , ""
-               , "a, b, c :: Int"
-               , "a = 3"
-               , "b = 4"
-               , "c = 5"
-               ])
-    (6, 0)
-    "Delete ‘c’"
-    (T.unlines [ "{-# OPTIONS_GHC -Wunused-binds #-}"
-               , "module A (a, b) where"
-               , ""
-               , "a, b :: Int"
-               , "a = 3"
-               , "b = 4"
-               ])
-  ]
-  where
-    testFor source pos expectedTitle expectedResult = do
-      docId <- createDoc "A.hs" "haskell" source
-      expectDiagnostics [ ("A.hs", [(DsWarning, pos, "not used")]) ]
-
-      (action, title) <- extractCodeAction docId "Delete" pos
-
-      liftIO $ title @?= expectedTitle
-      executeCodeAction action
-      contentAfterAction <- documentContents docId
-      liftIO $ contentAfterAction @?= expectedResult
-
-    extractCodeAction docId actionPrefix (l, c) = do
-      [action@CodeAction { _title = actionTitle }]  <- findCodeActionsByPrefix docId (R l c l c) [actionPrefix]
-      return (action, actionTitle)
-
-addTypeAnnotationsToLiteralsTest :: TestTree
-addTypeAnnotationsToLiteralsTest = testGroup "add type annotations to literals to satisfy constraints"
-  [
-    testSession "add default type to satisfy one constraint" $
-    testFor
-    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
-               , "module A (f) where"
-               , ""
-               , "f = 1"
-               ])
-    [ (DsWarning, (3, 4), "Defaulting the following constraint") ]
-    "Add type annotation ‘Integer’ to ‘1’"
-    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
-               , "module A (f) where"
-               , ""
-               , "f = (1 :: Integer)"
-               ])
-
-  , testSession "add default type to satisfy one constraint in nested expressions" $
-    testFor
-    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
-               , "module A where"
-               , ""
-               , "f ="
-               , "    let x = 3"
-               , "    in x"
-               ])
-    [ (DsWarning, (4, 12), "Defaulting the following constraint") ]
-    "Add type annotation ‘Integer’ to ‘3’"
-    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
-               , "module A where"
-               , ""
-               , "f ="
-               , "    let x = (3 :: Integer)"
-               , "    in x"
-               ])
-  , testSession "add default type to satisfy one constraint in more nested expressions" $
-    testFor
-    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
-               , "module A where"
-               , ""
-               , "f ="
-               , "    let x = let y = 5 in y"
-               , "    in x"
-               ])
-    [ (DsWarning, (4, 20), "Defaulting the following constraint") ]
-    "Add type annotation ‘Integer’ to ‘5’"
-    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
-               , "module A where"
-               , ""
-               , "f ="
-               , "    let x = let y = (5 :: Integer) in y"
-               , "    in x"
-               ])
-  , testSession "add default type to satisfy one constraint with duplicate literals" $
-    testFor
-    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
-               , "{-# LANGUAGE OverloadedStrings #-}"
-               , "module A (f) where"
-               , ""
-               , "import Debug.Trace"
-               , ""
-               , "f = seq \"debug\" traceShow \"debug\""
-               ])
-    [ (DsWarning, (6, 8), "Defaulting the following constraint")
-    , (DsWarning, (6, 16), "Defaulting the following constraint")
-    ]
-    ("Add type annotation ‘" <> listOfChar <> "’ to ‘\"debug\"’")
-    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
-               , "{-# LANGUAGE OverloadedStrings #-}"
-               , "module A (f) where"
-               , ""
-               , "import Debug.Trace"
-               , ""
-               , "f = seq (\"debug\" :: " <> listOfChar <> ") traceShow \"debug\""
-               ])
-  , knownBrokenForGhcVersions [GHC92] "GHC 9.2 only has 'traceShow' in error span" $
-    testSession "add default type to satisfy two constraints" $
-    testFor
-    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
-               , "{-# LANGUAGE OverloadedStrings #-}"
-               , "module A (f) where"
-               , ""
-               , "import Debug.Trace"
-               , ""
-               , "f a = traceShow \"debug\" a"
-               ])
-    [ (DsWarning, (6, 6), "Defaulting the following constraint") ]
-    ("Add type annotation ‘" <> listOfChar <> "’ to ‘\"debug\"’")
-    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
-               , "{-# LANGUAGE OverloadedStrings #-}"
-               , "module A (f) where"
-               , ""
-               , "import Debug.Trace"
-               , ""
-               , "f a = traceShow (\"debug\" :: " <> listOfChar <> ") a"
-               ])
-  , knownBrokenForGhcVersions [GHC92] "GHC 9.2 only has 'traceShow' in error span" $
-    testSession "add default type to satisfy two constraints with duplicate literals" $
-    testFor
-    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
-               , "{-# LANGUAGE OverloadedStrings #-}"
-               , "module A (f) where"
-               , ""
-               , "import Debug.Trace"
-               , ""
-               , "f = seq (\"debug\" :: [Char]) (seq (\"debug\" :: [Char]) (traceShow \"debug\"))"
-               ])
-    [ (DsWarning, (6, 54), "Defaulting the following constraint") ]
-    ("Add type annotation ‘" <> listOfChar <> "’ to ‘\"debug\"’")
-    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
-               , "{-# LANGUAGE OverloadedStrings #-}"
-               , "module A (f) where"
-               , ""
-               , "import Debug.Trace"
-               , ""
-               , "f = seq (\"debug\" :: [Char]) (seq (\"debug\" :: [Char]) (traceShow (\"debug\" :: " <> listOfChar <> ")))"
-               ])
-  ]
-  where
-    testFor source diag expectedTitle expectedResult = do
-      docId <- createDoc "A.hs" "haskell" source
-      expectDiagnostics [ ("A.hs", diag) ]
-
-      let cursors = map snd3 diag
-      (action, title) <- extractCodeAction docId "Add type annotation" (minimum cursors) (maximum cursors)
-
-      liftIO $ title @?= expectedTitle
-      executeCodeAction action
-      contentAfterAction <- documentContents docId
-      liftIO $ contentAfterAction @?= expectedResult
-
-    extractCodeAction docId actionPrefix (l,c) (l', c')= do
-      [action@CodeAction { _title = actionTitle }]  <- findCodeActionsByPrefix docId (R l c l' c') [actionPrefix]
-      return (action, actionTitle)
-
-
-fixConstructorImportTests :: TestTree
-fixConstructorImportTests = testGroup "fix import actions"
-  [ testSession "fix constructor import" $ template
-      (T.unlines
-            [ "module ModuleA where"
-            , "data A = Constructor"
-            ])
-      (T.unlines
-            [ "module ModuleB where"
-            , "import ModuleA(Constructor)"
-            ])
-      (Range (Position 1 10) (Position 1 11))
-      "Fix import of A(Constructor)"
-      (T.unlines
-            [ "module ModuleB where"
-            , "import ModuleA(A(Constructor))"
-            ])
-  ]
-  where
-    template contentA contentB range expectedAction expectedContentB = do
-      _docA <- createDoc "ModuleA.hs" "haskell" contentA
-      docB  <- createDoc "ModuleB.hs" "haskell" contentB
-      _diags <- waitForDiagnostics
-      InR action@CodeAction { _title = actionTitle } : _
-                  <- sortOn (\(InR CodeAction{_title=x}) -> x) <$>
-                     getCodeActions docB range
-      liftIO $ expectedAction @=? actionTitle
-      executeCodeAction action
-      contentAfterAction <- documentContents docB
-      liftIO $ expectedContentB @=? contentAfterAction
-
-importRenameActionTests :: TestTree
-importRenameActionTests = testGroup "import rename actions"
-  [ testSession "Data.Mape -> Data.Map"   $ check "Map"
-  , testSession "Data.Mape -> Data.Maybe" $ check "Maybe" ] where
-  check modname = do
-      let content = T.unlines
-            [ "module Testing where"
-            , "import Data.Mape"
-            ]
-      doc <- createDoc "Testing.hs" "haskell" content
-      _ <- waitForDiagnostics
-      actionsOrCommands <- getCodeActions doc (Range (Position 1 8) (Position 1 16))
-      let [changeToMap] = [action | InR action@CodeAction{ _title = actionTitle } <- actionsOrCommands, ("Data." <> modname) `T.isInfixOf` actionTitle ]
-      executeCodeAction changeToMap
-      contentAfterAction <- documentContents doc
-      let expectedContentAfterAction = T.unlines
-            [ "module Testing where"
-            , "import Data." <> modname
-            ]
-      liftIO $ expectedContentAfterAction @=? contentAfterAction
-
-fillTypedHoleTests :: TestTree
-fillTypedHoleTests = let
-
-  sourceCode :: T.Text -> T.Text -> T.Text -> T.Text
-  sourceCode a b c = T.unlines
-    [ "module Testing where"
-      , ""
-      , "globalConvert :: Int -> String"
-      , "globalConvert = undefined"
-      , ""
-      , "globalInt :: Int"
-      , "globalInt = 3"
-      , ""
-      , "bar :: Int -> Int -> String"
-      , "bar n parameterInt = " <> a <> " (n + " <> b <> " + " <> c <> ")  where"
-      , "  localConvert = (flip replicate) 'x'"
-      , ""
-      , "foo :: () -> Int -> String"
-      , "foo = undefined"
-
-    ]
-
-  check :: T.Text -> T.Text -> T.Text -> T.Text -> T.Text -> T.Text -> T.Text -> TestTree
-  check actionTitle
-        oldA oldB oldC
-        newA newB newC = testSession (T.unpack actionTitle) $ do
-    let originalCode = sourceCode oldA oldB oldC
-    let expectedCode = sourceCode newA newB newC
-    doc <- createDoc "Testing.hs" "haskell" originalCode
-    _ <- waitForDiagnostics
-    actionsOrCommands <- getCodeActions doc (Range (Position 9 0) (Position 9 maxBound))
-    chosenAction <- liftIO $ pickActionWithTitle actionTitle actionsOrCommands
-    executeCodeAction chosenAction
-    modifiedCode <- documentContents doc
-    liftIO $ expectedCode @=? modifiedCode
-  in
-  testGroup "fill typed holes"
-  [ check "replace _ with show"
-          "_"    "n" "n"
-          "show" "n" "n"
-
-  , check "replace _ with globalConvert"
-          "_"             "n" "n"
-          "globalConvert" "n" "n"
-
-  , check "replace _convertme with localConvert"
-          "_convertme"   "n" "n"
-          "localConvert" "n" "n"
-
-  , check "replace _b with globalInt"
-          "_a" "_b"        "_c"
-          "_a" "globalInt" "_c"
-
-  , check "replace _c with globalInt"
-          "_a" "_b"        "_c"
-          "_a" "_b" "globalInt"
-
-  , check "replace _c with parameterInt"
-          "_a" "_b" "_c"
-          "_a" "_b"  "parameterInt"
-  , check "replace _ with foo _"
-          "_" "n" "n"
-          "(foo _)" "n" "n"
-  , testSession "replace _toException with E.toException" $ do
-      let mkDoc x = T.unlines
-            [ "module Testing where"
-            , "import qualified Control.Exception as E"
-            , "ioToSome :: E.IOException -> E.SomeException"
-            , "ioToSome = " <> x ]
-      doc <- createDoc "Test.hs" "haskell" $ mkDoc "_toException"
-      _ <- waitForDiagnostics
-      actions <- getCodeActions doc (Range (Position 3 0) (Position 3 maxBound))
-      chosen <- liftIO $ pickActionWithTitle "replace _toException with E.toException" actions
-      executeCodeAction chosen
-      modifiedCode <- documentContents doc
-      liftIO $ mkDoc "E.toException" @=? modifiedCode
-  , testSession "filling infix type hole uses prefix notation" $ do
-      let mkDoc x = T.unlines
-              [ "module Testing where"
-              , "data A = A"
-              , "foo :: A -> A -> A"
-              , "foo A A = A"
-              , "test :: A -> A -> A"
-              , "test a1 a2 = a1 " <> x <> " a2"
-              ]
-      doc <- createDoc "Test.hs" "haskell" $ mkDoc "`_`"
-      _ <- waitForDiagnostics
-      actions <- getCodeActions doc (Range (Position 5 16) (Position 5 19))
-      chosen <- liftIO $ pickActionWithTitle "replace _ with foo" actions
-      executeCodeAction chosen
-      modifiedCode <- documentContents doc
-      liftIO $ mkDoc "`foo`" @=? modifiedCode
-  , testSession "postfix hole uses postfix notation of infix operator" $ do
-      let mkDoc x = T.unlines
-              [ "module Testing where"
-              , "test :: Int -> Int -> Int"
-              , "test a1 a2 = " <> x <> " a1 a2"
-              ]
-      doc <- createDoc "Test.hs" "haskell" $ mkDoc "_"
-      _ <- waitForDiagnostics
-      actions <- getCodeActions doc (Range (Position 2 13) (Position 2 14))
-      chosen <- liftIO $ pickActionWithTitle "replace _ with (+)" actions
-      executeCodeAction chosen
-      modifiedCode <- documentContents doc
-      liftIO $ mkDoc "(+)" @=? modifiedCode
-  , testSession "filling infix type hole uses infix operator" $ do
-      let mkDoc x = T.unlines
-              [ "module Testing where"
-              , "test :: Int -> Int -> Int"
-              , "test a1 a2 = a1 " <> x <> " a2"
-              ]
-      doc <- createDoc "Test.hs" "haskell" $ mkDoc "`_`"
-      _ <- waitForDiagnostics
-      actions <- getCodeActions doc (Range (Position 2 16) (Position 2 19))
-      chosen <- liftIO $ pickActionWithTitle "replace _ with (+)" actions
-      executeCodeAction chosen
-      modifiedCode <- documentContents doc
-      liftIO $ mkDoc "+" @=? modifiedCode
-  ]
-
-addInstanceConstraintTests :: TestTree
-addInstanceConstraintTests = let
-  missingConstraintSourceCode :: Maybe T.Text -> T.Text
-  missingConstraintSourceCode mConstraint =
-    let constraint = maybe "" (<> " => ") mConstraint
-     in T.unlines
-    [ "module Testing where"
-    , ""
-    , "data Wrap a = Wrap a"
-    , ""
-    , "instance " <> constraint <> "Eq (Wrap a) where"
-    , "  (Wrap x) == (Wrap y) = x == y"
-    ]
-
-  incompleteConstraintSourceCode :: Maybe T.Text -> T.Text
-  incompleteConstraintSourceCode mConstraint =
-    let constraint = maybe "Eq a" (\c -> "(Eq a, " <> c <> ")")  mConstraint
-     in T.unlines
-    [ "module Testing where"
-    , ""
-    , "data Pair a b = Pair a b"
-    , ""
-    , "instance " <> constraint <> " => Eq (Pair a b) where"
-    , "  (Pair x y) == (Pair x' y') = x == x' && y == y'"
-    ]
-
-  incompleteConstraintSourceCode2 :: Maybe T.Text -> T.Text
-  incompleteConstraintSourceCode2 mConstraint =
-    let constraint = maybe "(Eq a, Eq b)" (\c -> "(Eq a, Eq b, " <> c <> ")")  mConstraint
-     in T.unlines
-    [ "module Testing where"
-    , ""
-    , "data Three a b c = Three a b c"
-    , ""
-    , "instance " <> constraint <> " => Eq (Three a b c) where"
-    , "  (Three x y z) == (Three x' y' z') = x == x' && y == y' && z == z'"
-    ]
-
-  check :: T.Text -> T.Text -> T.Text -> TestTree
-  check actionTitle originalCode expectedCode = testSession (T.unpack actionTitle) $ do
-    doc <- createDoc "Testing.hs" "haskell" originalCode
-    _ <- waitForDiagnostics
-    actionsOrCommands <- getAllCodeActions doc
-    chosenAction <- liftIO $ pickActionWithTitle actionTitle actionsOrCommands
-    executeCodeAction chosenAction
-    modifiedCode <- documentContents doc
-    liftIO $ expectedCode @=? modifiedCode
-
-  in testGroup "add instance constraint"
-  [ check
-    "Add `Eq a` to the context of the instance declaration"
-    (missingConstraintSourceCode Nothing)
-    (missingConstraintSourceCode $ Just "Eq a")
-  , check
-    "Add `Eq b` to the context of the instance declaration"
-    (incompleteConstraintSourceCode Nothing)
-    (incompleteConstraintSourceCode $ Just "Eq b")
-  , check
-    "Add `Eq c` to the context of the instance declaration"
-    (incompleteConstraintSourceCode2 Nothing)
-    (incompleteConstraintSourceCode2 $ Just "Eq c")
-  ]
-
-addFunctionConstraintTests :: TestTree
-addFunctionConstraintTests = let
-  missingConstraintSourceCode :: T.Text -> T.Text
-  missingConstraintSourceCode constraint =
-    T.unlines
-    [ "module Testing where"
-    , ""
-    , "eq :: " <> constraint <> "a -> a -> Bool"
-    , "eq x y = x == y"
-    ]
-
-  missingConstraintWithForAllSourceCode :: T.Text -> T.Text
-  missingConstraintWithForAllSourceCode constraint =
-    T.unlines
-    [ "{-# LANGUAGE ExplicitForAll #-}"
-    , "module Testing where"
-    , ""
-    , "eq :: forall a. " <> constraint <> "a -> a -> Bool"
-    , "eq x y = x == y"
-    ]
-
-  incompleteConstraintWithForAllSourceCode :: T.Text -> T.Text
-  incompleteConstraintWithForAllSourceCode constraint =
-    T.unlines
-    [ "{-# LANGUAGE ExplicitForAll #-}"
-    , "module Testing where"
-    , ""
-    , "data Pair a b = Pair a b"
-    , ""
-    , "eq :: " <> constraint <> " => Pair a b -> Pair a b -> Bool"
-    , "eq (Pair x y) (Pair x' y') = x == x' && y == y'"
-    ]
-
-  incompleteConstraintSourceCode :: T.Text -> T.Text
-  incompleteConstraintSourceCode constraint =
-    T.unlines
-    [ "module Testing where"
-    , ""
-    , "data Pair a b = Pair a b"
-    , ""
-    , "eq :: " <> constraint <> " => Pair a b -> Pair a b -> Bool"
-    , "eq (Pair x y) (Pair x' y') = x == x' && y == y'"
-    ]
-
-  incompleteConstraintSourceCode2 :: T.Text -> T.Text
-  incompleteConstraintSourceCode2 constraint =
-    T.unlines
-    [ "module Testing where"
-    , ""
-    , "data Three a b c = Three a b c"
-    , ""
-    , "eq :: " <> constraint <> " => Three a b c -> Three a b c -> Bool"
-    , "eq (Three x y z) (Three x' y' z') = x == x' && y == y' && z == z'"
-    ]
-
-  incompleteConstraintSourceCodeWithExtraCharsInContext :: T.Text -> T.Text
-  incompleteConstraintSourceCodeWithExtraCharsInContext constraint =
-    T.unlines
-    [ "module Testing where"
-    , ""
-    , "data Pair a b = Pair a b"
-    , ""
-    , "eq :: ( " <> constraint <> " ) => Pair a b -> Pair a b -> Bool"
-    , "eq (Pair x y) (Pair x' y') = x == x' && y == y'"
-    ]
-
-  incompleteConstraintSourceCodeWithNewlinesInTypeSignature :: T.Text -> T.Text
-  incompleteConstraintSourceCodeWithNewlinesInTypeSignature constraint =
-    T.unlines
-    [ "module Testing where"
-    , "data Pair a b = Pair a b"
-    , "eq "
-    , "    :: (" <> constraint <> ")"
-    , "    => Pair a b -> Pair a b -> Bool"
-    , "eq (Pair x y) (Pair x' y') = x == x' && y == y'"
-    ]
-
-  missingMonadConstraint constraint = T.unlines
-    [ "module Testing where"
-    , "f :: " <> constraint <> "m ()"
-    , "f = do "
-    , "  return ()"
-    ]
-
-  in testGroup "add function constraint"
-  [ checkCodeAction
-    "no preexisting constraint"
-    "Add `Eq a` to the context of the type signature for `eq`"
-    (missingConstraintSourceCode "")
-    (missingConstraintSourceCode "Eq a => ")
-  , checkCodeAction
-    "no preexisting constraint, with forall"
-    "Add `Eq a` to the context of the type signature for `eq`"
-    (missingConstraintWithForAllSourceCode "")
-    (missingConstraintWithForAllSourceCode "Eq a => ")
-  , checkCodeAction
-    "preexisting constraint, no parenthesis"
-    "Add `Eq b` to the context of the type signature for `eq`"
-    (incompleteConstraintSourceCode "Eq a")
-    (incompleteConstraintSourceCode "(Eq a, Eq b)")
-  , checkCodeAction
-    "preexisting constraints in parenthesis"
-    "Add `Eq c` to the context of the type signature for `eq`"
-    (incompleteConstraintSourceCode2 "(Eq a, Eq b)")
-    (incompleteConstraintSourceCode2 "(Eq a, Eq b, Eq c)")
-  , checkCodeAction
-    "preexisting constraints with forall"
-    "Add `Eq b` to the context of the type signature for `eq`"
-    (incompleteConstraintWithForAllSourceCode "Eq a")
-    (incompleteConstraintWithForAllSourceCode "(Eq a, Eq b)")
-  , checkCodeAction
-    "preexisting constraint, with extra spaces in context"
-    "Add `Eq b` to the context of the type signature for `eq`"
-    (incompleteConstraintSourceCodeWithExtraCharsInContext "Eq a")
-    (incompleteConstraintSourceCodeWithExtraCharsInContext "Eq a, Eq b")
-  , checkCodeAction
-    "preexisting constraint, with newlines in type signature"
-    "Add `Eq b` to the context of the type signature for `eq`"
-    (incompleteConstraintSourceCodeWithNewlinesInTypeSignature "Eq a")
-    (incompleteConstraintSourceCodeWithNewlinesInTypeSignature "Eq a, Eq b")
-  , checkCodeAction
-    "missing Monad constraint"
-    "Add `Monad m` to the context of the type signature for `f`"
-    (missingMonadConstraint "")
-    (missingMonadConstraint "Monad m => ")
-  ]
-
-checkCodeAction :: String -> T.Text -> T.Text -> T.Text -> TestTree
-checkCodeAction testName actionTitle originalCode expectedCode = testSession testName $ do
-  doc <- createDoc "Testing.hs" "haskell" originalCode
-  _ <- waitForDiagnostics
-  actionsOrCommands <- getAllCodeActions doc
-  chosenAction <- liftIO $ pickActionWithTitle actionTitle actionsOrCommands
-  executeCodeAction chosenAction
-  modifiedCode <- documentContents doc
-  liftIO $ expectedCode @=? modifiedCode
-
-addImplicitParamsConstraintTests :: TestTree
-addImplicitParamsConstraintTests =
-  testGroup
-    "add missing implicit params constraints"
-    [ testGroup
-        "introduced"
-        [ let ex ctxtA = exampleCode "?a" ctxtA ""
-           in checkCodeAction "at top level" "Add ?a::() to the context of fBase" (ex "") (ex "?a::()"),
-          let ex ctxA = exampleCode "x where x = ?a" ctxA ""
-           in checkCodeAction "in nested def" "Add ?a::() to the context of fBase" (ex "") (ex "?a::()")
-        ],
-      testGroup
-        "inherited"
-        [ let ex = exampleCode "()" "?a::()"
-           in checkCodeAction
-                "with preexisting context"
-                "Add `?a::()` to the context of the type signature for `fCaller`"
-                (ex "Eq ()")
-                (ex "Eq (), ?a::()"),
-          let ex = exampleCode "()" "?a::()"
-           in checkCodeAction "without preexisting context" "Add ?a::() to the context of fCaller" (ex "") (ex "?a::()")
-        ]
-    ]
-  where
-    mkContext ""       = ""
-    mkContext contents = "(" <> contents <> ") => "
-
-    exampleCode bodyBase contextBase contextCaller =
-      T.unlines
-        [ "{-# LANGUAGE FlexibleContexts, ImplicitParams #-}",
-          "module Testing where",
-          "fBase :: " <> mkContext contextBase <> "()",
-          "fBase = " <> bodyBase,
-          "fCaller :: " <> mkContext contextCaller <> "()",
-          "fCaller = fBase"
-        ]
-
-removeRedundantConstraintsTests :: TestTree
-removeRedundantConstraintsTests = let
-  header =
-    [ "{-# OPTIONS_GHC -Wredundant-constraints #-}"
-    , "module Testing where"
-    , ""
-    ]
-
-  headerExt :: [T.Text] -> [T.Text]
-  headerExt exts =
-    redunt : extTxt ++ ["module Testing where"]
-    where
-      redunt = "{-# OPTIONS_GHC -Wredundant-constraints #-}"
-      extTxt = map (\ext -> "{-# LANGUAGE " <> ext <> " #-}") exts
-
-  redundantConstraintsCode :: Maybe T.Text -> T.Text
-  redundantConstraintsCode mConstraint =
-    let constraint = maybe "" (\c -> "" <> c <> " => ") mConstraint
-      in T.unlines $ header <>
-        [ "foo :: " <> constraint <> "a -> a"
-        , "foo = id"
-        ]
-
-  redundantMixedConstraintsCode :: Maybe T.Text -> T.Text
-  redundantMixedConstraintsCode mConstraint =
-    let constraint = maybe "(Num a, Eq a)" (\c -> "(Num a, Eq a, " <> c <> ")") mConstraint
-      in T.unlines $ header <>
-        [ "foo :: " <> constraint <> " => a -> Bool"
-        , "foo x = x == 1"
-        ]
-
-  typeSignatureSpaces :: Maybe T.Text -> T.Text
-  typeSignatureSpaces mConstraint =
-    let constraint = maybe "(Num a, Eq a)" (\c -> "(Num a, Eq a, " <> c <> ")") mConstraint
-      in T.unlines $ header <>
-        [ "foo ::  " <> constraint <> " => a -> Bool"
-        , "foo x = x == 1"
-        ]
-
-  redundantConstraintsForall :: Maybe T.Text -> T.Text
-  redundantConstraintsForall mConstraint =
-    let constraint = maybe "" (\c -> "" <> c <> " => ") mConstraint
-      in T.unlines $ headerExt ["RankNTypes"] <>
-        [ "foo :: forall a. " <> constraint <> "a -> a"
-        , "foo = id"
-        ]
-
-  typeSignatureDo :: Maybe T.Text -> T.Text
-  typeSignatureDo mConstraint =
-    let constraint = maybe "" (\c -> "" <> c <> " => ") mConstraint
-      in T.unlines $ header <>
-        [ "f :: Int -> IO ()"
-        , "f n = do"
-        , "  let foo :: " <> constraint <> "a -> IO ()"
-        , "      foo _ = return ()"
-        , "  r n"
-        ]
-
-  typeSignatureNested :: Maybe T.Text -> T.Text
-  typeSignatureNested mConstraint =
-    let constraint = maybe "" (\c -> "" <> c <> " => ") mConstraint
-      in T.unlines $ header <>
-        [ "f :: Int -> ()"
-        , "f = g"
-        , "  where"
-        , "    g :: " <> constraint <> "a -> ()"
-        , "    g _ = ()"
-        ]
-
-  typeSignatureNested' :: Maybe T.Text -> T.Text
-  typeSignatureNested' mConstraint =
-    let constraint = maybe "" (\c -> "" <> c <> " => ") mConstraint
-      in T.unlines $ header <>
-        [ "f :: Int -> ()"
-        , "f ="
-        , "  let"
-        , "    g :: Int -> ()"
-        , "    g = h"
-        , "      where"
-        , "        h :: " <> constraint <> "a -> ()"
-        , "        h _ = ()"
-        , "  in g"
-        ]
-
-  typeSignatureNested'' :: Maybe T.Text -> T.Text
-  typeSignatureNested'' mConstraint =
-    let constraint = maybe "" (\c -> "" <> c <> " => ") mConstraint
-      in T.unlines $ header <>
-        [ "f :: Int -> ()"
-        , "f = g"
-        , "  where"
-        , "    g :: Int -> ()"
-        , "    g = "
-        , "      let"
-        , "        h :: " <> constraint <> "a -> ()"
-        , "        h _ = ()"
-        , "      in h"
-        ]
-
-  typeSignatureLined1 = T.unlines $ header <>
-    [ "foo :: Eq a =>"
-    , "  a -> Bool"
-    , "foo _ = True"
-    ]
-
-  typeSignatureLined2 = T.unlines $ header <>
-    [ "foo :: (Eq a, Show a)"
-    , "  => a -> Bool"
-    , "foo _ = True"
-    ]
-
-  typeSignatureOneLine = T.unlines $ header <>
-    [ "foo :: a -> Bool"
-    , "foo _ = True"
-    ]
-
-  typeSignatureLined3 = T.unlines $ header <>
-    [ "foo :: ( Eq a"
-    , "       , Show a"
-    , "       )"
-    , "    => a -> Bool"
-    , "foo x = x == x"
-    ]
-
-  typeSignatureLined3' = T.unlines $ header <>
-    [ "foo :: ( Eq a"
-    , "       )"
-    , "    => a -> Bool"
-    , "foo x = x == x"
-    ]
-
-
-  check :: T.Text -> T.Text -> T.Text -> TestTree
-  check actionTitle originalCode expectedCode = testSession (T.unpack actionTitle) $ do
-    doc <- createDoc "Testing.hs" "haskell" originalCode
-    _ <- waitForDiagnostics
-    actionsOrCommands <- getAllCodeActions doc
-    chosenAction <- liftIO $ pickActionWithTitle actionTitle actionsOrCommands
-    executeCodeAction chosenAction
-    modifiedCode <- documentContents doc
-    liftIO $ expectedCode @=? modifiedCode
-
-  in testGroup "remove redundant function constraints"
-  [ check
-    "Remove redundant constraint `Eq a` from the context of the type signature for `foo`"
-    (redundantConstraintsCode $ Just "Eq a")
-    (redundantConstraintsCode Nothing)
-  , check
-    "Remove redundant constraints `(Eq a, Monoid a)` from the context of the type signature for `foo`"
-    (redundantConstraintsCode $ Just "(Eq a, Monoid a)")
-    (redundantConstraintsCode Nothing)
-  , check
-    "Remove redundant constraints `(Monoid a, Show a)` from the context of the type signature for `foo`"
-    (redundantMixedConstraintsCode $ Just "Monoid a, Show a")
-    (redundantMixedConstraintsCode Nothing)
-  , check
-    "Remove redundant constraint `Eq a` from the context of the type signature for `g`"
-    (typeSignatureNested $ Just "Eq a")
-    (typeSignatureNested Nothing)
-  , check
-    "Remove redundant constraint `Eq a` from the context of the type signature for `h`"
-    (typeSignatureNested' $ Just "Eq a")
-    (typeSignatureNested' Nothing)
-  , check
-    "Remove redundant constraint `Eq a` from the context of the type signature for `h`"
-    (typeSignatureNested'' $ Just "Eq a")
-    (typeSignatureNested'' Nothing)
-  , check
-    "Remove redundant constraint `Eq a` from the context of the type signature for `foo`"
-    (redundantConstraintsForall $ Just "Eq a")
-    (redundantConstraintsForall Nothing)
-  , check
-    "Remove redundant constraint `Eq a` from the context of the type signature for `foo`"
-    (typeSignatureDo $ Just "Eq a")
-    (typeSignatureDo Nothing)
-  , check
-    "Remove redundant constraints `(Monoid a, Show a)` from the context of the type signature for `foo`"
-    (typeSignatureSpaces $ Just "Monoid a, Show a")
-    (typeSignatureSpaces Nothing)
-    , check
-    "Remove redundant constraint `Eq a` from the context of the type signature for `foo`"
-    typeSignatureLined1
-    typeSignatureOneLine
-    , check
-    "Remove redundant constraints `(Eq a, Show a)` from the context of the type signature for `foo`"
-    typeSignatureLined2
-    typeSignatureOneLine
-    , check
-    "Remove redundant constraint `Show a` from the context of the type signature for `foo`"
-    typeSignatureLined3
-    typeSignatureLined3'
-  ]
-
-addSigActionTests :: TestTree
-addSigActionTests = let
-  header = [ "{-# OPTIONS_GHC -Wmissing-signatures -Wmissing-pattern-synonym-signatures #-}"
-           , "{-# LANGUAGE PatternSynonyms,BangPatterns,GADTs #-}"
-           , "module Sigs where"
-           , "data T1 a where"
-           , "  MkT1 :: (Show b) => a -> b -> T1 a"
-           ]
-  before def     = T.unlines $ header ++ [def]
-  after' def sig = T.unlines $ header ++ [sig, def]
-
-  def >:: sig = testSession (T.unpack $ T.replace "\n" "\\n" def) $ do
-    let originalCode = before def
-    let expectedCode = after' def sig
-    doc <- createDoc "Sigs.hs" "haskell" originalCode
-    _ <- waitForDiagnostics
-    actionsOrCommands <- getCodeActions doc (Range (Position 5 1) (Position 5 maxBound))
-    chosenAction <- liftIO $ pickActionWithTitle ("add signature: " <> sig) actionsOrCommands
-    executeCodeAction chosenAction
-    modifiedCode <- documentContents doc
-    liftIO $ expectedCode @=? modifiedCode
-  in
-  testGroup "add signature"
-    [ "abc = True"              >:: "abc :: Bool"
-    , "foo a b = a + b"         >:: "foo :: Num a => a -> a -> a"
-    , "bar a b = show $ a + b"  >:: "bar :: (Show a, Num a) => a -> a -> String"
-    , "(!!!) a b = a > b"       >:: "(!!!) :: Ord a => a -> a -> Bool"
-    , "a >>>> b = a + b"        >:: "(>>>>) :: Num a => a -> a -> a"
-    , "a `haha` b = a b"        >:: "haha :: (t1 -> t2) -> t1 -> t2"
-    , "pattern Some a = Just a" >:: "pattern Some :: a -> Maybe a"
-    , "pattern Some a <- Just a" >:: "pattern Some :: a -> Maybe a"
-    , "pattern Some a <- Just a\n  where Some a = Just a" >:: "pattern Some :: a -> Maybe a"
-    , "pattern Some a <- Just !a\n  where Some !a = Just a" >:: "pattern Some :: a -> Maybe a"
-    , "pattern Point{x, y} = (x, y)" >:: "pattern Point :: a -> b -> (a, b)"
-    , "pattern Point{x, y} <- (x, y)" >:: "pattern Point :: a -> b -> (a, b)"
-    , "pattern Point{x, y} <- (x, y)\n  where Point x y = (x, y)" >:: "pattern Point :: a -> b -> (a, b)"
-    , "pattern MkT1' b = MkT1 42 b" >:: "pattern MkT1' :: (Eq a, Num a) => Show b => b -> T1 a"
-    , "pattern MkT1' b <- MkT1 42 b" >:: "pattern MkT1' :: (Eq a, Num a) => Show b => b -> T1 a"
-    , "pattern MkT1' b <- MkT1 42 b\n  where MkT1' b = MkT1 42 b" >:: "pattern MkT1' :: (Eq a, Num a) => Show b => b -> T1 a"
-    ]
-
-exportUnusedTests :: TestTree
-exportUnusedTests = testGroup "export unused actions"
-  [ testGroup "don't want suggestion"
-    [ testSession "implicit exports" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "{-# OPTIONS_GHC -Wmissing-signatures #-}"
-              , "module A where"
-              , "foo = id"])
-        (R 3 0 3 3)
-        "Export ‘foo’"
-        Nothing -- codeaction should not be available
-    , testSession "not top-level" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "{-# OPTIONS_GHC -Wunused-binds #-}"
-              , "module A (foo,bar) where"
-              , "foo = ()"
-              , "  where bar = ()"
-              , "bar = ()"])
-        (R 2 0 2 11)
-        "Export ‘bar’"
-        Nothing
-    , ignoreForGHC92 "Diagnostic message has no suggestions" $
-      testSession "type is exported but not the constructor of same name" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A (Foo) where"
-              , "data Foo = Foo"])
-        (R 2 0 2 8)
-        "Export ‘Foo’"
-        Nothing -- codeaction should not be available
-    , testSession "unused data field" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A (Foo(Foo)) where"
-              , "data Foo = Foo {foo :: ()}"])
-        (R 2 0 2 20)
-        "Export ‘foo’"
-        Nothing -- codeaction should not be available
-    ]
-  , testGroup "want suggestion"
-    [ testSession "empty exports" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A ("
-              , ") where"
-              , "foo = id"])
-        (R 3 0 3 3)
-        "Export ‘foo’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A ("
-              , "foo) where"
-              , "foo = id"])
-    , testSession "single line explicit exports" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A (foo) where"
-              , "foo = id"
-              , "bar = foo"])
-        (R 3 0 3 3)
-        "Export ‘bar’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A (foo, bar) where"
-              , "foo = id"
-              , "bar = foo"])
-    , testSession "multi line explicit exports" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A"
-              , "  ("
-              , "    foo) where"
-              , "foo = id"
-              , "bar = foo"])
-        (R 5 0 5 3)
-        "Export ‘bar’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A"
-              , "  ("
-              , "    foo, bar) where"
-              , "foo = id"
-              , "bar = foo"])
-    , testSession "export list ends in comma" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A"
-              , "  (foo,"
-              , "  ) where"
-              , "foo = id"
-              , "bar = foo"])
-        (R 5 0 5 3)
-        "Export ‘bar’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A"
-              , "  (foo,"
-              , "  bar) where"
-              , "foo = id"
-              , "bar = foo"])
-    , testSession "style of multiple exports is preserved 1" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A"
-              , "  ( foo"
-              , "  , bar"
-              , "  ) where"
-              , "foo = id"
-              , "bar = foo"
-              , "baz = bar"
-              ])
-        (R 7 0 7 3)
-        "Export ‘baz’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A"
-              , "  ( foo"
-              , "  , bar"
-              , "  , baz"
-              , "  ) where"
-              , "foo = id"
-              , "bar = foo"
-              , "baz = bar"
-              ])
-    , testSession "style of multiple exports is preserved 2" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A"
-              , "  ( foo,"
-              , "    bar"
-              , "  ) where"
-              , "foo = id"
-              , "bar = foo"
-              , "baz = bar"
-              ])
-        (R 7 0 7 3)
-        "Export ‘baz’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A"
-              , "  ( foo,"
-              , "    bar,"
-              , "    baz"
-              , "  ) where"
-              , "foo = id"
-              , "bar = foo"
-              , "baz = bar"
-              ])
-    , testSession "style of multiple exports is preserved and selects smallest export separator" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A"
-              , "  ( foo"
-              , "  , bar"
-              , "  -- * For testing"
-              , "  , baz"
-              , "  ) where"
-              , "foo = id"
-              , "bar = foo"
-              , "baz = bar"
-              , "quux = bar"
-              ])
-        (R 10 0 10 4)
-        "Export ‘quux’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A"
-              , "  ( foo"
-              , "  , bar"
-              , "  -- * For testing"
-              , "  , baz"
-              , "  , quux"
-              , "  ) where"
-              , "foo = id"
-              , "bar = foo"
-              , "baz = bar"
-              , "quux = bar"
-              ])
-    , testSession "unused pattern synonym" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "{-# LANGUAGE PatternSynonyms #-}"
-              , "module A () where"
-              , "pattern Foo a <- (a, _)"])
-        (R 3 0 3 10)
-        "Export ‘Foo’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "{-# LANGUAGE PatternSynonyms #-}"
-              , "module A (pattern Foo) where"
-              , "pattern Foo a <- (a, _)"])
-    , testSession "unused data type" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A () where"
-              , "data Foo = Foo"])
-        (R 2 0 2 7)
-        "Export ‘Foo’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A (Foo(..)) where"
-              , "data Foo = Foo"])
-    , testSession "unused newtype" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A () where"
-              , "newtype Foo = Foo ()"])
-        (R 2 0 2 10)
-        "Export ‘Foo’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A (Foo(..)) where"
-              , "newtype Foo = Foo ()"])
-    , testSession "unused type synonym" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A () where"
-              , "type Foo = ()"])
-        (R 2 0 2 7)
-        "Export ‘Foo’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A (Foo) where"
-              , "type Foo = ()"])
-    , testSession "unused type family" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "{-# LANGUAGE TypeFamilies #-}"
-              , "module A () where"
-              , "type family Foo p"])
-        (R 3 0 3 15)
-        "Export ‘Foo’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "{-# LANGUAGE TypeFamilies #-}"
-              , "module A (Foo) where"
-              , "type family Foo p"])
-    , testSession "unused typeclass" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A () where"
-              , "class Foo a"])
-        (R 2 0 2 8)
-        "Export ‘Foo’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A (Foo(..)) where"
-              , "class Foo a"])
-    , testSession "infix" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A () where"
-              , "a `f` b = ()"])
-        (R 2 0 2 11)
-        "Export ‘f’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A (f) where"
-              , "a `f` b = ()"])
-    , testSession "function operator" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A () where"
-              , "(<|) = ($)"])
-        (R 2 0 2 9)
-        "Export ‘<|’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "module A ((<|)) where"
-              , "(<|) = ($)"])
-    , testSession "type synonym operator" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "{-# LANGUAGE TypeOperators #-}"
-              , "module A () where"
-              , "type (:<) = ()"])
-        (R 3 0 3 13)
-        "Export ‘:<’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "{-# LANGUAGE TypeOperators #-}"
-              , "module A ((:<)) where"
-              , "type (:<) = ()"])
-    , testSession "type family operator" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "{-# LANGUAGE TypeFamilies #-}"
-              , "{-# LANGUAGE TypeOperators #-}"
-              , "module A () where"
-              , "type family (:<)"])
-        (R 4 0 4 15)
-        "Export ‘:<’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "{-# LANGUAGE TypeFamilies #-}"
-              , "{-# LANGUAGE TypeOperators #-}"
-              , "module A (type (:<)) where"
-              , "type family (:<)"])
-    , testSession "typeclass operator" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "{-# LANGUAGE TypeOperators #-}"
-              , "module A () where"
-              , "class (:<) a"])
-        (R 3 0 3 11)
-        "Export ‘:<’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "{-# LANGUAGE TypeOperators #-}"
-              , "module A (type (:<)(..)) where"
-              , "class (:<) a"])
-    , testSession "newtype operator" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "{-# LANGUAGE TypeOperators #-}"
-              , "module A () where"
-              , "newtype (:<) = Foo ()"])
-        (R 3 0 3 20)
-        "Export ‘:<’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "{-# LANGUAGE TypeOperators #-}"
-              , "module A (type (:<)(..)) where"
-              , "newtype (:<) = Foo ()"])
-    , testSession "data type operator" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "{-# LANGUAGE TypeOperators #-}"
-              , "module A () where"
-              , "data (:<) = Foo ()"])
-        (R 3 0 3 17)
-        "Export ‘:<’"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
-              , "{-# LANGUAGE TypeOperators #-}"
-              , "module A (type (:<)(..)) where"
-              , "data (:<) = Foo ()"])
-    ]
-  ]
-  where
-    template doc range = exportTemplate (Just range) doc
-
-exportTemplate :: Maybe Range -> T.Text -> T.Text -> Maybe T.Text -> Session ()
-exportTemplate mRange initialContent expectedAction expectedContents = do
-  doc <- createDoc "A.hs" "haskell" initialContent
-  _ <- waitForDiagnostics
-  actions <- case mRange of
-    Nothing    -> getAllCodeActions doc
-    Just range -> getCodeActions doc range
-  case expectedContents of
-    Just content -> do
-      action <- liftIO $ pickActionWithTitle expectedAction actions
-      executeCodeAction action
-      contentAfterAction <- documentContents doc
-      liftIO $ content @=? contentAfterAction
-    Nothing ->
-      liftIO $ [_title | InR CodeAction{_title} <- actions, _title == expectedAction ] @?= []
-
-removeExportTests :: TestTree
-removeExportTests = testGroup "remove export actions"
-    [ testSession "single export" $ template
-        (T.unlines
-              [ "module A (  a   ) where"
-              , "b :: ()"
-              , "b = ()"])
-        "Remove ‘a’ from export"
-        (Just $ T.unlines
-              [ "module A (     ) where"
-              , "b :: ()"
-              , "b = ()"])
-    , testSession "ending comma" $ template
-        (T.unlines
-              [ "module A (  a,   ) where"
-              , "b :: ()"
-              , "b = ()"])
-        "Remove ‘a’ from export"
-        (Just $ T.unlines
-              [ "module A (  ) where"
-              , "b :: ()"
-              , "b = ()"])
-    , testSession "multiple exports" $ template
-        (T.unlines
-              [ "module A (a  ,   c,    b ) where"
-              , "a, c :: ()"
-              , "a = ()"
-              , "c = ()"])
-        "Remove ‘b’ from export"
-        (Just $ T.unlines
-              [ "module A (a  ,   c ) where"
-              , "a, c :: ()"
-              , "a = ()"
-              , "c = ()"])
-    , testSession "not in scope constructor" $ template
-        (T.unlines
-              [ "module A (A (X,Y,Z,(:<)), ab) where"
-              , "data A = X Int | Y | (:<) Int"
-              , "ab :: ()"
-              , "ab = ()"
-              ])
-        "Remove ‘Z’ from export"
-        (Just $ T.unlines
-              [ "module A (A (X,Y,(:<)), ab) where"
-              , "data A = X Int | Y | (:<) Int"
-              , "ab :: ()"
-              , "ab = ()"])
-    , testSession "multiline export" $ template
-        (T.unlines
-              [ "module A (a"
-              , " ,  b"
-              , " , (:*:)"
-              , " , ) where"
-              , "a,b :: ()"
-              , "a = ()"
-              , "b = ()"])
-        "Remove ‘:*:’ from export"
-        (Just $ T.unlines
-              [ "module A (a"
-              , " ,  b"
-              , " "
-              , " , ) where"
-              , "a,b :: ()"
-              , "a = ()"
-              , "b = ()"])
-    , testSession "qualified re-export" $ template
-        (T.unlines
-              [ "module A (M.x,a) where"
-              , "import qualified Data.List as M"
-              , "a :: ()"
-              , "a = ()"])
-        "Remove ‘M.x’ from export"
-        (Just $ T.unlines
-              [ "module A (a) where"
-              , "import qualified Data.List as M"
-              , "a :: ()"
-              , "a = ()"])
-    , testSession "qualified re-export ending in '.'" $ template
-        (T.unlines
-              [ "module A ((M.@.),a) where"
-              , "import qualified Data.List as M"
-              , "a :: ()"
-              , "a = ()"])
-        "Remove ‘M.@.’ from export"
-        (Just $ T.unlines
-              [ "module A (a) where"
-              , "import qualified Data.List as M"
-              , "a :: ()"
-              , "a = ()"])
-    , testSession "export module" $ template
-        (T.unlines
-              [ "module A (module B) where"
-              , "a :: ()"
-              , "a = ()"])
-        "Remove ‘module B’ from export"
-        (Just $ T.unlines
-              [ "module A () where"
-              , "a :: ()"
-              , "a = ()"])
-    , testSession "dodgy export" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wall #-}"
-              , "module A (A (..)) where"
-              , "data X = X"
-              , "type A = X"])
-        "Remove ‘A(..)’ from export"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wall #-}"
-              , "module A () where"
-              , "data X = X"
-              , "type A = X"])
-    , testSession "dodgy export" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wall #-}"
-              , "module A (A (..)) where"
-              , "data X = X"
-              , "type A = X"])
-        "Remove ‘A(..)’ from export"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wall #-}"
-              , "module A () where"
-              , "data X = X"
-              , "type A = X"])
-    , testSession "duplicate module export" $ template
-        (T.unlines
-              [ "{-# OPTIONS_GHC -Wall #-}"
-              , "module A (module L,module L) where"
-              , "import Data.List as L"
-              , "a :: ()"
-              , "a = ()"])
-        "Remove ‘Module L’ from export"
-        (Just $ T.unlines
-              [ "{-# OPTIONS_GHC -Wall #-}"
-              , "module A (module L) where"
-              , "import Data.List as L"
-              , "a :: ()"
-              , "a = ()"])
-    , testSession "remove all exports single" $ template
-        (T.unlines
-              [ "module A (x) where"
-              , "a :: ()"
-              , "a = ()"])
-        "Remove all redundant exports"
-        (Just $ T.unlines
-              [ "module A () where"
-              , "a :: ()"
-              , "a = ()"])
-    , testSession "remove all exports two" $ template
-        (T.unlines
-              [ "module A (x,y) where"
-              , "a :: ()"
-              , "a = ()"])
-        "Remove all redundant exports"
-        (Just $ T.unlines
-              [ "module A () where"
-              , "a :: ()"
-              , "a = ()"])
-    , testSession "remove all exports three" $ template
-        (T.unlines
-              [ "module A (a,x,y) where"
-              , "a :: ()"
-              , "a = ()"])
-        "Remove all redundant exports"
-        (Just $ T.unlines
-              [ "module A (a) where"
-              , "a :: ()"
-              , "a = ()"])
-    , testSession "remove all exports composite" $ template
-        (T.unlines
-              [ "module A (x,y,b, module Ls, a, A(X,getW, Y, Z,(:-),getV), (-+), B(B)) where"
-              , "data A = X {getV :: Int} | Y {getV :: Int}"
-              , "data B = B"
-              , "a,b :: ()"
-              , "a = ()"
-              , "b = ()"])
-        "Remove all redundant exports"
-        (Just $ T.unlines
-              [ "module A (b, a, A(X, Y,getV), B(B)) where"
-              , "data A = X {getV :: Int} | Y {getV :: Int}"
-              , "data B = B"
-              , "a,b :: ()"
-              , "a = ()"
-              , "b = ()"])
-    ]
-  where
-    template = exportTemplate Nothing
-
 addSigLensesTests :: TestTree
 addSigLensesTests =
   let pragmas = "{-# OPTIONS_GHC -Wmissing-signatures -Wmissing-pattern-synonym-signatures #-}"
@@ -4420,7 +1103,7 @@ findDefinitionAndHoverTests = let
   holeL65 = Position 65 8  ;  hleInfo2 = [ExpectHoverText ["_ :: a -> Maybe a"]]
   cccL17 = Position 17 16  ;  docLink = [ExpectHoverTextRegex "\\*Defined in 'GHC.Types'\\* \\*\\(ghc-prim-[0-9.]+\\)\\*\n\n"]
   imported = Position 56 13 ; importedSig = getDocUri "Foo.hs" >>= \foo -> return [ExpectHoverText ["foo", "Foo", "Haddock"], mkL foo 5 0 5 3]
-  reexported = Position 55 14 ; reexportedSig = getDocUri "Bar.hs" >>= \bar -> return [ExpectHoverText ["Bar", "Bar", "Haddock"], mkL bar 3 0 3 14]
+  reexported = Position 55 14 ; reexportedSig = getDocUri "Bar.hs" >>= \bar -> return [ExpectHoverText ["Bar", "Bar", "Haddock"], mkL bar 3 (if ghcVersion >= GHC94 then 5 else 0) 3 (if ghcVersion >= GHC94 then 8 else 14)]
   thLocL57 = Position 59 10 ; thLoc = [ExpectHoverText ["Identity"]]
   in
   mkFindTests
@@ -4504,7 +1187,7 @@ checkFileCompiles fp diag =
 pluginSimpleTests :: TestTree
 pluginSimpleTests =
   ignoreInWindowsForGHC88And810 $
-  ignoreForGHC92 "blocked on ghc-typelits-natnormalise" $
+  ignoreForGHC92Plus "blocked on ghc-typelits-natnormalise" $
   testSessionWithExtraFiles "plugin-knownnat" "simple plugin" $ \dir -> do
     _ <- openDoc (dir </> "KnownNat.hs") "haskell"
     liftIO $ writeFile (dir</>"hie.yaml")
@@ -4519,7 +1202,7 @@ pluginSimpleTests =
 pluginParsedResultTests :: TestTree
 pluginParsedResultTests =
   ignoreInWindowsForGHC88And810 $
-  ignoreForGHC92 "No need for this plugin anymore!" $
+  ignoreForGHC92Plus "No need for this plugin anymore!" $
   testSessionWithExtraFiles "plugin-recorddot" "parsedResultAction plugin" $ \dir -> do
     _ <- openDoc (dir</> "RecordDot.hs") "haskell"
     expectNoMoreDiagnostics 2
@@ -4826,55 +1509,6 @@ completionTest name src pos expected = testSessionWait name $ do
             when expectedDocs $
                 assertBool ("Missing docs: " <> T.unpack _label) (isJust _documentation)
 
-completionCommandTest ::
-  String ->
-  [T.Text] ->
-  Position ->
-  T.Text ->
-  [T.Text] ->
-  TestTree
-completionCommandTest name src pos wanted expected = testSession name $ do
-  docId <- createDoc "A.hs" "haskell" (T.unlines src)
-  _ <- waitForDiagnostics
-  compls <- skipManyTill anyMessage (getCompletions docId pos)
-  let wantedC = find ( \case
-            CompletionItem {_insertText = Just x} -> wanted `T.isPrefixOf` x
-            _                                     -> False
-            ) compls
-  case wantedC of
-    Nothing ->
-      liftIO $ assertFailure $ "Cannot find expected completion in: " <> show [_label | CompletionItem {_label} <- compls]
-    Just CompletionItem {..} -> do
-      c <- assertJust "Expected a command" _command
-      executeCommand c
-      if src /= expected
-          then do
-            void $ skipManyTill anyMessage loggingNotification
-            modifiedCode <- skipManyTill anyMessage (getDocumentEdit docId)
-            liftIO $ modifiedCode @?= T.unlines expected
-          else do
-            expectMessages SWorkspaceApplyEdit 1 $ \edit ->
-              liftIO $ assertFailure $ "Expected no edit but got: " <> show edit
-
-completionNoCommandTest ::
-  String ->
-  [T.Text] ->
-  Position ->
-  T.Text ->
-  TestTree
-completionNoCommandTest name src pos wanted = testSession name $ do
-  docId <- createDoc "A.hs" "haskell" (T.unlines src)
-  _ <- waitForDiagnostics
-  compls <- getCompletions docId pos
-  let wantedC = find ( \case
-            CompletionItem {_insertText = Just x} -> wanted `T.isPrefixOf` x
-            _                                     -> False
-            ) compls
-  case wantedC of
-    Nothing ->
-      liftIO $ assertFailure $ "Cannot find expected completion in: " <> show [_label | CompletionItem {_label} <- compls]
-    Just CompletionItem{..} -> liftIO . assertBool ("Expected no command but got: " <> show _command) $ null _command
-
 
 topLevelCompletionTests :: [TestTree]
 topLevelCompletionTests = [
@@ -5069,120 +1703,6 @@ nonLocalCompletionTests =
         (Position 2 10)
         [("readFile", CiFunction, "readFile ${1:FilePath}", True, True, Nothing)]
         ],
-    testGroup "auto import snippets"
-      [ completionCommandTest
-        "show imports not in list - simple"
-        ["{-# LANGUAGE NoImplicitPrelude #-}",
-        "module A where", "import Control.Monad (msum)", "f = joi"]
-        (Position 3 6)
-        "join"
-        ["{-# LANGUAGE NoImplicitPrelude #-}",
-        "module A where", "import Control.Monad (msum, join)", "f = joi"]
-      , completionCommandTest
-        "show imports not in list - multi-line"
-        ["{-# LANGUAGE NoImplicitPrelude #-}",
-        "module A where", "import Control.Monad (\n    msum)", "f = joi"]
-        (Position 4 6)
-        "join"
-        ["{-# LANGUAGE NoImplicitPrelude #-}",
-        "module A where", "import Control.Monad (\n    msum, join)", "f = joi"]
-      , completionCommandTest
-        "show imports not in list - names with _"
-        ["{-# LANGUAGE NoImplicitPrelude #-}",
-        "module A where", "import Control.Monad as M (msum)", "f = M.mapM_"]
-        (Position 3 11)
-        "mapM_"
-        ["{-# LANGUAGE NoImplicitPrelude #-}",
-        "module A where", "import Control.Monad as M (msum, mapM_)", "f = M.mapM_"]
-      , completionCommandTest
-        "show imports not in list - initial empty list"
-        ["{-# LANGUAGE NoImplicitPrelude #-}",
-        "module A where", "import Control.Monad as M ()", "f = M.joi"]
-        (Position 3 10)
-        "join"
-        ["{-# LANGUAGE NoImplicitPrelude #-}",
-        "module A where", "import Control.Monad as M (join)", "f = M.joi"]
-      , testGroup "qualified imports"
-        [ completionCommandTest
-            "single"
-            ["{-# LANGUAGE NoImplicitPrelude #-}",
-            "module A where", "import Control.Monad ()", "f = Control.Monad.joi"]
-            (Position 3 22)
-            "join"
-            ["{-# LANGUAGE NoImplicitPrelude #-}",
-            "module A where", "import Control.Monad (join)", "f = Control.Monad.joi"]
-        , completionCommandTest
-            "as"
-            ["{-# LANGUAGE NoImplicitPrelude #-}",
-            "module A where", "import Control.Monad as M ()", "f = M.joi"]
-            (Position 3 10)
-            "join"
-            ["{-# LANGUAGE NoImplicitPrelude #-}",
-            "module A where", "import Control.Monad as M (join)", "f = M.joi"]
-        , completionCommandTest
-            "multiple"
-            ["{-# LANGUAGE NoImplicitPrelude #-}",
-            "module A where", "import Control.Monad as M ()", "import Control.Monad as N ()", "f = N.joi"]
-            (Position 4 10)
-            "join"
-            ["{-# LANGUAGE NoImplicitPrelude #-}",
-            "module A where", "import Control.Monad as M ()", "import Control.Monad as N (join)", "f = N.joi"]
-        ]
-      , testGroup "Data constructor"
-        [ completionCommandTest
-            "not imported"
-            ["module A where", "import Text.Printf ()", "ZeroPad"]
-            (Position 2 4)
-            "ZeroPad"
-            ["module A where", "import Text.Printf (FormatAdjustment (ZeroPad))", "ZeroPad"]
-        , completionCommandTest
-            "parent imported abs"
-            ["module A where", "import Text.Printf (FormatAdjustment)", "ZeroPad"]
-            (Position 2 4)
-            "ZeroPad"
-            ["module A where", "import Text.Printf (FormatAdjustment (ZeroPad))", "ZeroPad"]
-        , completionNoCommandTest
-            "parent imported all"
-            ["module A where", "import Text.Printf (FormatAdjustment (..))", "ZeroPad"]
-            (Position 2 4)
-            "ZeroPad"
-        , completionNoCommandTest
-            "already imported"
-            ["module A where", "import Text.Printf (FormatAdjustment (ZeroPad))", "ZeroPad"]
-            (Position 2 4)
-            "ZeroPad"
-        , completionNoCommandTest
-            "function from Prelude"
-            ["module A where", "import Data.Maybe ()", "Nothing"]
-            (Position 2 4)
-            "Nothing"
-        , completionCommandTest
-            "type operator parent"
-            ["module A where", "import Data.Type.Equality ()", "f = Ref"]
-            (Position 2 8)
-            "Refl"
-            ["module A where", "import Data.Type.Equality (type (:~:) (Refl))", "f = Ref"]
-        ]
-      , testGroup "Record completion"
-        [ completionCommandTest
-            "not imported"
-            ["module A where", "import Text.Printf ()", "FormatParse"]
-            (Position 2 10)
-            "FormatParse {"
-            ["module A where", "import Text.Printf (FormatParse (FormatParse))", "FormatParse"]
-        , completionCommandTest
-            "parent imported"
-            ["module A where", "import Text.Printf (FormatParse)", "FormatParse"]
-            (Position 2 10)
-            "FormatParse {"
-            ["module A where", "import Text.Printf (FormatParse (FormatParse))", "FormatParse"]
-        , completionNoCommandTest
-            "already imported"
-            ["module A where", "import Text.Printf (FormatParse (FormatParse))", "FormatParse"]
-            (Position 2 10)
-            "FormatParse {"
-        ]
-      ],
       -- we need this test to make sure the ghcide completions module does not return completions for language pragmas. this functionality is turned on in hls
      completionTest
       "do not show pragma completions"
@@ -5265,10 +1785,10 @@ packageCompletionTests =
               , _label == "fromList"
               ]
         liftIO $ take 3 (sort compls') @?=
-          map ("Defined in "<>)
+          map ("Defined in "<>) (
               [ "'Data.List.NonEmpty"
               , "'GHC.Exts"
-              ]
+              ] ++ if ghcVersion >= GHC94 then [ "'GHC.IsList" ] else [])
 
   , testSessionWait "Map" $ do
         doc <- createDoc "A.hs" "haskell" $ T.unlines
@@ -5329,21 +1849,6 @@ packageCompletionTests =
               ]
         liftIO $ take 3 compls' @?=
           map Just ["fromList ${1:([Item l])}"]
-  , testGroup "auto import snippets"
-    [ completionCommandTest
-            "import Data.Sequence"
-            ["module A where", "foo :: Seq"]
-            (Position 1 9)
-            "Seq"
-            ["module A where", "import Data.Sequence (Seq)", "foo :: Seq"]
-
-    , completionCommandTest
-            "qualified import"
-            ["module A where", "foo :: Seq.Seq"]
-            (Position 1 13)
-            "Seq"
-            ["module A where", "import qualified Data.Sequence as Seq", "foo :: Seq.Seq"]
-    ]
   ]
 
 projectCompletionTests :: [TestTree]
@@ -5496,10 +2001,10 @@ completionDocTests =
       test doc (Position 1 7) "id" (Just $ T.length expected) [expected]
   ]
   where
-    brokenForGhc9 = knownBrokenFor (BrokenForGHC [GHC90, GHC92]) "Completion doc doesn't support ghc9"
+    brokenForGhc9 = knownBrokenFor (BrokenForGHC [GHC90, GHC92, GHC94]) "Completion doc doesn't support ghc9"
     brokenForWinGhc9 = knownBrokenFor (BrokenSpecific Windows [GHC90, GHC92]) "Extern doc doesn't support Windows for ghc9.2"
     -- https://gitlab.haskell.org/ghc/ghc/-/issues/20903
-    brokenForMacGhc9 = knownBrokenFor (BrokenSpecific MacOS [GHC90, GHC92]) "Extern doc doesn't support MacOS for ghc9"
+    brokenForMacGhc9 = knownBrokenFor (BrokenSpecific MacOS [GHC90, GHC92, GHC94]) "Extern doc doesn't support MacOS for ghc9"
     test doc pos label mn expected = do
       _ <- waitForDiagnostics
       compls <- getCompletions doc pos
@@ -5542,7 +2047,7 @@ highlightTests = testGroup "highlight"
             , DocumentHighlight (R 6 10 6 13) (Just HkRead)
             , DocumentHighlight (R 7 12 7 15) (Just HkRead)
             ]
-  , knownBrokenForGhcVersions [GHC90, GHC92] "Ghc9 highlights the constructor and not just this field" $
+  , knownBrokenForGhcVersions [GHC90, GHC92, GHC94] "Ghc9 highlights the constructor and not just this field" $
         testSessionWait "record" $ do
         doc <- createDoc "A.hs" "haskell" recsource
         _ <- waitForDiagnostics
@@ -5550,8 +2055,8 @@ highlightTests = testGroup "highlight"
         liftIO $ highlights @?= List
           -- Span is just the .. on 8.10, but Rec{..} before
           [ if ghcVersion >= GHC810
-              then DocumentHighlight (R 4 8 4 10) (Just HkWrite)
-              else DocumentHighlight (R 4 4 4 11) (Just HkWrite)
+            then DocumentHighlight (R 4 8 4 10) (Just HkWrite)
+            else DocumentHighlight (R 4 4 4 11) (Just HkWrite)
           , DocumentHighlight (R 4 14 4 20) (Just HkRead)
           ]
         highlights <- getHighlights doc (Position 3 17)
@@ -5772,8 +2277,8 @@ ignoreInWindowsForGHC88And810 :: TestTree -> TestTree
 ignoreInWindowsForGHC88And810 =
     ignoreFor (BrokenSpecific Windows [GHC88, GHC810]) "tests are unreliable in windows for ghc 8.8 and 8.10"
 
-ignoreForGHC92 :: String -> TestTree -> TestTree
-ignoreForGHC92 = ignoreFor (BrokenForGHC [GHC92])
+ignoreForGHC92Plus :: String -> TestTree -> TestTree
+ignoreForGHC92Plus = ignoreFor (BrokenForGHC [GHC92, GHC94])
 
 ignoreInWindowsForGHC88 :: TestTree -> TestTree
 ignoreInWindowsForGHC88 =
@@ -6336,9 +2841,9 @@ asyncTests = testGroup "async"
               , "foo = id"
               ]
             void waitForDiagnostics
-            actions <- getCodeActions doc (Range (Position 1 0) (Position 1 0))
-            liftIO $ [ _title | InR CodeAction{_title} <- actions] @=?
-              [ "add signature: foo :: a -> a" ]
+            codeLenses <- getCodeLenses doc
+            liftIO $ [ _title | CodeLens{_command = Just Command{_title}} <- codeLenses] @=?
+              [ "foo :: a -> a" ]
     , testSession "request" $ do
             -- Execute a custom request that will block for 1000 seconds
             void $ sendRequest (SCustomMethod "test") $ toJSON $ BlockSeconds 1000
@@ -6348,9 +2853,9 @@ asyncTests = testGroup "async"
               , "foo = id"
               ]
             void waitForDiagnostics
-            actions <- getCodeActions doc (Range (Position 1 0) (Position 1 0))
-            liftIO $ [ _title | InR CodeAction{_title} <- actions] @=?
-              [ "add signature: foo :: a -> a" ]
+            codeLenses <- getCodeLenses doc
+            liftIO $ [ _title | CodeLens{_command = Just Command{_title}} <- codeLenses] @=?
+              [ "foo :: a -> a" ]
     ]
 
 
@@ -6564,21 +3069,6 @@ testSessionWait name = testSession name .
       -- Experimentally, 0.5s seems to be long enough to wait for any final diagnostics to appear.
       ( >> expectNoMoreDiagnostics 0.5)
 
-pickActionWithTitle :: T.Text -> [Command |? CodeAction] -> IO CodeAction
-pickActionWithTitle title actions = do
-  assertBool ("Found no matching actions for " <> show title <> " in " <> show titles) (not $ null matches)
-  return $ head matches
-  where
-    titles =
-        [ actionTitle
-        | InR CodeAction { _title = actionTitle } <- actions
-        ]
-    matches =
-        [ action
-        | InR action@CodeAction { _title = actionTitle } <- actions
-        , title == actionTitle
-        ]
-
 mkRange :: UInt -> UInt -> UInt -> UInt -> Range
 mkRange a b c d = Range (Position a b) (Position c d)
 
@@ -6670,35 +3160,6 @@ openTestDataDoc path = do
   source <- liftIO $ readFileUtf8 $ "test/data" </> path
   createDoc path "haskell" source
 
-findCodeActions :: TextDocumentIdentifier -> Range -> [T.Text] -> Session [CodeAction]
-findCodeActions = findCodeActions' (==) "is not a superset of"
-
-findCodeActionsByPrefix :: TextDocumentIdentifier -> Range -> [T.Text] -> Session [CodeAction]
-findCodeActionsByPrefix = findCodeActions' T.isPrefixOf "is not prefix of"
-
-findCodeActions' :: (T.Text -> T.Text -> Bool) -> String -> TextDocumentIdentifier -> Range -> [T.Text] -> Session [CodeAction]
-findCodeActions' op errMsg doc range expectedTitles = do
-  actions <- getCodeActions doc range
-  let matches = sequence
-        [ listToMaybe
-          [ action
-          | InR action@CodeAction { _title = actionTitle } <- actions
-          , expectedTitle `op` actionTitle]
-        | expectedTitle <- expectedTitles]
-  let msg = show
-            [ actionTitle
-            | InR CodeAction { _title = actionTitle } <- actions
-            ]
-            ++ " " <> errMsg <> " "
-            ++ show expectedTitles
-  liftIO $ case matches of
-    Nothing -> assertFailure msg
-    Just _  -> pure ()
-  return (fromJust matches)
-
-findCodeAction :: TextDocumentIdentifier -> Range -> T.Text -> Session CodeAction
-findCodeAction doc range t = head <$> findCodeActions doc range [t]
-
 unitTests :: Recorder (WithPriority Log) -> Logger -> TestTree
 unitTests recorder logger = do
   testGroup "Unit"
@@ -7047,11 +3508,6 @@ withTempDir f = System.IO.Extra.withTempDir $ \dir -> do
   dir' <- canonicalizePath dir
   f dir'
 
--- | Assert that a value is not 'Nothing', and extract the value.
-assertJust :: MonadIO m => String -> Maybe a -> m a
-assertJust s = \case
-  Nothing -> liftIO $ assertFailure s
-  Just x  -> pure x
 
 -- | Before ghc9, lists of Char is displayed as [Char], but with ghc9 and up, it's displayed as String
 listOfChar :: T.Text
diff --git a/ghcide/test/ghcide-test-utils.cabal b/ghcide/test/ghcide-test-utils.cabal
new file mode 100644
index 00000000000..3bdac320712
--- /dev/null
+++ b/ghcide/test/ghcide-test-utils.cabal
@@ -0,0 +1,59 @@
+cabal-version:      3.0
+-- This library is a copy of the sublibrary ghcide-test-utils until stack and hackage support public sublibraries
+build-type:         Simple
+category:           Development
+name:               ghcide-test-utils
+version:            1.7.0.1
+license:            Apache-2.0
+license-file:       LICENSE
+author:             Digital Asset and Ghcide contributors
+maintainer:         Ghcide contributors
+copyright:          Digital Asset and Ghcide contributors 2018-2022
+synopsis:           Test utils for ghcide
+description:
+    Test utils for ghcide
+homepage:           https://github.com/haskell/haskell-language-server/tree/master/ghcide#readme
+bug-reports:        https://github.com/haskell/haskell-language-server/issues
+tested-with:        GHC == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.3 || == 9.2.4
+
+source-repository head
+    type:     git
+    location: https://github.com/haskell/haskell-language-server.git
+
+
+library
+    default-language: Haskell2010
+    build-depends:
+        aeson,
+        base,
+        containers,
+        data-default,
+        directory,
+        extra,
+        filepath,
+        ghcide,
+        lsp-types,
+        hls-plugin-api,
+        lens,
+        lsp-test ^>= 0.14,
+        tasty-hunit >= 0.10,
+        text,
+    hs-source-dirs: src
+    exposed-modules:
+        Development.IDE.Test
+        Development.IDE.Test.Diagnostic
+    default-extensions:
+        BangPatterns
+        DeriveFunctor
+        DeriveGeneric
+        FlexibleContexts
+        GeneralizedNewtypeDeriving
+        LambdaCase
+        NamedFieldPuns
+        OverloadedStrings
+        RecordWildCards
+        ScopedTypeVariables
+        StandaloneDeriving
+        TupleSections
+        TypeApplications
+        ViewPatterns
diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
index 694f0575344..fb738139111 100644
--- a/haskell-language-server.cabal
+++ b/haskell-language-server.cabal
@@ -228,18 +228,23 @@ flag brittany
   default:     True
   manual:      True
 
+flag refactor
+  description: Enable refactor plugin
+  default:     True
+  manual:      True
+
 flag dynamic
   description: Build with the dyn rts
   default:     True
   manual:      True
 
 common class
-  if flag(class)
+  if flag(class) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-class-plugin ^>= 1.0
     cpp-options: -Dhls_class
 
 common callHierarchy
-  if flag(callHierarchy)
+  if flag(callHierarchy) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-call-hierarchy-plugin ^>= 1.0
     cpp-options: -Dhls_callHierarchy
 
@@ -249,22 +254,22 @@ common haddockComments
     cpp-options: -Dhls_haddockComments
 
 common eval
-  if flag(eval)
+  if flag(eval) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-eval-plugin ^>= 1.2
     cpp-options: -Dhls_eval
 
 common importLens
-  if flag(importLens)
+  if flag(importLens) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-explicit-imports-plugin ^>= 1.1
     cpp-options: -Dhls_importLens
 
 common refineImports
-  if flag(refineImports)
+  if flag(refineImports) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-refine-imports-plugin ^>=1.0
     cpp-options: -Dhls_refineImports
 
 common rename
-  if flag(rename)
+  if flag(rename) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-rename-plugin ^>= 1.0
     cpp-options: -Dhls_rename
 
@@ -279,7 +284,7 @@ common tactic
     cpp-options: -Dhls_tactic
 
 common hlint
-  if flag(hlint)
+  if flag(hlint) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-hlint-plugin ^>= 1.0
     cpp-options: -Dhls_hlint
 
@@ -289,12 +294,12 @@ common stan
     cpp-options: -Dhls_stan
 
 common moduleName
-  if flag(moduleName)
+  if flag(moduleName) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-module-name-plugin ^>= 1.0
     cpp-options: -Dhls_moduleName
 
 common pragmas
-  if flag(pragmas)
+  if flag(pragmas) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-pragmas-plugin ^>= 1.0
     cpp-options: -Dhls_pragmas
 
@@ -304,54 +309,54 @@ common splice
     cpp-options: -Dhls_splice
 
 common alternateNumberFormat
-  if flag(alternateNumberFormat)
+  if flag(alternateNumberFormat) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-alternate-number-format-plugin ^>= 1.1
     cpp-options: -Dhls_alternateNumberFormat
 
 common qualifyImportedNames
-  if flag(qualifyImportedNames)
+  if flag(qualifyImportedNames) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-qualify-imported-names-plugin ^>=1.0
     cpp-options: -Dhls_qualifyImportedNames
 
 common codeRange
-  if flag(codeRange)
+  if flag(codeRange) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-code-range-plugin ^>= 1.0
     cpp-options: -Dhls_codeRange
 
 common changeTypeSignature
-  if flag(changeTypeSignature)
+  if flag(changeTypeSignature) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-change-type-signature-plugin ^>= 1.0
     cpp-options: -Dhls_changeTypeSignature
 
 common gadt
-  if flag(gadt)
+  if flag(gadt) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-gadt-plugin ^>= 1.0
     cpp-options: -Dhls_gadt
 
 common explicitFixity
-  if flag(explicitFixity)
+  if flag(explicitFixity) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-explicit-fixity-plugin ^>= 1.0
     cpp-options: -DexplicitFixity
 
 -- formatters
 
 common floskell
-  if flag(floskell)
+  if flag(floskell) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-floskell-plugin ^>= 1.0
     cpp-options: -Dhls_floskell
 
 common fourmolu
-  if flag(fourmolu)
+  if flag(fourmolu) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-fourmolu-plugin ^>= 1.0
     cpp-options: -Dhls_fourmolu
 
 common ormolu
-  if flag(ormolu)
+  if flag(ormolu) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-ormolu-plugin ^>= 1.0
     cpp-options: -Dhls_ormolu
 
 common stylishHaskell
-  if flag(stylishHaskell)
+  if flag(stylishHaskell) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-stylish-haskell-plugin ^>= 1.0
     cpp-options: -Dhls_stylishHaskell
 
@@ -360,6 +365,11 @@ common brittany
     build-depends: hls-brittany-plugin ^>= 1.0
     cpp-options: -Dhls_brittany
 
+common refactor
+  if flag(refactor) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
+    build-depends: hls-refactor-plugin ^>= 1.0
+    cpp-options: -Dhls_refactor
+
 library plugins
   import:             common-deps
                     -- configuration
@@ -391,6 +401,7 @@ library plugins
                     , ormolu
                     , stylishHaskell
                     , brittany
+                    , refactor
   exposed-modules: HlsPlugins
   hs-source-dirs: src
 
@@ -509,6 +520,7 @@ test-suite func-test
   import:             common-deps
                     , warnings
                     , pedantic
+                    , refactor
   type:               exitcode-stdio-1.0
   default-language:   Haskell2010
   build-tool-depends:
diff --git a/hie-compat/hie-compat.cabal b/hie-compat/hie-compat.cabal
index 8166d2fcd24..ab94fb7a777 100644
--- a/hie-compat/hie-compat.cabal
+++ b/hie-compat/hie-compat.cabal
@@ -25,7 +25,7 @@ flag ghc-lib
 library
   default-language:    Haskell2010
   build-depends:
-     base < 4.17, array, bytestring, containers, directory, filepath, transformers
+     base < 4.18, array, bytestring, containers, directory, filepath, transformers
   if flag(ghc-lib) && impl(ghc < 9)
     build-depends: ghc-lib < 9.0
   else
@@ -52,3 +52,5 @@ library
     hs-source-dirs: src-ghc90 src-reexport-ghc9
   if (impl(ghc >= 9.2) && impl(ghc < 9.3))
     hs-source-dirs: src-ghc92 src-reexport-ghc9
+  if (impl(ghc >= 9.4) && impl(ghc < 9.5))
+    hs-source-dirs: src-reexport-ghc92
diff --git a/hie-compat/src-reexport-ghc92/Compat/HieAst.hs b/hie-compat/src-reexport-ghc92/Compat/HieAst.hs
new file mode 100644
index 00000000000..240dc4da49e
--- /dev/null
+++ b/hie-compat/src-reexport-ghc92/Compat/HieAst.hs
@@ -0,0 +1,3 @@
+module Compat.HieAst
+  ( module GHC.Iface.Ext.Ast ) where
+import GHC.Iface.Ext.Ast
diff --git a/hie-compat/src-reexport-ghc92/Compat/HieBin.hs b/hie-compat/src-reexport-ghc92/Compat/HieBin.hs
new file mode 100644
index 00000000000..254e1db6d36
--- /dev/null
+++ b/hie-compat/src-reexport-ghc92/Compat/HieBin.hs
@@ -0,0 +1,8 @@
+{-
+Binary serialization for .hie files.
+-}
+
+module Compat.HieBin ( module GHC.Iface.Ext.Binary)
+where
+
+import GHC.Iface.Ext.Binary
diff --git a/hie-compat/src-reexport-ghc92/Compat/HieDebug.hs b/hie-compat/src-reexport-ghc92/Compat/HieDebug.hs
new file mode 100644
index 00000000000..872da67c2b3
--- /dev/null
+++ b/hie-compat/src-reexport-ghc92/Compat/HieDebug.hs
@@ -0,0 +1,10 @@
+module Compat.HieDebug
+  ( module GHC.Iface.Ext.Debug
+  , ppHie ) where
+import GHC.Iface.Ext.Debug
+
+import GHC.Iface.Ext.Types (HieAST)
+import GHC.Utils.Outputable (Outputable(ppr), SDoc)
+
+ppHie :: Outputable a => HieAST a -> SDoc
+ppHie = ppr
diff --git a/hie-compat/src-reexport-ghc92/Compat/HieTypes.hs b/hie-compat/src-reexport-ghc92/Compat/HieTypes.hs
new file mode 100644
index 00000000000..36bb86abeb5
--- /dev/null
+++ b/hie-compat/src-reexport-ghc92/Compat/HieTypes.hs
@@ -0,0 +1,3 @@
+module Compat.HieTypes
+  ( module GHC.Iface.Ext.Types ) where
+import GHC.Iface.Ext.Types
diff --git a/hie-compat/src-reexport-ghc92/Compat/HieUtils.hs b/hie-compat/src-reexport-ghc92/Compat/HieUtils.hs
new file mode 100644
index 00000000000..204a3120391
--- /dev/null
+++ b/hie-compat/src-reexport-ghc92/Compat/HieUtils.hs
@@ -0,0 +1,3 @@
+module Compat.HieUtils
+  ( module GHC.Iface.Ext.Utils ) where
+import GHC.Iface.Ext.Utils
diff --git a/hls-graph/src/Development/IDE/Graph/Internal/Rules.hs b/hls-graph/src/Development/IDE/Graph/Internal/Rules.hs
index 7470c0e33e0..97ea11eff78 100644
--- a/hls-graph/src/Development/IDE/Graph/Internal/Rules.hs
+++ b/hls-graph/src/Development/IDE/Graph/Internal/Rules.hs
@@ -46,7 +46,7 @@ addRule f = do
 runRule
     :: TheRules -> Key -> Maybe BS.ByteString -> RunMode -> Action (RunResult Value)
 runRule rules key@(Key t) bs mode = case Map.lookup (typeOf t) rules of
-    Nothing -> liftIO $ errorIO "Could not find key"
+    Nothing -> liftIO $ errorIO $ "Could not find key: " ++ show key
     Just x  -> unwrapDynamic x key bs mode
 
 runRules :: Dynamic -> Rules () -> IO (TheRules, [Action ()])
diff --git a/hls-plugin-api/src/Ide/PluginUtils.hs b/hls-plugin-api/src/Ide/PluginUtils.hs
index 7b5753ffee0..7f8b1c2a7fe 100644
--- a/hls-plugin-api/src/Ide/PluginUtils.hs
+++ b/hls-plugin-api/src/Ide/PluginUtils.hs
@@ -31,7 +31,7 @@ module Ide.PluginUtils
     pluginResponse,
     handleMaybe,
     handleMaybeM,
-    throwPluginError
+    throwPluginError,
     )
 where
 
@@ -44,6 +44,7 @@ import           Data.Algorithm.Diff
 import           Data.Algorithm.DiffOutput
 import           Data.Bifunctor                  (Bifunctor (first))
 import qualified Data.HashMap.Strict             as H
+import           Data.List                       (find)
 import           Data.String                     (IsString (fromString))
 import qualified Data.Text                       as T
 import           Ide.Plugin.Config
@@ -230,6 +231,7 @@ allLspCmdIds pid commands = concatMap go commands
   where
     go (plid, cmds) = map (mkLspCmdId pid plid . commandId) cmds
 
+
 -- ---------------------------------------------------------------------
 
 getNormalizedFilePath :: Monad m => Uri -> ExceptT String m NormalizedFilePath
diff --git a/hls-plugin-api/src/Ide/Types.hs b/hls-plugin-api/src/Ide/Types.hs
index 4877b5271b1..e9fbe8a28d2 100644
--- a/hls-plugin-api/src/Ide/Types.hs
+++ b/hls-plugin-api/src/Ide/Types.hs
@@ -45,6 +45,7 @@ module Ide.Types
 , getProcessID, getPid
 , installSigUsr1Handler
 , responseError
+, lookupCommandProvider
 )
     where
 
@@ -66,7 +67,7 @@ import           Data.GADT.Compare
 import           Data.Hashable                   (Hashable)
 import           Data.HashMap.Strict             (HashMap)
 import qualified Data.HashMap.Strict             as HashMap
-import           Data.List.Extra                 (sortOn)
+import           Data.List.Extra                 (sortOn, find)
 import           Data.List.NonEmpty              (NonEmpty (..), toList)
 import qualified Data.Map                        as Map
 import           Data.Maybe
@@ -106,19 +107,36 @@ import           Options.Applicative             (ParserInfo)
 import           System.FilePath
 import           System.IO.Unsafe
 import           Text.Regex.TDFA.Text            ()
+import           Control.Applicative             ((<|>))
 
 -- ---------------------------------------------------------------------
 
-newtype IdePlugins ideState = IdePlugins_ { ipMap_ :: HashMap PluginId (PluginDescriptor ideState)}
-  deriving newtype (Semigroup, Monoid)
+data IdePlugins ideState = IdePlugins_
+  { ipMap_ :: HashMap PluginId (PluginDescriptor ideState)
+  , lookupCommandProvider :: CommandId -> Maybe PluginId
+  }
 
 -- | Smart constructor that deduplicates plugins
 pattern IdePlugins :: [PluginDescriptor ideState] -> IdePlugins ideState
-pattern IdePlugins{ipMap} <- IdePlugins_ (sortOn (Down . pluginPriority) . HashMap.elems -> ipMap)
+pattern IdePlugins{ipMap} <- IdePlugins_ (sortOn (Down . pluginPriority) . HashMap.elems -> ipMap) _
   where
-    IdePlugins ipMap = IdePlugins_{ipMap_ = HashMap.fromList $ (pluginId &&& id) <$> ipMap}
+    IdePlugins ipMap = IdePlugins_{ipMap_ = HashMap.fromList $ (pluginId &&& id) <$> ipMap
+                                  , lookupCommandProvider = lookupPluginId ipMap
+                                  }
 {-# COMPLETE IdePlugins #-}
 
+instance Semigroup (IdePlugins a) where
+  (IdePlugins_ a f) <> (IdePlugins_ b g) = IdePlugins_ (a <> b) (\x -> f x <|> g x)
+
+instance Monoid (IdePlugins a) where
+  mempty = IdePlugins_ mempty (const Nothing)
+
+-- | Lookup the plugin that exposes a particular command
+lookupPluginId :: [PluginDescriptor a] -> CommandId -> Maybe PluginId
+lookupPluginId ls cmd = pluginId <$> find go ls
+  where
+    go desc = cmd `elem` map commandId (pluginCommands desc)
+
 -- | Hooks for modifying the 'DynFlags' at different times of the compilation
 -- process. Plugins can install a 'DynFlagsModifications' via
 -- 'pluginModifyDynflags' in their 'PluginDescriptor'.
diff --git a/plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal b/plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal
index 372fd8c3d2c..b7eee39ce02 100644
--- a/plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal
+++ b/plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal
@@ -18,6 +18,10 @@ extra-source-files:
   test/testdata/*.yaml
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:  Ide.Plugin.AlternateNumberFormat, Ide.Plugin.Conversion
   other-modules:    Ide.Plugin.Literals
   hs-source-dirs:   src
@@ -47,6 +51,10 @@ library
     RecordWildCards
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal b/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal
index 8865f079513..dc5cd8e398a 100644
--- a/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal
+++ b/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal
@@ -16,6 +16,10 @@ extra-source-files:
   test/testdata/*.hs
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:    Ide.Plugin.CallHierarchy
   other-modules:
     Ide.Plugin.CallHierarchy.Internal
@@ -43,6 +47,10 @@ library
   default-extensions: DataKinds
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal b/plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal
index 5f9812c30e1..f93f303788c 100644
--- a/plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal
+++ b/plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal
@@ -19,6 +19,10 @@ extra-source-files:
   test/testdata/*.yaml
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:  Ide.Plugin.ChangeTypeSignature
   hs-source-dirs:   src
   build-depends:
@@ -46,6 +50,10 @@ library
 
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-class-plugin/hls-class-plugin.cabal b/plugins/hls-class-plugin/hls-class-plugin.cabal
index c0ad09f3058..245522a9cd6 100644
--- a/plugins/hls-class-plugin/hls-class-plugin.cabal
+++ b/plugins/hls-class-plugin/hls-class-plugin.cabal
@@ -21,6 +21,10 @@ extra-source-files:
   test/testdata/*.hs
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:    Ide.Plugin.Class
   other-modules:      Ide.Plugin.Class.CodeAction
                     , Ide.Plugin.Class.CodeLens
@@ -58,6 +62,10 @@ library
   ghc-options:        -Wall -Wno-unticked-promoted-constructors -Wno-name-shadowing
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-code-range-plugin/hls-code-range-plugin.cabal b/plugins/hls-code-range-plugin/hls-code-range-plugin.cabal
index e51ad552681..3d50d0c764b 100644
--- a/plugins/hls-code-range-plugin/hls-code-range-plugin.cabal
+++ b/plugins/hls-code-range-plugin/hls-code-range-plugin.cabal
@@ -21,6 +21,10 @@ extra-source-files:
   test/testdata/selection-range/*.txt
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:
     Ide.Plugin.CodeRange
     Ide.Plugin.CodeRange.Rules
@@ -38,6 +42,7 @@ library
     , ghcide           ^>=1.6 || ^>=1.7
     , hashable
     , hls-plugin-api   ^>=1.3 || ^>=1.4
+    , hls-refactor-plugin
     , lens
     , lsp
     , mtl
@@ -47,6 +52,10 @@ library
     , vector
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-code-range-plugin/src/Ide/Plugin/CodeRange.hs b/plugins/hls-code-range-plugin/src/Ide/Plugin/CodeRange.hs
index 0a48a3467b1..23a02cfb60a 100644
--- a/plugins/hls-code-range-plugin/src/Ide/Plugin/CodeRange.hs
+++ b/plugins/hls-code-range-plugin/src/Ide/Plugin/CodeRange.hs
@@ -31,6 +31,8 @@ import           Development.IDE.Core.PositionMapping (PositionMapping,
                                                        fromCurrentPosition,
                                                        toCurrentRange)
 import           Development.IDE.Types.Logger         (Pretty (..))
+import qualified Development.IDE.GHC.ExactPrint       as E
+import           Development.IDE.Plugin.CodeAction
 import           Ide.Plugin.CodeRange.Rules           (CodeRange (..),
                                                        GetCodeRange (..),
                                                        codeRangeRule)
@@ -55,7 +57,7 @@ import           Language.LSP.Types                   (List (List),
 import           Prelude                              hiding (log, span)
 
 descriptor :: Recorder (WithPriority Log) -> PluginId -> PluginDescriptor IdeState
-descriptor recorder plId = (defaultPluginDescriptor plId)
+descriptor recorder plId = mkExactprintPluginDescriptor (cmapWithPrio LogExactPrint recorder) $ (defaultPluginDescriptor plId)
     { pluginHandlers = mkPluginHandler STextDocumentSelectionRange selectionRangeHandler
     -- TODO @sloorush add folding range
     -- <> mkPluginHandler STextDocumentFoldingRange foldingRangeHandler
@@ -63,10 +65,12 @@ descriptor recorder plId = (defaultPluginDescriptor plId)
     }
 
 data Log = LogRules Rules.Log
+         | LogExactPrint E.Log
 
 instance Pretty Log where
     pretty log = case log of
         LogRules codeRangeLog -> pretty codeRangeLog
+        LogExactPrint exactPrintLog -> pretty exactPrintLog
 
 selectionRangeHandler :: IdeState -> PluginId -> SelectionRangeParams -> LspM c (Either ResponseError (List SelectionRange))
 selectionRangeHandler ide _ SelectionRangeParams{..} = do
diff --git a/plugins/hls-code-range-plugin/src/Ide/Plugin/CodeRange/Rules.hs b/plugins/hls-code-range-plugin/src/Ide/Plugin/CodeRange/Rules.hs
index 8a573d9ebb9..fcd96ffea12 100644
--- a/plugins/hls-code-range-plugin/src/Ide/Plugin/CodeRange/Rules.hs
+++ b/plugins/hls-code-range-plugin/src/Ide/Plugin/CodeRange/Rules.hs
@@ -44,7 +44,8 @@ import qualified Data.Vector                        as V
 import           Development.IDE
 import           Development.IDE.Core.Rules         (toIdeResult)
 import qualified Development.IDE.Core.Shake         as Shake
-import           Development.IDE.GHC.Compat         (Annotated, HieAST (..),
+import           Development.IDE.GHC.Compat.ExactPrint (Annotated)
+import           Development.IDE.GHC.Compat         (HieAST (..),
                                                      HieASTs (getAsts),
                                                      ParsedSource, RefMap)
 import           Development.IDE.GHC.Compat.Util
diff --git a/plugins/hls-eval-plugin/hls-eval-plugin.cabal b/plugins/hls-eval-plugin/hls-eval-plugin.cabal
index 676e0bf7328..a016aade1e8 100644
--- a/plugins/hls-eval-plugin/hls-eval-plugin.cabal
+++ b/plugins/hls-eval-plugin/hls-eval-plugin.cabal
@@ -37,6 +37,10 @@ source-repository head
   location: https://github.com/haskell/haskell-language-server
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:
     Ide.Plugin.Eval
     Ide.Plugin.Eval.Types
@@ -97,6 +101,10 @@ library
     TypeOperators
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-explicit-fixity-plugin/hls-explicit-fixity-plugin.cabal b/plugins/hls-explicit-fixity-plugin/hls-explicit-fixity-plugin.cabal
index 087c1466b6f..dc865f2c12c 100644
--- a/plugins/hls-explicit-fixity-plugin/hls-explicit-fixity-plugin.cabal
+++ b/plugins/hls-explicit-fixity-plugin/hls-explicit-fixity-plugin.cabal
@@ -16,6 +16,10 @@ extra-source-files:
   test/testdata/*.hs
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:    Ide.Plugin.ExplicitFixity
 
   hs-source-dirs:     src
@@ -39,6 +43,10 @@ library
   default-extensions: DataKinds
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal b/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal
index f94922fd15c..fb73ff894f7 100644
--- a/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal
+++ b/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal
@@ -16,6 +16,10 @@ extra-source-files:
   test/testdata/*.yaml
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:    Ide.Plugin.ExplicitImports
   hs-source-dirs:     src
   build-depends:
@@ -37,6 +41,10 @@ library
     TypeOperators
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-floskell-plugin/hls-floskell-plugin.cabal b/plugins/hls-floskell-plugin/hls-floskell-plugin.cabal
index 8416ccbc775..e13fa98e4aa 100644
--- a/plugins/hls-floskell-plugin/hls-floskell-plugin.cabal
+++ b/plugins/hls-floskell-plugin/hls-floskell-plugin.cabal
@@ -17,6 +17,10 @@ extra-source-files:
   test/testdata/**/*.hs
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:  Ide.Plugin.Floskell
   hs-source-dirs:   src
   build-depends:
@@ -31,6 +35,10 @@ library
   default-language: Haskell2010
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal
index bb4e0b687a4..e84cdccf7ae 100644
--- a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal
+++ b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal
@@ -23,6 +23,10 @@ source-repository head
   location: git://github.com/haskell/haskell-language-server.git
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:
       Ide.Plugin.Fourmolu
     , Ide.Plugin.Fourmolu.Shim
@@ -44,6 +48,10 @@ library
   default-language: Haskell2010
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-gadt-plugin/hls-gadt-plugin.cabal b/plugins/hls-gadt-plugin/hls-gadt-plugin.cabal
index 23fac32e331..47ff630eed1 100644
--- a/plugins/hls-gadt-plugin/hls-gadt-plugin.cabal
+++ b/plugins/hls-gadt-plugin/hls-gadt-plugin.cabal
@@ -16,6 +16,10 @@ extra-source-files:
   test/testdata/*.hs
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:    Ide.Plugin.GADT
   other-modules:      Ide.Plugin.GHC
 
@@ -30,6 +34,7 @@ library
     , ghc-boot-th
     , ghc-exactprint
     , hls-plugin-api        ^>= 1.4
+    , hls-refactor-plugin
     , lens
     , lsp                    >=1.2.0.1
     , mtl
@@ -45,6 +50,10 @@ library
   default-extensions: DataKinds
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-gadt-plugin/src/Ide/Plugin/GHC.hs b/plugins/hls-gadt-plugin/src/Ide/Plugin/GHC.hs
index 1a59ec20890..fe4ea1876ce 100644
--- a/plugins/hls-gadt-plugin/src/Ide/Plugin/GHC.hs
+++ b/plugins/hls-gadt-plugin/src/Ide/Plugin/GHC.hs
@@ -16,6 +16,7 @@ import           Data.List.Extra                         (stripInfix)
 import qualified Data.Text                               as T
 import           Development.IDE
 import           Development.IDE.GHC.Compat
+import           Development.IDE.GHC.Compat.ExactPrint
 import           Ide.PluginUtils                         (subRange)
 import           Language.Haskell.GHC.ExactPrint.Parsers (parseDecl)
 
diff --git a/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal b/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal
index 9acc5e916c4..6de352816b8 100644
--- a/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal
+++ b/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal
@@ -35,6 +35,7 @@ library
     , ghc-exactprint        < 1
     , ghcide                ^>=1.6 || ^>=1.7
     , hls-plugin-api        ^>=1.3 || ^>=1.4
+    , hls-refactor-plugin
     , lsp-types
     , text
     , unordered-containers
diff --git a/plugins/hls-haddock-comments-plugin/src/Ide/Plugin/HaddockComments.hs b/plugins/hls-haddock-comments-plugin/src/Ide/Plugin/HaddockComments.hs
index 4b162ac5747..29932198937 100644
--- a/plugins/hls-haddock-comments-plugin/src/Ide/Plugin/HaddockComments.hs
+++ b/plugins/hls-haddock-comments-plugin/src/Ide/Plugin/HaddockComments.hs
@@ -15,7 +15,10 @@ import qualified Data.Map                              as Map
 import qualified Data.Text                             as T
 import           Development.IDE                       hiding (pluginHandlers)
 import           Development.IDE.GHC.Compat
+import           Development.IDE.Plugin.CodeAction
+import           Development.IDE.GHC.Compat.ExactPrint
 import           Development.IDE.GHC.ExactPrint        (GetAnnotatedParsedSource (..))
+import qualified Development.IDE.GHC.ExactPrint                   as E
 import           Ide.Types
 import           Language.Haskell.GHC.ExactPrint
 import           Language.Haskell.GHC.ExactPrint.Types hiding (GhcPs)
@@ -23,8 +26,8 @@ import           Language.Haskell.GHC.ExactPrint.Utils
 import           Language.LSP.Types
 
 -----------------------------------------------------------------------------
-descriptor :: PluginId -> PluginDescriptor IdeState
-descriptor plId =
+descriptor :: Recorder (WithPriority E.Log) -> PluginId -> PluginDescriptor IdeState
+descriptor recorder plId = mkExactprintPluginDescriptor recorder $
   (defaultPluginDescriptor plId)
     { pluginHandlers = mkPluginHandler STextDocumentCodeAction codeActionProvider
     }
diff --git a/plugins/hls-haddock-comments-plugin/test/Main.hs b/plugins/hls-haddock-comments-plugin/test/Main.hs
index 3eadb934162..22189c25904 100644
--- a/plugins/hls-haddock-comments-plugin/test/Main.hs
+++ b/plugins/hls-haddock-comments-plugin/test/Main.hs
@@ -19,7 +19,7 @@ main :: IO ()
 main = defaultTestRunner tests
 
 haddockCommentsPlugin :: PluginDescriptor IdeState
-haddockCommentsPlugin = HaddockComments.descriptor "haddockComments"
+haddockCommentsPlugin = HaddockComments.descriptor mempty "haddockComments"
 
 tests :: TestTree
 tests =
diff --git a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal
index 82f60839e63..5fca22d6e0f 100644
--- a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal
+++ b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal
@@ -26,6 +26,10 @@ flag pedantic
   manual:      True
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:    Ide.Plugin.Hlint
   hs-source-dirs:     src
   build-depends:
@@ -73,6 +77,10 @@ library
     TypeOperators
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-module-name-plugin/hls-module-name-plugin.cabal b/plugins/hls-module-name-plugin/hls-module-name-plugin.cabal
index 1290ab75bf7..08c17e23499 100644
--- a/plugins/hls-module-name-plugin/hls-module-name-plugin.cabal
+++ b/plugins/hls-module-name-plugin/hls-module-name-plugin.cabal
@@ -20,6 +20,10 @@ extra-source-files:
   test/testdata/**/*.project
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:  Ide.Plugin.ModuleName
   hs-source-dirs:   src
   build-depends:
@@ -37,6 +41,10 @@ library
   default-language: Haskell2010
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal b/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal
index 67abe1c0909..49bfb4959ba 100644
--- a/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal
+++ b/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal
@@ -17,6 +17,10 @@ extra-source-files:
   test/testdata/**/*.hs
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:  Ide.Plugin.Ormolu
   hs-source-dirs:   src
   build-depends:
@@ -34,6 +38,10 @@ library
   default-language: Haskell2010
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-pragmas-plugin/hls-pragmas-plugin.cabal b/plugins/hls-pragmas-plugin/hls-pragmas-plugin.cabal
index ba29d7a1cce..76f64083bda 100644
--- a/plugins/hls-pragmas-plugin/hls-pragmas-plugin.cabal
+++ b/plugins/hls-pragmas-plugin/hls-pragmas-plugin.cabal
@@ -18,6 +18,10 @@ extra-source-files:
   test/testdata/*.yaml
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:  Ide.Plugin.Pragmas
   hs-source-dirs:   src
   build-depends:
@@ -37,6 +41,10 @@ library
   default-language: Haskell2010
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-qualify-imported-names-plugin/hls-qualify-imported-names-plugin.cabal b/plugins/hls-qualify-imported-names-plugin/hls-qualify-imported-names-plugin.cabal
index 2ba2a6da919..8990e05f096 100644
--- a/plugins/hls-qualify-imported-names-plugin/hls-qualify-imported-names-plugin.cabal
+++ b/plugins/hls-qualify-imported-names-plugin/hls-qualify-imported-names-plugin.cabal
@@ -18,6 +18,10 @@ extra-source-files:
   test/data/*.yaml
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:    Ide.Plugin.QualifyImportedNames
   hs-source-dirs:     src
   build-depends:
@@ -41,6 +45,10 @@ library
     TypeOperators
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-refactor-plugin/LICENSE b/plugins/hls-refactor-plugin/LICENSE
new file mode 100644
index 00000000000..261eeb9e9f8
--- /dev/null
+++ b/plugins/hls-refactor-plugin/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/plugins/hls-refactor-plugin/hls-refactor-plugin.cabal b/plugins/hls-refactor-plugin/hls-refactor-plugin.cabal
new file mode 100644
index 00000000000..d848e77bbb6
--- /dev/null
+++ b/plugins/hls-refactor-plugin/hls-refactor-plugin.cabal
@@ -0,0 +1,124 @@
+cabal-version:      3.0
+name:               hls-refactor-plugin
+version:            1.0.0.0
+synopsis:           Exactprint refactorings for Haskell Language Server
+description:
+  Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
+
+license:            Apache-2.0
+license-file:       LICENSE
+author:             The Haskell IDE Team
+copyright:          The Haskell IDE Team
+maintainer:         zubin.duggal@gmail.com
+category:           Development
+build-type:         Simple
+extra-source-files:
+  LICENSE
+  test/data/**/*.hs
+  test/data/**/*.yaml
+
+library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
+  exposed-modules:  Development.IDE.GHC.ExactPrint
+                    Development.IDE.GHC.Compat.ExactPrint
+                    Development.IDE.Plugin.CodeAction
+                    Development.IDE.Plugin.CodeAction.Util
+                    Development.IDE.GHC.Dump
+  other-modules:    Development.IDE.Plugin.CodeAction.Args
+                    Development.IDE.Plugin.CodeAction.ExactPrint
+                    Development.IDE.Plugin.CodeAction.PositionIndexed
+  default-extensions:
+    BangPatterns
+    CPP
+    DataKinds
+    DeriveGeneric
+    DerivingStrategies
+    DerivingVia
+    DuplicateRecordFields
+    ExplicitNamespaces
+    FlexibleContexts
+    FlexibleInstances
+    FunctionalDependencies
+    GeneralizedNewtypeDeriving
+    LambdaCase
+    NamedFieldPuns
+    OverloadedStrings
+    PatternSynonyms
+    RankNTypes
+    RecordWildCards
+    ScopedTypeVariables
+    TupleSections
+    TypeApplications
+    TypeOperators
+    ViewPatterns
+  hs-source-dirs:   src
+  build-depends:
+    , aeson
+    , base                  >=4.12 && <5
+    , ghc
+    , bytestring
+    , ghc-boot
+    , regex-tdfa
+    , text-rope
+    , ghcide                ^>=1.7
+    , hls-plugin-api        ^>=1.3 || ^>=1.4
+    , lsp
+    , text
+    , transformers
+    , unordered-containers
+    , containers
+    , ghc-exactprint < 1 || >= 1.4
+    , extra
+    , retrie
+    , syb
+    , hls-graph
+    , dlist
+    , deepseq
+    , mtl
+    , lens
+    , data-default
+    , time
+  ghc-options: -Wall -Wno-name-shadowing
+  default-language: Haskell2010
+
+test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
+  type:             exitcode-stdio-1.0
+  default-language: Haskell2010
+  hs-source-dirs:   test
+  main-is:          Main.hs
+  ghc-options:      -O0 -threaded -rtsopts -with-rtsopts=-N -Wunused-imports
+  build-depends:
+    , base
+    , filepath
+    , hls-refactor-plugin
+    , hls-test-utils      ^>=1.3
+    , lens
+    , lsp-types
+    , text
+    , aeson
+    , hls-plugin-api
+    , parser-combinators
+    , data-default
+    , extra
+    , text-rope
+    , containers
+    , ghcide
+    , ghcide-test-utils
+    , shake
+    , hls-plugin-api
+    , lsp-test
+    , network-uri
+    , directory
+    , async
+    , regex-tdfa
+    , tasty-rerun
+    , tasty-hunit
+    , tasty-expected-failure
+    , tasty
diff --git a/ghcide/src/Development/IDE/GHC/Compat/ExactPrint.hs b/plugins/hls-refactor-plugin/src/Development/IDE/GHC/Compat/ExactPrint.hs
similarity index 91%
rename from ghcide/src/Development/IDE/GHC/Compat/ExactPrint.hs
rename to plugins/hls-refactor-plugin/src/Development/IDE/GHC/Compat/ExactPrint.hs
index a071ef46066..28e34ba3797 100644
--- a/ghcide/src/Development/IDE/GHC/Compat/ExactPrint.hs
+++ b/plugins/hls-refactor-plugin/src/Development/IDE/GHC/Compat/ExactPrint.hs
@@ -1,11 +1,10 @@
-{-# LANGUAGE CPP               #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE PatternSynonyms   #-}
-
 -- | This module contains compatibility constructs to write type signatures across
 --   multiple ghc-exactprint versions, accepting that anything more ambitious is
 --   pretty much impossible with the GHC 9.2 redesign of ghc-exactprint
 module Development.IDE.GHC.Compat.ExactPrint
+#if MIN_VERSION_ghc(9,3,0)
+    ( ) where
+#else
     ( ExactPrint
     , exactPrint
     , makeDeltaAst
@@ -35,3 +34,5 @@ pattern Annotated {astA, annsA} <- (Retrie.astA &&& Retrie.annsA -> (astA, annsA
 pattern Annotated :: ast -> ApiAnns -> Retrie.Annotated ast
 pattern Annotated {astA, annsA} <- ((,()) . Retrie.astA -> (astA, annsA))
 #endif
+
+#endif
diff --git a/ghcide/src/Development/IDE/GHC/Dump.hs b/plugins/hls-refactor-plugin/src/Development/IDE/GHC/Dump.hs
similarity index 97%
rename from ghcide/src/Development/IDE/GHC/Dump.hs
rename to plugins/hls-refactor-plugin/src/Development/IDE/GHC/Dump.hs
index a81d6e12158..cde3f79c48f 100644
--- a/ghcide/src/Development/IDE/GHC/Dump.hs
+++ b/plugins/hls-refactor-plugin/src/Development/IDE/GHC/Dump.hs
@@ -2,6 +2,7 @@
 module Development.IDE.GHC.Dump(showAstDataHtml) where
 import           Data.Data                       hiding (Fixity)
 import           Development.IDE.GHC.Compat      hiding (NameAnn)
+import           Development.IDE.GHC.Compat.ExactPrint
 #if MIN_VERSION_ghc(8,10,1)
 import           GHC.Hs.Dump
 #else
@@ -35,7 +36,11 @@ showAstDataHtml a0 = html $
             li (showAstDataHtml' a0),
             li (nested "Raw" $ pre $ showAstData NoBlankSrcSpan NoBlankEpAnnotations a0)
 #else
-            li (nested "Raw" $ pre $ showAstData NoBlankSrcSpan a0)
+            li (nested "Raw" $ pre $ showAstData NoBlankSrcSpan
+#if MIN_VERSION_ghc(9,3,0)
+                                                 NoBlankEpAnnotations
+#endif
+                                                 a0)
 #endif
         ])
   where
@@ -48,7 +53,7 @@ showAstDataHtml a0 = html $
     li = tag "li"
     caret x = tag' [("class", text "caret")] "span" "" <+> x
     nested foo cts
-#if MIN_VERSION_ghc(9,2,1)
+#if MIN_VERSION_ghc(9,2,1) && !MIN_VERSION_ghc(9,3,0)
       | cts == empty = foo
 #endif
       | otherwise = foo $$ (caret $ ul cts)
diff --git a/ghcide/src/Development/IDE/GHC/ExactPrint.hs b/plugins/hls-refactor-plugin/src/Development/IDE/GHC/ExactPrint.hs
similarity index 98%
rename from ghcide/src/Development/IDE/GHC/ExactPrint.hs
rename to plugins/hls-refactor-plugin/src/Development/IDE/GHC/ExactPrint.hs
index f7a67d75bce..d56b513a79c 100644
--- a/ghcide/src/Development/IDE/GHC/ExactPrint.hs
+++ b/plugins/hls-refactor-plugin/src/Development/IDE/GHC/ExactPrint.hs
@@ -1,13 +1,11 @@
-{-# LANGUAGE CPP                    #-}
-{-# LANGUAGE DerivingVia            #-}
-{-# LANGUAGE FlexibleInstances      #-}
-{-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE GADTs                  #-}
-{-# LANGUAGE RankNTypes             #-}
-{-# LANGUAGE TypeFamilies           #-}
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE GADTs        #-}
 
 -- | This module hosts various abstractions and utility functions to work with ghc-exactprint.
 module Development.IDE.GHC.ExactPrint
+#if MIN_VERSION_ghc(9,3,0)
+   (  ) where
+#else
     ( Graft(..),
       graftDecls,
       graftDeclsWithM,
@@ -49,6 +47,7 @@ where
 
 import           Control.Applicative                     (Alternative)
 import           Control.Arrow                           (right, (***))
+import           Control.DeepSeq
 import           Control.Monad
 import qualified Control.Monad.Fail                      as Fail
 import           Control.Monad.IO.Class                  (MonadIO)
@@ -72,6 +71,7 @@ import qualified Development.IDE.Core.Shake              as Shake
 import           Development.IDE.GHC.Compat              hiding (parseImport,
                                                           parsePattern,
                                                           parseType)
+import           Development.IDE.GHC.Compat.ExactPrint
 import           Development.IDE.Graph                   (RuleResult, Rules)
 import           Development.IDE.Graph.Classes
 import           Development.IDE.Types.Location
@@ -112,6 +112,12 @@ instance Pretty Log where
   pretty = \case
     LogShake shakeLog -> pretty shakeLog
 
+instance Show (Annotated ParsedSource) where
+  show _ = "<Annotated ParsedSource>"
+ 
+instance NFData (Annotated ParsedSource) where
+  rnf = rwhnf
+ 
 data GetAnnotatedParsedSource = GetAnnotatedParsedSource
   deriving (Eq, Show, Typeable, GHC.Generic)
 
@@ -662,3 +668,5 @@ isCommaAnn :: TrailingAnn -> Bool
 isCommaAnn AddCommaAnn{} = True
 isCommaAnn _             = False
 #endif
+
+#endif
diff --git a/ghcide/src/Development/IDE/Plugin/CodeAction.hs b/plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction.hs
similarity index 93%
rename from ghcide/src/Development/IDE/Plugin/CodeAction.hs
rename to plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction.hs
index 35f89ac108a..01c3b555c1c 100644
--- a/ghcide/src/Development/IDE/Plugin/CodeAction.hs
+++ b/plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction.hs
@@ -1,20 +1,17 @@
 -- Copyright (c) 2019 The DAML Authors. All rights reserved.
 -- SPDX-License-Identifier: Apache-2.0
-
-{-# LANGUAGE CPP                   #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE GADTs                 #-}
+{-# LANGUAGE GADTs #-}
 
 module Development.IDE.Plugin.CodeAction
     (
+    mkExactprintPluginDescriptor,
     iePluginDescriptor,
     typeSigsPluginDescriptor,
     bindingsPluginDescriptor,
     fillHolePluginDescriptor,
-    newImport,
-    newImportToEdit
+    extendImportPluginDescriptor,
     -- * For testing
-    , matchRegExMultipleImports
+    matchRegExMultipleImports
     ) where
 
 import           Control.Applicative                               ((<|>))
@@ -22,8 +19,10 @@ import           Control.Arrow                                     (second,
                                                                     (&&&),
                                                                     (>>>))
 import           Control.Concurrent.STM.Stats                      (atomically)
-import           Control.Monad                                     (guard, join)
 import           Control.Monad.IO.Class
+import           Control.Monad.Trans.Maybe
+import           Control.Monad.Extra
+import           Data.Aeson
 import           Data.Char
 import qualified Data.DList                                        as DL
 import           Data.Function
@@ -40,18 +39,24 @@ import qualified Data.Set                                          as S
 import qualified Data.Text                                         as T
 import qualified Data.Text.Utf16.Rope                              as Rope
 import           Data.Tuple.Extra                                  (fst3)
+import           Development.IDE.Types.Logger                      hiding (group)
 import           Development.IDE.Core.Rules
 import           Development.IDE.Core.RuleTypes
 import           Development.IDE.Core.Service
 import           Development.IDE.GHC.Compat
+import           Development.IDE.GHC.Compat.ExactPrint
 import           Development.IDE.GHC.Compat.Util
 import           Development.IDE.GHC.Error
+import           Development.IDE.GHC.ExactPrint
+import qualified Development.IDE.GHC.ExactPrint                   as E
 import           Development.IDE.GHC.Util                          (printOutputable,
-                                                                    printRdrName,
-                                                                    traceAst)
+                                                                    printRdrName)
+import           Development.IDE.Core.Shake                   hiding (Log)
 import           Development.IDE.Plugin.CodeAction.Args
 import           Development.IDE.Plugin.CodeAction.ExactPrint
+import           Development.IDE.Plugin.CodeAction.Util
 import           Development.IDE.Plugin.CodeAction.PositionIndexed
+import           Development.IDE.Plugin.Completions.Types
 import           Development.IDE.Plugin.TypeLenses                 (suggestSignature)
 import           Development.IDE.Types.Exports
 import           Development.IDE.Types.Location
@@ -60,21 +65,24 @@ import qualified GHC.LanguageExtensions                            as Lang
 import           Ide.PluginUtils                                   (subRange)
 import           Ide.Types
 import qualified Language.LSP.Server                               as LSP
-import           Language.LSP.Types                                (CodeAction (..),
+import           Language.LSP.Types                                (ApplyWorkspaceEditParams(..), CodeAction (..),
                                                                     CodeActionContext (CodeActionContext, _diagnostics),
                                                                     CodeActionKind (CodeActionQuickFix, CodeActionUnknown),
                                                                     CodeActionParams (CodeActionParams),
                                                                     Command,
                                                                     Diagnostic (..),
+                                                                    MessageType (..),
+                                                                    ShowMessageParams (..),
                                                                     List (..),
                                                                     ResponseError,
-                                                                    SMethod (STextDocumentCodeAction),
+                                                                    SMethod (..),
                                                                     TextDocumentIdentifier (TextDocumentIdentifier),
-                                                                    TextEdit (TextEdit),
+                                                                    TextEdit (TextEdit, _range),
                                                                     UInt,
                                                                     WorkspaceEdit (WorkspaceEdit, _changeAnnotations, _changes, _documentChanges),
                                                                     type (|?) (InR),
                                                                     uriToFilePath)
+import           GHC.Exts                                           (fromList)
 import           Language.LSP.VFS                                  (VirtualFile,
                                                                     _file_text)
 import           Text.Regex.TDFA                                   (mrAfter,
@@ -90,7 +98,6 @@ import           GHC                                               (AddEpAnn (Ad
                                                                     LEpaComment,
                                                                     LocatedA)
 
-import           Control.Monad                                     (msum)
 #else
 import           Language.Haskell.GHC.ExactPrint.Types             (Annotation (annsDP),
                                                                     DeltaPos,
@@ -121,43 +128,138 @@ codeAction state _ (CodeActionParams _ _ (TextDocumentIdentifier uri) _range Cod
 
 -------------------------------------------------------------------------------------------------
 
-iePluginDescriptor :: PluginId -> PluginDescriptor IdeState
-iePluginDescriptor plId =
+iePluginDescriptor :: Recorder (WithPriority E.Log) -> PluginId -> PluginDescriptor IdeState
+iePluginDescriptor recorder plId =
   let old =
         mkGhcideCAsPlugin [
-            wrap suggestExtendImport
-          , wrap suggestImportDisambiguation
-          , wrap suggestNewOrExtendImportForClassMethod
-          , wrap suggestNewImport
+            wrap suggestExportUnusedTopBinding
           , wrap suggestModuleTypo
           , wrap suggestFixConstructorImport
+          , wrap suggestNewImport
+#if !MIN_VERSION_ghc(9,3,0)
+          , wrap suggestExtendImport
+          , wrap suggestImportDisambiguation
+          , wrap suggestNewOrExtendImportForClassMethod
           , wrap suggestHideShadow
-          , wrap suggestExportUnusedTopBinding
+#endif
           ]
           plId
-   in old {pluginHandlers = pluginHandlers old <> mkPluginHandler STextDocumentCodeAction codeAction}
+   in mkExactprintPluginDescriptor recorder $ old {pluginHandlers = pluginHandlers old <> mkPluginHandler STextDocumentCodeAction codeAction }
 
-typeSigsPluginDescriptor :: PluginId -> PluginDescriptor IdeState
-typeSigsPluginDescriptor =
+typeSigsPluginDescriptor :: Recorder (WithPriority E.Log) -> PluginId -> PluginDescriptor IdeState
+typeSigsPluginDescriptor recorder plId = mkExactprintPluginDescriptor recorder $
   mkGhcideCAsPlugin [
       wrap $ suggestSignature True
     , wrap suggestFillTypeWildcard
-    , wrap removeRedundantConstraints
     , wrap suggestAddTypeAnnotationToSatisfyContraints
+#if !MIN_VERSION_ghc(9,3,0)
+    , wrap removeRedundantConstraints
     , wrap suggestConstraint
+#endif
     ]
+    plId
 
-bindingsPluginDescriptor :: PluginId -> PluginDescriptor IdeState
-bindingsPluginDescriptor =
+bindingsPluginDescriptor :: Recorder (WithPriority E.Log) ->  PluginId -> PluginDescriptor IdeState
+bindingsPluginDescriptor recorder plId = mkExactprintPluginDescriptor recorder $
   mkGhcideCAsPlugin [
       wrap suggestReplaceIdentifier
+#if !MIN_VERSION_ghc(9,3,0)
     , wrap suggestImplicitParameter
+#endif
     , wrap suggestNewDefinition
     , wrap suggestDeleteUnusedBinding
     ]
+    plId
+
+fillHolePluginDescriptor :: Recorder (WithPriority E.Log) -> PluginId -> PluginDescriptor IdeState
+fillHolePluginDescriptor recorder plId = mkExactprintPluginDescriptor recorder (mkGhcideCAPlugin (wrap suggestFillHole) plId)
 
-fillHolePluginDescriptor :: PluginId -> PluginDescriptor IdeState
-fillHolePluginDescriptor = mkGhcideCAPlugin $ wrap suggestFillHole
+extendImportPluginDescriptor :: Recorder (WithPriority E.Log) -> PluginId -> PluginDescriptor IdeState
+extendImportPluginDescriptor recorder plId = mkExactprintPluginDescriptor recorder $ (defaultPluginDescriptor plId)
+  { pluginCommands = [extendImportCommand] }
+
+
+-- | Add the ability for a plugin to call GetAnnotatedParsedSource
+mkExactprintPluginDescriptor :: Recorder (WithPriority E.Log) -> PluginDescriptor a -> PluginDescriptor a
+mkExactprintPluginDescriptor recorder desc = desc { pluginRules = pluginRules desc >> getAnnotatedParsedSourceRule recorder }
+
+-------------------------------------------------------------------------------------------------
+
+
+extendImportCommand :: PluginCommand IdeState
+extendImportCommand =
+  PluginCommand (CommandId extendImportCommandId) "additional edits for a completion" extendImportHandler
+
+extendImportHandler :: CommandFunction IdeState ExtendImport
+extendImportHandler ideState edit@ExtendImport {..} = do
+  res <- liftIO $ runMaybeT $ extendImportHandler' ideState edit
+  whenJust res $ \(nfp, wedit@WorkspaceEdit {_changes}) -> do
+    let (_, List (head -> TextEdit {_range})) = fromJust $ _changes >>= listToMaybe . Map.toList
+        srcSpan = rangeToSrcSpan nfp _range
+    LSP.sendNotification SWindowShowMessage $
+      ShowMessageParams MtInfo $
+        "Import "
+          <> maybe ("‘" <> newThing) (\x -> "‘" <> x <> " (" <> newThing <> ")") thingParent
+          <> "’ from "
+          <> importName
+          <> " (at "
+          <> printOutputable srcSpan
+          <> ")"
+    void $ LSP.sendRequest SWorkspaceApplyEdit (ApplyWorkspaceEditParams Nothing wedit) (\_ -> pure ())
+  return $ Right Null
+
+extendImportHandler' :: IdeState -> ExtendImport -> MaybeT IO (NormalizedFilePath, WorkspaceEdit)
+extendImportHandler' ideState ExtendImport {..}
+  | Just fp <- uriToFilePath doc,
+    nfp <- toNormalizedFilePath' fp =
+    do
+      (ModSummaryResult {..}, ps, contents) <- MaybeT $ liftIO $
+        runAction "extend import" ideState $
+          runMaybeT $ do
+            -- We want accurate edits, so do not use stale data here
+            msr <- MaybeT $ use GetModSummaryWithoutTimestamps nfp
+            ps <- MaybeT $ use GetAnnotatedParsedSource nfp
+            (_, contents) <- MaybeT $ use GetFileContents nfp
+            return (msr, ps, contents)
+      let df = ms_hspp_opts msrModSummary
+          wantedModule = mkModuleName (T.unpack importName)
+          wantedQual = mkModuleName . T.unpack <$> importQual
+          existingImport = find (isWantedModule wantedModule wantedQual) msrImports
+      case existingImport of
+        Just imp -> do
+            fmap (nfp,) $ liftEither $
+              rewriteToWEdit df doc
+#if !MIN_VERSION_ghc(9,2,0)
+                (annsA ps)
+#endif
+                $
+                  extendImport (T.unpack <$> thingParent) (T.unpack newThing) (makeDeltaAst imp)
+
+        Nothing -> do
+            let n = newImport importName sym importQual False
+                sym = if isNothing importQual then Just it else Nothing
+                it = case thingParent of
+                  Nothing -> newThing
+                  Just p  -> p <> "(" <> newThing <> ")"
+            t <- liftMaybe $ snd <$> newImportToEdit n ps (fromMaybe "" contents)
+            return (nfp, WorkspaceEdit {_changes=Just (fromList [(doc,List [t])]), _documentChanges=Nothing, _changeAnnotations=Nothing})
+  | otherwise =
+    mzero
+
+isWantedModule :: ModuleName -> Maybe ModuleName -> GenLocated l (ImportDecl GhcPs) -> Bool
+isWantedModule wantedModule Nothing (L _ it@ImportDecl{ideclName, ideclHiding = Just (False, _)}) =
+    not (isQualifiedImport it) && unLoc ideclName == wantedModule
+isWantedModule wantedModule (Just qual) (L _ ImportDecl{ideclAs, ideclName, ideclHiding = Just (False, _)}) =
+    unLoc ideclName == wantedModule && (wantedModule == qual || (unLoc . reLoc <$> ideclAs) == Just qual)
+isWantedModule _ _ _ = False
+
+
+liftMaybe :: Monad m => Maybe a -> MaybeT m a
+liftMaybe a = MaybeT $ pure a
+
+liftEither :: Monad m => Either e a -> MaybeT m a
+liftEither (Left _)  = mzero
+liftEither (Right x) = return x
 
 -------------------------------------------------------------------------------------------------
 
@@ -200,7 +302,11 @@ findSigOfBind range bind =
       msum
         [findSigOfBinds range (grhssLocalBinds grhs) -- where clause
         , do
+#if MIN_VERSION_ghc(9,3,0)
+          grhs <- findDeclContainingLoc (_start range) (grhssGRHSs grhs)
+#else
           grhs <- findDeclContainingLoc (_start range) (map reLocA $ grhssGRHSs grhs)
+#endif
           case unLoc grhs of
             GRHS _ _ bd -> findSigOfExpr (unLoc bd)
         ]
@@ -209,7 +315,11 @@ findSigOfBind range bind =
     findSigOfExpr :: HsExpr p -> Maybe (Sig p)
     findSigOfExpr = go
       where
+#if MIN_VERSION_ghc(9,3,0)
+        go (HsLet _ _ binds _ _) = findSigOfBinds range binds
+#else
         go (HsLet _ binds _) = findSigOfBinds range binds
+#endif
         go (HsDo _ _ stmts) = do
           stmtlr <- unLoc <$> findDeclContainingLoc (_start range) (unLoc stmts)
           case stmtlr of
@@ -259,6 +369,7 @@ findDeclContainingLoc loc = find (\(L l _) -> loc `isInsideSrcSpan` locA l)
 --  imported from ‘Data.ByteString’ at B.hs:6:1-22
 --  imported from ‘Data.ByteString.Lazy’ at B.hs:8:1-27
 --  imported from ‘Data.Text’ at B.hs:7:1-16
+#if !MIN_VERSION_ghc(9,3,0)
 suggestHideShadow :: Annotated ParsedSource -> T.Text -> Maybe TcModuleResult -> Maybe HieAstResult -> Diagnostic -> [(T.Text, [Either TextEdit Rewrite])]
 suggestHideShadow ps fileContents mTcM mHar Diagnostic {_message, _range}
   | Just [identifier, modName, s] <-
@@ -278,7 +389,7 @@ suggestHideShadow ps fileContents mTcM mHar Diagnostic {_message, _range}
   | otherwise = []
   where
     L _ HsModule {hsmodImports} = astA ps
-
+ 
     suggests identifier modName s
       | Just tcM <- mTcM,
         Just har <- mHar,
@@ -290,6 +401,7 @@ suggestHideShadow ps fileContents mTcM mHar Diagnostic {_message, _range}
           then maybeToList $ (\(_, te) -> (title, [Left te])) <$> newImportToEdit (hideImplicitPreludeSymbol identifier) ps fileContents
           else maybeToList $ (title,) . pure . pure . hideSymbol (T.unpack identifier) <$> mDecl
       | otherwise = []
+#endif
 
 findImportDeclByModuleName :: [LImportDecl GhcPs] -> String -> Maybe (LImportDecl GhcPs)
 findImportDeclByModuleName decls modName = flip find decls $ \case
@@ -882,6 +994,7 @@ getIndentedGroupsBy pred inp = case dropWhile (not.pred) inp of
 indentation :: T.Text -> Int
 indentation = T.length . T.takeWhile isSpace
 
+#if !MIN_VERSION_ghc(9,3,0)
 suggestExtendImport :: ExportsMap -> ParsedSource -> Diagnostic -> [(T.Text, CodeActionKind, Rewrite)]
 suggestExtendImport exportsMap (L _ HsModule {hsmodImports}) Diagnostic{_range=_range,..}
     | Just [binding, mod, srcspan] <-
@@ -929,6 +1042,7 @@ suggestExtendImport exportsMap (L _ HsModule {hsmodImports}) Diagnostic{_range=_
                 , parent = Nothing
                 , isDatacon = False
                 , moduleNameText = mod}
+#endif
 
 data HidingMode
     = HideOthers [ModuleTarget]
@@ -954,6 +1068,7 @@ oneAndOthers = go
 isPreludeImplicit :: DynFlags -> Bool
 isPreludeImplicit = xopt Lang.ImplicitPrelude
 
+#if !MIN_VERSION_ghc(9,3,0)
 -- | Suggests disambiguation for ambiguous symbols.
 suggestImportDisambiguation ::
     DynFlags ->
@@ -1045,6 +1160,7 @@ suggestImportDisambiguation df (Just txt) ps fileContents diag@Diagnostic {..}
                 <> "."
                 <> symbol
 suggestImportDisambiguation _ _ _ _ _ = []
+#endif
 
 occursUnqualified :: T.Text -> ImportDecl GhcPs -> Bool
 occursUnqualified symbol ImportDecl{..}
@@ -1067,6 +1183,7 @@ targetModuleName (ExistingImp (L _ ImportDecl{..} :| _)) =
 targetModuleName (ExistingImp _) =
     error "Cannot happen!"
 
+#if !MIN_VERSION_ghc(9,3,0)
 disambiguateSymbol ::
     Annotated ParsedSource ->
     T.Text ->
@@ -1099,6 +1216,8 @@ disambiguateSymbol ps fileContents Diagnostic {..} (T.unpack -> symbol) = \case
                     liftParseAST @RdrName df $
                     T.unpack $ printOutputable $ L (mkGeneralSrcSpan  "") rdr
             ]
+#endif
+
 findImportDeclByRange :: [LImportDecl GhcPs] -> Range -> Maybe (LImportDecl GhcPs)
 findImportDeclByRange xs range = find (\(L (locA -> l) _)-> srcSpanToRange l == Just range) xs
 
@@ -1116,6 +1235,7 @@ suggestFixConstructorImport Diagnostic{_range=_range,..}
     in [("Fix import of " <> fixedImport, TextEdit _range fixedImport)]
   | otherwise = []
 
+#if !MIN_VERSION_ghc(9,3,0)
 -- | Suggests a constraint for a declaration for which a constraint is missing.
 suggestConstraint :: DynFlags -> ParsedSource -> Diagnostic -> [(T.Text, Rewrite)]
 suggestConstraint df (makeDeltaAst -> parsedModule) diag@Diagnostic {..}
@@ -1197,10 +1317,12 @@ suggestImplicitParameter (L _ HsModule {hsmodDecls}) Diagnostic {_message, _rang
       [( "Add " <> implicitT <> " to the context of " <> T.pack (printRdrName funId)
         , appendConstraint (T.unpack implicitT) hsib_body)]
   | otherwise = []
+#endif
 
 findTypeSignatureName :: T.Text -> Maybe T.Text
 findTypeSignatureName t = matchRegexUnifySpaces t "([^ ]+) :: " <&> head
 
+#if !MIN_VERSION_ghc(9,3,0)
 -- | Suggests a constraint for a type signature with any number of existing constraints.
 suggestFunctionConstraint :: DynFlags -> ParsedSource -> Diagnostic -> T.Text -> [(T.Text, Rewrite)]
 
@@ -1347,6 +1469,7 @@ suggestNewOrExtendImportForClassMethod packageExportsMap ps fileContents Diagnos
             ]
               <> [(quickFixImportKind "new.all", newImportAll moduleNameText)]
             | otherwise -> []
+#endif
 
 suggestNewImport :: ExportsMap -> Annotated ParsedSource -> T.Text -> Diagnostic -> [(T.Text, CodeActionKind, TextEdit)]
 suggestNewImport packageExportsMap ps fileContents Diagnostic{_message}
diff --git a/ghcide/src/Development/IDE/Plugin/CodeAction/Args.hs b/plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/Args.hs
similarity index 95%
rename from ghcide/src/Development/IDE/Plugin/CodeAction/Args.hs
rename to plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/Args.hs
index 85f100ca665..ef5c7b623af 100644
--- a/ghcide/src/Development/IDE/Plugin/CodeAction/Args.hs
+++ b/plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/Args.hs
@@ -1,6 +1,3 @@
-{-# LANGUAGE CPP               #-}
-{-# LANGUAGE FlexibleInstances #-}
-
 module Development.IDE.Plugin.CodeAction.Args
   ( CodeActionTitle,
     CodeActionPreferred,
@@ -27,9 +24,12 @@ import           Development.IDE                              hiding
                                                               (pluginHandlers)
 import           Development.IDE.Core.Shake
 import           Development.IDE.GHC.Compat
+import           Development.IDE.GHC.Compat.ExactPrint
 import           Development.IDE.GHC.ExactPrint
+#if !MIN_VERSION_ghc(9,3,0)
 import           Development.IDE.Plugin.CodeAction.ExactPrint (Rewrite,
                                                                rewriteToEdit)
+#endif
 import           Development.IDE.Plugin.TypeLenses            (GetGlobalBindingTypeSigs (GetGlobalBindingTypeSigs),
                                                                GlobalBindingTypeSigsResult)
 import           Development.IDE.Spans.LocalBindings          (Bindings)
@@ -72,7 +72,9 @@ runGhcideCodeAction state (CodeActionParams _ _ (TextDocumentIdentifier uri) _ra
         Just (_, txt) -> pure txt
         _             -> pure Nothing
   caaDf <- onceIO $ fmap (ms_hspp_opts . pm_mod_summary) <$> caaParsedModule
+#if !MIN_VERSION_ghc(9,3,0)
   caaAnnSource <- onceIO $ runRule GetAnnotatedParsedSource
+#endif
   caaTmr <- onceIO $ runRule TypeCheck
   caaHar <- onceIO $ runRule GetHieAst
   caaBindings <- onceIO $ runRule GetBindings
@@ -115,6 +117,7 @@ class ToTextEdit a where
 instance ToTextEdit TextEdit where
   toTextEdit _ = pure . pure
 
+#if !MIN_VERSION_ghc(9,3,0)
 instance ToTextEdit Rewrite where
   toTextEdit CodeActionArgs {..} rw = fmap (fromMaybe []) $
     runMaybeT $ do
@@ -126,6 +129,7 @@ instance ToTextEdit Rewrite where
       let r = rewriteToEdit df rw
 #endif
       pure $ fromRight [] r
+#endif
 
 instance ToTextEdit a => ToTextEdit [a] where
   toTextEdit caa = foldMap (toTextEdit caa)
@@ -145,7 +149,11 @@ data CodeActionArgs = CodeActionArgs
     caaParsedModule :: IO (Maybe ParsedModule),
     caaContents     :: IO (Maybe T.Text),
     caaDf           :: IO (Maybe DynFlags),
+#if MIN_VERSION_ghc(9,3,0)
+    caaAnnSource    :: IO (Maybe ParsedSource),
+#else
     caaAnnSource    :: IO (Maybe (Annotated ParsedSource)),
+#endif
     caaTmr          :: IO (Maybe TcModuleResult),
     caaHar          :: IO (Maybe HieAstResult),
     caaBindings     :: IO (Maybe Bindings),
@@ -214,10 +222,17 @@ toCodeAction3 get f = ReaderT $ \caa -> get caa >>= flip runReaderT caa . toCode
 
 -- | this instance returns a delta AST, useful for exactprint transforms
 instance ToCodeAction r => ToCodeAction (ParsedSource -> r) where
+#if !MIN_VERSION_ghc(9,3,0)
   toCodeAction f = ReaderT $ \caa@CodeActionArgs {caaAnnSource = x} ->
     x >>= \case
       Just s -> flip runReaderT caa . toCodeAction . f . astA $ s
       _      -> pure []
+#else
+  toCodeAction f = ReaderT $ \caa@CodeActionArgs {caaParsedModule = x} ->
+    x >>= \case
+      Just s -> flip runReaderT caa . toCodeAction . f . pm_parsed_source $ s
+      _      -> pure []
+#endif
 
 instance ToCodeAction r => ToCodeAction (ExportsMap -> r) where
   toCodeAction = toCodeAction3 caaExportsMap
@@ -246,11 +261,13 @@ instance ToCodeAction r => ToCodeAction (Maybe DynFlags -> r) where
 instance ToCodeAction r => ToCodeAction (DynFlags -> r) where
   toCodeAction = toCodeAction2 caaDf
 
+#if !MIN_VERSION_ghc(9,3,0)
 instance ToCodeAction r => ToCodeAction (Maybe (Annotated ParsedSource) -> r) where
   toCodeAction = toCodeAction1 caaAnnSource
 
 instance ToCodeAction r => ToCodeAction (Annotated ParsedSource -> r) where
   toCodeAction = toCodeAction2 caaAnnSource
+#endif
 
 instance ToCodeAction r => ToCodeAction (Maybe TcModuleResult -> r) where
   toCodeAction = toCodeAction1 caaTmr
diff --git a/ghcide/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs b/plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs
similarity index 99%
rename from ghcide/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs
rename to plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs
index 4b516a16ab9..57da3ee2f61 100644
--- a/ghcide/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs
+++ b/plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs
@@ -1,11 +1,5 @@
-{-# LANGUAGE DerivingStrategies #-}
-{-# LANGUAGE GADTs              #-}
-{-# LANGUAGE OverloadedStrings  #-}
-{-# LANGUAGE RankNTypes         #-}
-{-# LANGUAGE CPP                #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE GADTs        #-}
 module Development.IDE.Plugin.CodeAction.ExactPrint (
   Rewrite (..),
   rewriteToEdit,
@@ -40,6 +34,8 @@ import           GHC.Stack                       (HasCallStack)
 import           Language.Haskell.GHC.ExactPrint
 import           Language.LSP.Types
 
+import           Development.IDE.Plugin.CodeAction.Util
+
 -- GHC version specific imports. For any supported GHC version, make sure there is no warning in imports.
 #if MIN_VERSION_ghc(9,2,0)
 import           Control.Lens   (_head, _last, over)
diff --git a/ghcide/src/Development/IDE/Plugin/CodeAction/PositionIndexed.hs b/plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/PositionIndexed.hs
similarity index 100%
rename from ghcide/src/Development/IDE/Plugin/CodeAction/PositionIndexed.hs
rename to plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/PositionIndexed.hs
diff --git a/ghcide/src/Development/IDE/Plugin/CodeAction/RuleTypes.hs b/plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/RuleTypes.hs
similarity index 96%
rename from ghcide/src/Development/IDE/Plugin/CodeAction/RuleTypes.hs
rename to plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/RuleTypes.hs
index 05d6a7f33a3..c338903d358 100644
--- a/ghcide/src/Development/IDE/Plugin/CodeAction/RuleTypes.hs
+++ b/plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/RuleTypes.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE TypeFamilies #-}
 module Development.IDE.Plugin.CodeAction.RuleTypes
     (PackageExports(..)
     ,IdentInfo(..)
diff --git a/plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/Util.hs b/plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/Util.hs
new file mode 100644
index 00000000000..bfcb0d7a37e
--- /dev/null
+++ b/plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/Util.hs
@@ -0,0 +1,56 @@
+module Development.IDE.Plugin.CodeAction.Util where
+
+#if MIN_VERSION_ghc(9,2,0)
+import           GHC.Utils.Outputable
+#else
+import           Development.IDE.GHC.Util
+import           Development.IDE.GHC.Compat.Util
+import           Development.IDE.GHC.Compat
+#endif
+import           Data.Data                         (Data)
+import qualified Data.Unique                       as U
+import           Debug.Trace
+import           Development.IDE.GHC.Compat.ExactPrint as GHC
+import           GHC.Stack
+import           System.Environment.Blank          (getEnvDefault)
+import           System.IO.Unsafe
+import           Text.Printf
+import           Development.IDE.GHC.Dump          (showAstDataHtml)
+import           Data.Time.Clock.POSIX             (POSIXTime, getCurrentTime,
+                                                    utcTimeToPOSIXSeconds)
+--------------------------------------------------------------------------------
+-- Tracing exactprint terms
+
+-- Should in `Development.IDE.GHC.Orphans`,
+-- leave it here to prevent cyclic module dependency
+
+{-# NOINLINE timestamp #-}
+timestamp :: POSIXTime
+timestamp = utcTimeToPOSIXSeconds $ unsafePerformIO getCurrentTime
+
+debugAST :: Bool
+debugAST = unsafePerformIO (getEnvDefault "GHCIDE_DEBUG_AST" "0") == "1"
+
+-- | Prints an 'Outputable' value to stderr and to an HTML file for further inspection
+traceAst :: (Data a, ExactPrint a, Outputable a, HasCallStack) => String -> a -> a
+traceAst lbl x
+  | debugAST = trace doTrace x
+  | otherwise = x
+  where
+#if MIN_VERSION_ghc(9,2,0)
+    renderDump = renderWithContext defaultSDocContext{sdocStyle = defaultDumpStyle, sdocPprDebug = True}
+#else
+    renderDump = showSDocUnsafe . ppr
+#endif
+    htmlDump = showAstDataHtml x
+    doTrace = unsafePerformIO $ do
+        u <- U.newUnique
+        let htmlDumpFileName = printf "/tmp/hls/%s-%s-%d.html" (show timestamp) lbl (U.hashUnique u)
+        writeFile htmlDumpFileName $ renderDump htmlDump
+        return $ unlines
+            [prettyCallStack callStack ++ ":"
+#if MIN_VERSION_ghc(9,2,0)
+            , exactPrint x
+#endif
+            , "file://" ++ htmlDumpFileName]
+
diff --git a/plugins/hls-refactor-plugin/test/Main.hs b/plugins/hls-refactor-plugin/test/Main.hs
new file mode 100644
index 00000000000..dafbd1e843a
--- /dev/null
+++ b/plugins/hls-refactor-plugin/test/Main.hs
@@ -0,0 +1,3747 @@
+{-# LANGUAGE LambdaCase            #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE AllowAmbiguousTypes   #-}
+{-# LANGUAGE CPP                   #-}
+{-# LANGUAGE DataKinds             #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE GADTs                 #-}
+{-# LANGUAGE ImplicitParams        #-}
+{-# LANGUAGE MultiWayIf            #-}
+{-# LANGUAGE PatternSynonyms       #-}
+{-# LANGUAGE PolyKinds             #-}
+{-# LANGUAGE TypeOperators         #-}
+{-# LANGUAGE NamedFieldPuns        #-}
+{-# LANGUAGE RecordWildCards       #-}
+{-# OPTIONS_GHC -Wno-deprecations -Wno-unticked-promoted-constructors #-}
+
+module Main
+  ( main
+  ) where
+
+import           Control.Applicative.Combinators
+import           Control.Monad
+import           Data.Default
+import           Data.Foldable
+import           Data.List.Extra
+import           Data.Maybe
+import qualified Data.Text                                as T
+import           Development.IDE.Test
+import           Development.IDE.GHC.Util
+import           Development.IDE.Plugin.Completions.Types (extendImportCommandId)
+import           Development.IDE.Types.Location
+import           Development.Shake                        (getDirectoryFilesIO)
+import           Language.LSP.Test
+import           Language.LSP.Types                       hiding
+                                                          (SemanticTokenAbsolute (length, line),
+                                                           SemanticTokenRelative (length),
+                                                           SemanticTokensEdit (_start),
+                                                           mkRange)
+import qualified Language.LSP.Types.Lens                  as L
+import           Language.LSP.Types.Capabilities
+import           System.Directory
+import           System.FilePath
+import           System.Info.Extra                        (isMac, isWindows)
+import qualified System.IO.Extra
+import           System.IO.Extra                          hiding (withTempDir)
+import           Control.Lens                             ((^.))
+import           Data.Tuple.Extra
+import           Ide.Types
+import qualified Language.LSP.Types                       as LSP
+import           System.Time.Extra
+import           Test.Tasty
+import           Test.Tasty.ExpectedFailure
+import           Test.Tasty.HUnit
+import           Text.Regex.TDFA                          ((=~))
+
+
+import           Test.Hls
+import           Development.IDE.Plugin.CodeAction        (matchRegExMultipleImports)
+
+import qualified Development.IDE.Plugin.CodeAction as Refactor
+import qualified Development.IDE.Plugin.HLS.GhcIde as GhcIde
+
+main :: IO ()
+main = defaultTestRunner tests
+
+refactorPlugin :: [PluginDescriptor IdeState]
+refactorPlugin =
+      [ Refactor.iePluginDescriptor mempty "ghcide-code-actions-imports-exports"
+      , Refactor.typeSigsPluginDescriptor mempty "ghcide-code-actions-type-signatures"
+      , Refactor.bindingsPluginDescriptor mempty "ghcide-code-actions-bindings"
+      , Refactor.fillHolePluginDescriptor mempty "ghcide-code-actions-fill-holes"
+      , Refactor.extendImportPluginDescriptor mempty "ghcide-completions-1"
+      ] ++ GhcIde.descriptors mempty
+
+tests :: TestTree
+tests =
+  testGroup "refactor"
+  [ initializeTests
+  , codeActionTests
+  , codeActionHelperFunctionTests
+  , completionTests
+  ]
+
+initializeTests = withResource acquire release tests
+  where
+    tests :: IO (ResponseMessage Initialize) -> TestTree
+    tests getInitializeResponse = testGroup "initialize response capabilities"
+        [ chk "   code action"             _codeActionProvider  (Just $ InL True)
+        , che "   execute command"         _executeCommandProvider [extendImportCommandId]
+        ]
+      where
+        chk :: (Eq a, Show a) => TestName -> (ServerCapabilities -> a) -> a -> TestTree
+        chk title getActual expected =
+          testCase title $ getInitializeResponse >>= \ir -> expected @=? (getActual . innerCaps) ir
+
+        che :: TestName -> (ServerCapabilities -> Maybe ExecuteCommandOptions) -> [T.Text] -> TestTree
+        che title getActual expected = testCase title doTest
+          where
+              doTest = do
+                  ir <- getInitializeResponse
+                  let Just ExecuteCommandOptions {_commands = List commands} = getActual $ innerCaps ir
+                  zipWithM_ (\e o -> T.isSuffixOf e o @? show (e,o)) expected commands
+
+    acquire :: IO (ResponseMessage Initialize)
+    acquire = run initializeResponse
+
+
+    release :: ResponseMessage Initialize -> IO ()
+    release = const $ pure ()
+
+    innerCaps :: ResponseMessage Initialize -> ServerCapabilities
+    innerCaps (ResponseMessage _ _ (Right (InitializeResult c _))) = c
+    innerCaps (ResponseMessage _ _ (Left _)) = error "Initialization error"
+
+completionTests :: TestTree
+completionTests =
+    testGroup "auto import snippets"
+      [ completionCommandTest
+        "show imports not in list - simple"
+        ["{-# LANGUAGE NoImplicitPrelude #-}",
+        "module A where", "import Control.Monad (msum)", "f = joi"]
+        (Position 3 6)
+        "join"
+        ["{-# LANGUAGE NoImplicitPrelude #-}",
+        "module A where", "import Control.Monad (msum, join)", "f = joi"]
+      , completionCommandTest
+        "show imports not in list - multi-line"
+        ["{-# LANGUAGE NoImplicitPrelude #-}",
+        "module A where", "import Control.Monad (\n    msum)", "f = joi"]
+        (Position 4 6)
+        "join"
+        ["{-# LANGUAGE NoImplicitPrelude #-}",
+        "module A where", "import Control.Monad (\n    msum, join)", "f = joi"]
+      , completionCommandTest
+        "show imports not in list - names with _"
+        ["{-# LANGUAGE NoImplicitPrelude #-}",
+        "module A where", "import Control.Monad as M (msum)", "f = M.mapM_"]
+        (Position 3 11)
+        "mapM_"
+        ["{-# LANGUAGE NoImplicitPrelude #-}",
+        "module A where", "import Control.Monad as M (msum, mapM_)", "f = M.mapM_"]
+      , completionCommandTest
+        "show imports not in list - initial empty list"
+        ["{-# LANGUAGE NoImplicitPrelude #-}",
+        "module A where", "import Control.Monad as M ()", "f = M.joi"]
+        (Position 3 10)
+        "join"
+        ["{-# LANGUAGE NoImplicitPrelude #-}",
+        "module A where", "import Control.Monad as M (join)", "f = M.joi"]
+      , testGroup "qualified imports"
+        [ completionCommandTest
+            "single"
+            ["{-# LANGUAGE NoImplicitPrelude #-}",
+            "module A where", "import Control.Monad ()", "f = Control.Monad.joi"]
+            (Position 3 22)
+            "join"
+            ["{-# LANGUAGE NoImplicitPrelude #-}",
+            "module A where", "import Control.Monad (join)", "f = Control.Monad.joi"]
+        , completionCommandTest
+            "as"
+            ["{-# LANGUAGE NoImplicitPrelude #-}",
+            "module A where", "import Control.Monad as M ()", "f = M.joi"]
+            (Position 3 10)
+            "join"
+            ["{-# LANGUAGE NoImplicitPrelude #-}",
+            "module A where", "import Control.Monad as M (join)", "f = M.joi"]
+        , completionCommandTest
+            "multiple"
+            ["{-# LANGUAGE NoImplicitPrelude #-}",
+            "module A where", "import Control.Monad as M ()", "import Control.Monad as N ()", "f = N.joi"]
+            (Position 4 10)
+            "join"
+            ["{-# LANGUAGE NoImplicitPrelude #-}",
+            "module A where", "import Control.Monad as M ()", "import Control.Monad as N (join)", "f = N.joi"]
+        ]
+      , testGroup "Data constructor"
+        [ completionCommandTest
+            "not imported"
+            ["module A where", "import Text.Printf ()", "ZeroPad"]
+            (Position 2 4)
+            "ZeroPad"
+            ["module A where", "import Text.Printf (FormatAdjustment (ZeroPad))", "ZeroPad"]
+        , completionCommandTest
+            "parent imported abs"
+            ["module A where", "import Text.Printf (FormatAdjustment)", "ZeroPad"]
+            (Position 2 4)
+            "ZeroPad"
+            ["module A where", "import Text.Printf (FormatAdjustment (ZeroPad))", "ZeroPad"]
+        , completionNoCommandTest
+            "parent imported all"
+            ["module A where", "import Text.Printf (FormatAdjustment (..))", "ZeroPad"]
+            (Position 2 4)
+            "ZeroPad"
+        , completionNoCommandTest
+            "already imported"
+            ["module A where", "import Text.Printf (FormatAdjustment (ZeroPad))", "ZeroPad"]
+            (Position 2 4)
+            "ZeroPad"
+        , completionNoCommandTest
+            "function from Prelude"
+            ["module A where", "import Data.Maybe ()", "Nothing"]
+            (Position 2 4)
+            "Nothing"
+        , completionCommandTest
+            "type operator parent"
+            ["module A where", "import Data.Type.Equality ()", "f = Ref"]
+            (Position 2 8)
+            "Refl"
+            ["module A where", "import Data.Type.Equality (type (:~:) (Refl))", "f = Ref"]
+        ]
+      , testGroup "Record completion"
+        [ completionCommandTest
+            "not imported"
+            ["module A where", "import Text.Printf ()", "FormatParse"]
+            (Position 2 10)
+            "FormatParse {"
+            ["module A where", "import Text.Printf (FormatParse (FormatParse))", "FormatParse"]
+        , completionCommandTest
+            "parent imported"
+            ["module A where", "import Text.Printf (FormatParse)", "FormatParse"]
+            (Position 2 10)
+            "FormatParse {"
+            ["module A where", "import Text.Printf (FormatParse (FormatParse))", "FormatParse"]
+        , completionNoCommandTest
+            "already imported"
+            ["module A where", "import Text.Printf (FormatParse (FormatParse))", "FormatParse"]
+            (Position 2 10)
+            "FormatParse {"
+        ]
+        , testGroup "Package completion"
+          [ completionCommandTest
+                  "import Data.Sequence"
+                  ["module A where", "foo :: Seq"]
+                  (Position 1 9)
+                  "Seq"
+                  ["module A where", "import Data.Sequence (Seq)", "foo :: Seq"]
+
+          , completionCommandTest
+                  "qualified import"
+                  ["module A where", "foo :: Seq.Seq"]
+                  (Position 1 13)
+                  "Seq"
+                  ["module A where", "import qualified Data.Sequence as Seq", "foo :: Seq.Seq"]
+          ]
+      ]
+
+completionCommandTest ::
+  String ->
+  [T.Text] ->
+  Position ->
+  T.Text ->
+  [T.Text] ->
+  TestTree
+completionCommandTest name src pos wanted expected = testSession name $ do
+  docId <- createDoc "A.hs" "haskell" (T.unlines src)
+  _ <- waitForDiagnostics
+  compls <- skipManyTill anyMessage (getCompletions docId pos)
+  let wantedC = find ( \case
+            CompletionItem {_insertText = Just x} -> wanted `T.isPrefixOf` x
+            _                                     -> False
+            ) compls
+  case wantedC of
+    Nothing ->
+      liftIO $ assertFailure $ "Cannot find expected completion in: " <> show [_label | CompletionItem {_label} <- compls]
+    Just CompletionItem {..} -> do
+      c <- assertJust "Expected a command" _command
+      executeCommand c
+      if src /= expected
+          then do
+            void $ skipManyTill anyMessage loggingNotification
+            modifiedCode <- skipManyTill anyMessage (getDocumentEdit docId)
+            liftIO $ modifiedCode @?= T.unlines expected
+          else do
+            expectMessages SWorkspaceApplyEdit 1 $ \edit ->
+              liftIO $ assertFailure $ "Expected no edit but got: " <> show edit
+
+completionNoCommandTest ::
+  String ->
+  [T.Text] ->
+  Position ->
+  T.Text ->
+  TestTree
+completionNoCommandTest name src pos wanted = testSession name $ do
+  docId <- createDoc "A.hs" "haskell" (T.unlines src)
+  _ <- waitForDiagnostics
+  compls <- getCompletions docId pos
+  let wantedC = find ( \case
+            CompletionItem {_insertText = Just x} -> wanted `T.isPrefixOf` x
+            _                                     -> False
+            ) compls
+  case wantedC of
+    Nothing ->
+      liftIO $ assertFailure $ "Cannot find expected completion in: " <> show [_label | CompletionItem {_label} <- compls]
+    Just CompletionItem{..} -> liftIO . assertBool ("Expected no command but got: " <> show _command) $ null _command
+
+
+codeActionTests :: TestTree
+codeActionTests = testGroup "code actions"
+  [ suggestImportDisambiguationTests
+  , insertImportTests
+  , extendImportTests
+  , renameActionTests
+  , typeWildCardActionTests
+  , removeImportTests
+  , suggestImportClassMethodTests
+  , suggestImportTests
+  , suggestHideShadowTests
+  , fixConstructorImportTests
+  , fixModuleImportTypoTests
+  , importRenameActionTests
+  , fillTypedHoleTests
+  , addSigActionTests
+  , insertNewDefinitionTests
+  , deleteUnusedDefinitionTests
+  , addInstanceConstraintTests
+  , addFunctionConstraintTests
+  , removeRedundantConstraintsTests
+  , addTypeAnnotationsToLiteralsTest
+  , exportUnusedTests
+  , addImplicitParamsConstraintTests
+  , removeExportTests
+  ]
+
+insertImportTests :: TestTree
+insertImportTests = testGroup "insert import"
+  [ checkImport
+        "module where keyword lower in file no exports"
+        "WhereKeywordLowerInFileNoExports.hs"
+        "WhereKeywordLowerInFileNoExports.expected.hs"
+        "import Data.Int"
+  , checkImport
+        "module where keyword lower in file with exports"
+        "WhereDeclLowerInFile.hs"
+        "WhereDeclLowerInFile.expected.hs"
+        "import Data.Int"
+  , checkImport
+        "module where keyword lower in file with comments before it"
+        "WhereDeclLowerInFileWithCommentsBeforeIt.hs"
+        "WhereDeclLowerInFileWithCommentsBeforeIt.expected.hs"
+        "import Data.Int"
+  , expectFailBecause
+      "'findNextPragmaPosition' function doesn't account for case when shebang is not placed at top of file"
+      (checkImport
+         "Shebang not at top with spaces"
+         "ShebangNotAtTopWithSpaces.hs"
+         "ShebangNotAtTopWithSpaces.expected.hs"
+         "import Data.Monoid")
+  , expectFailBecause
+      "'findNextPragmaPosition' function doesn't account for case when shebang is not placed at top of file"
+      (checkImport
+         "Shebang not at top no space"
+         "ShebangNotAtTopNoSpace.hs"
+         "ShebangNotAtTopNoSpace.expected.hs"
+         "import Data.Monoid")
+  , expectFailBecause
+      ("'findNextPragmaPosition' function doesn't account for case "
+      ++ "when OPTIONS_GHC pragma is not placed at top of file")
+      (checkImport
+         "OPTIONS_GHC pragma not at top with spaces"
+         "OptionsNotAtTopWithSpaces.hs"
+         "OptionsNotAtTopWithSpaces.expected.hs"
+         "import Data.Monoid")
+  , expectFailBecause
+      ("'findNextPragmaPosition' function doesn't account for "
+      ++ "case when shebang is not placed at top of file")
+      (checkImport
+         "Shebang not at top of file"
+         "ShebangNotAtTop.hs"
+         "ShebangNotAtTop.expected.hs"
+         "import Data.Monoid")
+  , expectFailBecause
+      ("'findNextPragmaPosition' function doesn't account for case "
+      ++ "when OPTIONS_GHC is not placed at top of file")
+      (checkImport
+         "OPTIONS_GHC pragma not at top of file"
+         "OptionsPragmaNotAtTop.hs"
+         "OptionsPragmaNotAtTop.expected.hs"
+         "import Data.Monoid")
+  , expectFailBecause
+      ("'findNextPragmaPosition' function doesn't account for case when "
+      ++ "OPTIONS_GHC pragma is not placed at top of file")
+      (checkImport
+         "pragma not at top with comment at top"
+         "PragmaNotAtTopWithCommentsAtTop.hs"
+         "PragmaNotAtTopWithCommentsAtTop.expected.hs"
+         "import Data.Monoid")
+  , expectFailBecause
+      ("'findNextPragmaPosition' function doesn't account for case when "
+      ++ "OPTIONS_GHC pragma is not placed at top of file")
+      (checkImport
+         "pragma not at top multiple comments"
+         "PragmaNotAtTopMultipleComments.hs"
+         "PragmaNotAtTopMultipleComments.expected.hs"
+         "import Data.Monoid")
+  , expectFailBecause
+      "'findNextPragmaPosition' function doesn't account for case of multiline pragmas"
+      (checkImport
+         "after multiline language pragmas"
+         "MultiLinePragma.hs"
+         "MultiLinePragma.expected.hs"
+         "import Data.Monoid")
+  , checkImport
+      "pragmas not at top with module declaration"
+      "PragmaNotAtTopWithModuleDecl.hs"
+      "PragmaNotAtTopWithModuleDecl.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "pragmas not at top with imports"
+      "PragmaNotAtTopWithImports.hs"
+      "PragmaNotAtTopWithImports.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "above comment at top of module"
+      "CommentAtTop.hs"
+      "CommentAtTop.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "above multiple comments below"
+      "CommentAtTopMultipleComments.hs"
+      "CommentAtTopMultipleComments.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "above curly brace comment"
+      "CommentCurlyBraceAtTop.hs"
+      "CommentCurlyBraceAtTop.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "above multi-line comment"
+      "MultiLineCommentAtTop.hs"
+      "MultiLineCommentAtTop.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "above comment with no module explicit exports"
+      "NoExplicitExportCommentAtTop.hs"
+      "NoExplicitExportCommentAtTop.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "above two-dash comment with no pipe"
+      "TwoDashOnlyComment.hs"
+      "TwoDashOnlyComment.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "above comment with no (module .. where) decl"
+      "NoModuleDeclarationCommentAtTop.hs"
+      "NoModuleDeclarationCommentAtTop.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "comment not at top with no (module .. where) decl"
+      "NoModuleDeclaration.hs"
+      "NoModuleDeclaration.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "comment not at top (data dec is)"
+      "DataAtTop.hs"
+      "DataAtTop.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "comment not at top (newtype is)"
+      "NewTypeAtTop.hs"
+      "NewTypeAtTop.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "with no explicit module exports"
+      "NoExplicitExports.hs"
+      "NoExplicitExports.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "add to correctly placed exisiting import"
+      "ImportAtTop.hs"
+      "ImportAtTop.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "add to multiple correctly placed exisiting imports"
+      "MultipleImportsAtTop.hs"
+      "MultipleImportsAtTop.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "with language pragma at top of module"
+      "LangPragmaModuleAtTop.hs"
+      "LangPragmaModuleAtTop.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "with language pragma and explicit module exports"
+      "LangPragmaModuleWithComment.hs"
+      "LangPragmaModuleWithComment.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "with language pragma at top and no module declaration"
+      "LanguagePragmaAtTop.hs"
+      "LanguagePragmaAtTop.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "with multiple lang pragmas and no module declaration"
+      "MultipleLanguagePragmasNoModuleDeclaration.hs"
+      "MultipleLanguagePragmasNoModuleDeclaration.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "with pragmas and shebangs"
+      "LanguagePragmasThenShebangs.hs"
+      "LanguagePragmasThenShebangs.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "with pragmas and shebangs but no comment at top"
+      "PragmasAndShebangsNoComment.hs"
+      "PragmasAndShebangsNoComment.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "module decl no exports under pragmas and shebangs"
+      "PragmasShebangsAndModuleDecl.hs"
+      "PragmasShebangsAndModuleDecl.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "module decl with explicit import under pragmas and shebangs"
+      "PragmasShebangsModuleExplicitExports.hs"
+      "PragmasShebangsModuleExplicitExports.expected.hs"
+      "import Data.Monoid"
+  , checkImport
+      "module decl and multiple imports"
+      "ModuleDeclAndImports.hs"
+      "ModuleDeclAndImports.expected.hs"
+      "import Data.Monoid"
+  ]
+
+checkImport :: String -> FilePath -> FilePath -> T.Text -> TestTree
+checkImport testComment originalPath expectedPath action =
+  testSessionWithExtraFiles "import-placement" testComment $ \dir ->
+    check (dir </> originalPath) (dir </> expectedPath) action
+  where
+    check :: FilePath -> FilePath -> T.Text -> Session ()
+    check originalPath expectedPath action = do
+      oSrc <- liftIO $ readFileUtf8 originalPath
+      eSrc <- liftIO $  readFileUtf8 expectedPath
+      originalDoc <- createDoc originalPath "haskell" oSrc
+      _ <- waitForDiagnostics
+      shouldBeDoc <- createDoc expectedPath "haskell" eSrc
+      actionsOrCommands <- getAllCodeActions originalDoc
+      chosenAction <- liftIO $ pickActionWithTitle action actionsOrCommands
+      executeCodeAction chosenAction
+      originalDocAfterAction <- documentContents originalDoc
+      shouldBeDocContents <- documentContents shouldBeDoc
+      liftIO $ T.replace "\r\n" "\n" shouldBeDocContents @=? T.replace "\r\n" "\n" originalDocAfterAction
+
+renameActionTests :: TestTree
+renameActionTests = testGroup "rename actions"
+  [ testSession "change to local variable name" $ do
+      let content = T.unlines
+            [ "module Testing where"
+            , "foo :: Int -> Int"
+            , "foo argName = argNme"
+            ]
+      doc <- createDoc "Testing.hs" "haskell" content
+      _ <- waitForDiagnostics
+      action <- findCodeAction doc (Range (Position 2 14) (Position 2 20)) "Replace with ‘argName’"
+      executeCodeAction action
+      contentAfterAction <- documentContents doc
+      let expectedContentAfterAction = T.unlines
+            [ "module Testing where"
+            , "foo :: Int -> Int"
+            , "foo argName = argName"
+            ]
+      liftIO $ expectedContentAfterAction @=? contentAfterAction
+  , testSession "change to name of imported function" $ do
+      let content = T.unlines
+            [ "module Testing where"
+            , "import Data.Maybe (maybeToList)"
+            , "foo :: Maybe a -> [a]"
+            , "foo = maybToList"
+            ]
+      doc <- createDoc "Testing.hs" "haskell" content
+      _ <- waitForDiagnostics
+      action <- findCodeAction doc (Range (Position 3 6) (Position 3 16))  "Replace with ‘maybeToList’"
+      executeCodeAction action
+      contentAfterAction <- documentContents doc
+      let expectedContentAfterAction = T.unlines
+            [ "module Testing where"
+            , "import Data.Maybe (maybeToList)"
+            , "foo :: Maybe a -> [a]"
+            , "foo = maybeToList"
+            ]
+      liftIO $ expectedContentAfterAction @=? contentAfterAction
+  , testSession "suggest multiple local variable names" $ do
+      let content = T.unlines
+            [ "module Testing where"
+            , "foo :: Char -> Char -> Char -> Char"
+            , "foo argument1 argument2 argument3 = argumentX"
+            ]
+      doc <- createDoc "Testing.hs" "haskell" content
+      _ <- waitForDiagnostics
+      _ <- findCodeActions doc (Range (Position 2 36) (Position 2 45))
+                           ["Replace with ‘argument1’", "Replace with ‘argument2’", "Replace with ‘argument3’"]
+      return()
+  , testSession "change infix function" $ do
+      let content = T.unlines
+            [ "module Testing where"
+            , "monus :: Int -> Int"
+            , "monus x y = max 0 (x - y)"
+            , "foo x y = x `monnus` y"
+            ]
+      doc <- createDoc "Testing.hs" "haskell" content
+      _ <- waitForDiagnostics
+      actionsOrCommands <- getCodeActions doc (Range (Position 3 12) (Position 3 20))
+      [fixTypo] <- pure [action | InR action@CodeAction{ _title = actionTitle } <- actionsOrCommands, "monus" `T.isInfixOf` actionTitle ]
+      executeCodeAction fixTypo
+      contentAfterAction <- documentContents doc
+      let expectedContentAfterAction = T.unlines
+            [ "module Testing where"
+            , "monus :: Int -> Int"
+            , "monus x y = max 0 (x - y)"
+            , "foo x y = x `monus` y"
+            ]
+      liftIO $ expectedContentAfterAction @=? contentAfterAction
+  ]
+
+typeWildCardActionTests :: TestTree
+typeWildCardActionTests = testGroup "type wildcard actions"
+  [ testUseTypeSignature "global signature"
+        [ "func :: _"
+        , "func x = x"
+        ]
+        [ "func :: p -> p"
+        , "func x = x"
+        ]
+  , testUseTypeSignature "local signature"
+        [ "func :: Int -> Int"
+        , "func x ="
+        , "  let y :: _"
+        , "      y = x * 2"
+        , "  in y"
+        ]
+        [ "func :: Int -> Int"
+        , "func x ="
+        , "  let y :: Int"
+        , "      y = x * 2"
+        , "  in y"
+        ]
+  , testUseTypeSignature "multi-line message 1"
+        [ "func :: _"
+        , "func x y = x + y"
+        ]
+        [ "func :: Integer -> Integer -> Integer"
+        , "func x y = x + y"
+        ]
+  , testUseTypeSignature "type in parentheses"
+        [ "func :: a -> _"
+        , "func x = (x, const x)"
+        ]
+        [ "func :: a -> (a, b -> a)"
+        , "func x = (x, const x)"
+        ]
+  , testUseTypeSignature "type in brackets"
+        [ "func :: _ -> Maybe a"
+        , "func xs = head xs"
+        ]
+        [ "func :: [Maybe a] -> Maybe a"
+        , "func xs = head xs"
+        ]
+  , testUseTypeSignature "unit type"
+        [ "func :: IO _"
+        , "func = putChar 'H'"
+        ]
+        [ "func :: IO ()"
+        , "func = putChar 'H'"
+        ]
+  , testUseTypeSignature "no spaces around '::'"
+        [ "func::_"
+        , "func x y = x + y"
+        ]
+        [ "func::Integer -> Integer -> Integer"
+        , "func x y = x + y"
+        ]
+  , testGroup "add parens if hole is part of bigger type"
+    [ testUseTypeSignature "subtype 1"
+          [ "func :: _ -> Integer -> Integer"
+          , "func x y = x + y"
+          ]
+          [ "func :: Integer -> Integer -> Integer"
+          , "func x y = x + y"
+          ]
+    , testUseTypeSignature "subtype 2"
+          [ "func :: Integer -> _ -> Integer"
+          , "func x y = x + y"
+          ]
+          [ "func :: Integer -> Integer -> Integer"
+          , "func x y = x + y"
+          ]
+    , testUseTypeSignature "subtype 3"
+          [ "func :: Integer -> Integer -> _"
+          , "func x y = x + y"
+          ]
+          [ "func :: Integer -> Integer -> Integer"
+          , "func x y = x + y"
+          ]
+    , testUseTypeSignature "subtype 4"
+          [ "func :: Integer -> _"
+          , "func x y = x + y"
+          ]
+          [ "func :: Integer -> (Integer -> Integer)"
+          , "func x y = x + y"
+          ]
+    ]
+  ]
+  where
+    -- | Test session of given name, checking action "Use type signature..."
+    --   on a test file with given content and comparing to expected result.
+    testUseTypeSignature name textIn textOut = testSession name $ do
+        let fileStart = "module Testing where"
+            content = T.unlines $ fileStart : textIn
+            expectedContentAfterAction = T.unlines $ fileStart : textOut
+        doc <- createDoc "Testing.hs" "haskell" content
+        _ <- waitForDiagnostics
+        actionsOrCommands <- getAllCodeActions doc
+        let [addSignature] = [action | InR action@CodeAction { _title = actionTitle } <- actionsOrCommands
+                                    , "Use type signature" `T.isInfixOf` actionTitle
+                            ]
+        executeCodeAction addSignature
+        contentAfterAction <- documentContents doc
+        liftIO $ expectedContentAfterAction @=? contentAfterAction
+
+{-# HLINT ignore "Use nubOrd" #-}
+removeImportTests :: TestTree
+removeImportTests = testGroup "remove import actions"
+  [ testSession "redundant" $ do
+      let contentA = T.unlines
+            [ "module ModuleA where"
+            ]
+      _docA <- createDoc "ModuleA.hs" "haskell" contentA
+      let contentB = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            , "import ModuleA"
+            , "stuffB :: Integer"
+            , "stuffB = 123"
+            ]
+      docB <- createDoc "ModuleB.hs" "haskell" contentB
+      _ <- waitForDiagnostics
+      [InR action@CodeAction { _title = actionTitle }, _]
+          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
+      liftIO $ "Remove import" @=? actionTitle
+      executeCodeAction action
+      contentAfterAction <- documentContents docB
+      let expectedContentAfterAction = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            , "stuffB :: Integer"
+            , "stuffB = 123"
+            ]
+      liftIO $ expectedContentAfterAction @=? contentAfterAction
+  , testSession "qualified redundant" $ do
+      let contentA = T.unlines
+            [ "module ModuleA where"
+            ]
+      _docA <- createDoc "ModuleA.hs" "haskell" contentA
+      let contentB = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            , "import qualified ModuleA"
+            , "stuffB :: Integer"
+            , "stuffB = 123"
+            ]
+      docB <- createDoc "ModuleB.hs" "haskell" contentB
+      _ <- waitForDiagnostics
+      [InR action@CodeAction { _title = actionTitle }, _]
+          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
+      liftIO $ "Remove import" @=? actionTitle
+      executeCodeAction action
+      contentAfterAction <- documentContents docB
+      let expectedContentAfterAction = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            , "stuffB :: Integer"
+            , "stuffB = 123"
+            ]
+      liftIO $ expectedContentAfterAction @=? contentAfterAction
+  , testSession "redundant binding" $ do
+      let contentA = T.unlines
+            [ "module ModuleA where"
+            , "stuffA = False"
+            , "stuffB :: Integer"
+            , "stuffB = 123"
+            , "stuffC = ()"
+            , "_stuffD = '_'"
+            ]
+      _docA <- createDoc "ModuleA.hs" "haskell" contentA
+      let contentB = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            , "import ModuleA (stuffA, stuffB, _stuffD, stuffC, stuffA)"
+            , "main = print stuffB"
+            ]
+      docB <- createDoc "ModuleB.hs" "haskell" contentB
+      _ <- waitForDiagnostics
+      [InR action@CodeAction { _title = actionTitle }, _]
+          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
+      liftIO $ "Remove _stuffD, stuffA, stuffC from import" @=? actionTitle
+      executeCodeAction action
+      contentAfterAction <- documentContents docB
+      let expectedContentAfterAction = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            , "import ModuleA (stuffB)"
+            , "main = print stuffB"
+            ]
+      liftIO $ expectedContentAfterAction @=? contentAfterAction
+  , testSession "redundant binding - unicode regression " $ do
+      let contentA = T.unlines
+            [ "module ModuleA where"
+            , "data A = A"
+            , "ε :: Double"
+            , "ε = 0.5"
+            ]
+      _docA <- createDoc "ModuleA.hs" "haskell" contentA
+      let contentB = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            , "import ModuleA (A(..), ε)"
+            , "a = A"
+            ]
+      docB <- createDoc "ModuleB.hs" "haskell" contentB
+      _ <- waitForDiagnostics
+      [InR action@CodeAction { _title = actionTitle }, _]
+          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
+      liftIO $ "Remove ε from import" @=? actionTitle
+      executeCodeAction action
+      contentAfterAction <- documentContents docB
+      let expectedContentAfterAction = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            , "import ModuleA (A(..))"
+            , "a = A"
+            ]
+      liftIO $ expectedContentAfterAction @=? contentAfterAction
+  , testSession "redundant operator" $ do
+      let contentA = T.unlines
+            [ "module ModuleA where"
+            , "a !! _b = a"
+            , "a <?> _b = a"
+            , "stuffB :: Integer"
+            , "stuffB = 123"
+            ]
+      _docA <- createDoc "ModuleA.hs" "haskell" contentA
+      let contentB = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            , "import qualified ModuleA as A ((<?>), stuffB, (!!))"
+            , "main = print A.stuffB"
+            ]
+      docB <- createDoc "ModuleB.hs" "haskell" contentB
+      _ <- waitForDiagnostics
+      [InR action@CodeAction { _title = actionTitle }, _]
+          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
+      liftIO $ "Remove !!, <?> from import" @=? actionTitle
+      executeCodeAction action
+      contentAfterAction <- documentContents docB
+      let expectedContentAfterAction = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            , "import qualified ModuleA as A (stuffB)"
+            , "main = print A.stuffB"
+            ]
+      liftIO $ expectedContentAfterAction @=? contentAfterAction
+  , testSession "redundant all import" $ do
+      let contentA = T.unlines
+            [ "module ModuleA where"
+            , "data A = A"
+            , "stuffB :: Integer"
+            , "stuffB = 123"
+            ]
+      _docA <- createDoc "ModuleA.hs" "haskell" contentA
+      let contentB = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            , "import ModuleA (A(..), stuffB)"
+            , "main = print stuffB"
+            ]
+      docB <- createDoc "ModuleB.hs" "haskell" contentB
+      _ <- waitForDiagnostics
+      [InR action@CodeAction { _title = actionTitle }, _]
+          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
+      liftIO $ "Remove A from import" @=? actionTitle
+      executeCodeAction action
+      contentAfterAction <- documentContents docB
+      let expectedContentAfterAction = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            , "import ModuleA (stuffB)"
+            , "main = print stuffB"
+            ]
+      liftIO $ expectedContentAfterAction @=? contentAfterAction
+  , testSession "redundant constructor import" $ do
+      let contentA = T.unlines
+            [ "module ModuleA where"
+            , "data D = A | B"
+            , "data E = F"
+            ]
+      _docA <- createDoc "ModuleA.hs" "haskell" contentA
+      let contentB = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            , "import ModuleA (D(A,B), E(F))"
+            , "main = B"
+            ]
+      docB <- createDoc "ModuleB.hs" "haskell" contentB
+      _ <- waitForDiagnostics
+      [InR action@CodeAction { _title = actionTitle }, _]
+          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
+      liftIO $ "Remove A, E, F from import" @=? actionTitle
+      executeCodeAction action
+      contentAfterAction <- documentContents docB
+      let expectedContentAfterAction = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            , "import ModuleA (D(B))"
+            , "main = B"
+            ]
+      liftIO $ expectedContentAfterAction @=? contentAfterAction
+  , testSession "import containing the identifier Strict" $ do
+      let contentA = T.unlines
+            [ "module Strict where"
+            ]
+      _docA <- createDoc "Strict.hs" "haskell" contentA
+      let contentB = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            , "import Strict"
+            ]
+      docB <- createDoc "ModuleB.hs" "haskell" contentB
+      _ <- waitForDiagnostics
+      [InR action@CodeAction { _title = actionTitle }, _]
+          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
+      liftIO $ "Remove import" @=? actionTitle
+      executeCodeAction action
+      contentAfterAction <- documentContents docB
+      let expectedContentAfterAction = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            ]
+      liftIO $ expectedContentAfterAction @=? contentAfterAction
+  , testSession "remove all" $ do
+      let content = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleA where"
+            , "import Data.Function (fix, (&))"
+            , "import qualified Data.Functor.Const"
+            , "import Data.Functor.Identity"
+            , "import Data.Functor.Sum (Sum (InL, InR))"
+            , "import qualified Data.Kind as K (Constraint, Type)"
+            , "x = InL (Identity 123)"
+            , "y = fix id"
+            , "type T = K.Type"
+            ]
+      doc <- createDoc "ModuleC.hs" "haskell" content
+      _ <- waitForDiagnostics
+      [_, _, _, _, InR action@CodeAction { _title = actionTitle }]
+          <- nub <$> getAllCodeActions doc
+      liftIO $ "Remove all redundant imports" @=? actionTitle
+      executeCodeAction action
+      contentAfterAction <- documentContents doc
+      let expectedContentAfterAction = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleA where"
+            , "import Data.Function (fix)"
+            , "import Data.Functor.Identity"
+            , "import Data.Functor.Sum (Sum (InL))"
+            , "import qualified Data.Kind as K (Type)"
+            , "x = InL (Identity 123)"
+            , "y = fix id"
+            , "type T = K.Type"
+            ]
+      liftIO $ expectedContentAfterAction @=? contentAfterAction
+  , testSession "remove unused operators whose name ends with '.'" $ do
+      let contentA = T.unlines
+            [ "module ModuleA where"
+            , "(@.) = 0 -- Must have an operator whose name ends with '.'"
+            , "a = 1 -- .. but also something else"
+            ]
+      _docA <- createDoc "ModuleA.hs" "haskell" contentA
+      let contentB = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            , "import ModuleA (a, (@.))"
+            , "x = a -- Must use something from module A, but not (@.)"
+            ]
+      docB <- createDoc "ModuleB.hs" "haskell" contentB
+      _ <- waitForDiagnostics
+      [InR action@CodeAction { _title = actionTitle }, _]
+          <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
+      liftIO $ "Remove @. from import" @=? actionTitle
+      executeCodeAction action
+      contentAfterAction <- documentContents docB
+      let expectedContentAfterAction = T.unlines
+            [ "{-# OPTIONS_GHC -Wunused-imports #-}"
+            , "module ModuleB where"
+            , "import ModuleA (a)"
+            , "x = a -- Must use something from module A, but not (@.)"
+            ]
+      liftIO $ expectedContentAfterAction @=? contentAfterAction
+  ]
+
+extendImportTests :: TestTree
+extendImportTests = testGroup "extend import actions"
+  [ testGroup "with checkAll" $ tests True
+  , testGroup "without checkAll" $ tests False
+  ]
+  where
+    tests overrideCheckProject =
+        [ testSession "extend all constructors for record field" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "data A = B { a :: Int }"
+                    ])]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (A(B))"
+                    , "f = a"
+                    ])
+            (Range (Position 2 4) (Position 2 5))
+            [ "Add A(..) to the import list of ModuleA"
+            , "Add A(a) to the import list of ModuleA"
+            , "Add a to the import list of ModuleA"
+            ]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (A(..))"
+                    , "f = a"
+                    ])
+        , testSession "extend all constructors with sibling" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "data Foo"
+                    , "data Bar"
+                    , "data A = B | C"
+                    ])]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA ( Foo,  A (C) , Bar ) "
+                    , "f = B"
+                    ])
+            (Range (Position 2 4) (Position 2 5))
+            [ "Add A(..) to the import list of ModuleA"
+            , "Add A(B) to the import list of ModuleA"
+            ]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA ( Foo,  A (..) , Bar ) "
+                    , "f = B"
+                    ])
+        , testSession "extend all constructors with comment" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "data Foo"
+                    , "data Bar"
+                    , "data A = B | C"
+                    ])]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA ( Foo,  A (C{-comment--}) , Bar ) "
+                    , "f = B"
+                    ])
+            (Range (Position 2 4) (Position 2 5))
+            [ "Add A(..) to the import list of ModuleA"
+            , "Add A(B) to the import list of ModuleA"
+            ]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA ( Foo,  A (..{-comment--}) , Bar ) "
+                    , "f = B"
+                    ])
+        , testSession "extend all constructors for type operator" $ template
+            []
+            ("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "import Data.Type.Equality ((:~:))"
+                    , "x :: (:~:) [] []"
+                    , "x = Refl"
+                    ])
+            (Range (Position 3 17) (Position 3 18))
+            [ "Add (:~:)(..) to the import list of Data.Type.Equality"
+            , "Add type (:~:)(Refl) to the import list of Data.Type.Equality"]
+            (T.unlines
+                    [ "module ModuleA where"
+                    , "import Data.Type.Equality ((:~:) (..))"
+                    , "x :: (:~:) [] []"
+                    , "x = Refl"
+                    ])
+        , testSession "extend all constructors for class" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "class C a where"
+                    , "  m1 :: a -> a"
+                    , "  m2 :: a -> a"
+                    ])]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (C(m1))"
+                    , "b = m2"
+                    ])
+            (Range (Position 2 5) (Position 2 5))
+            [ "Add C(..) to the import list of ModuleA"
+            , "Add C(m2) to the import list of ModuleA"
+            , "Add m2 to the import list of ModuleA"
+            ]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (C(..))"
+                    , "b = m2"
+                    ])
+        , testSession "extend single line import with value" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "stuffA :: Double"
+                    , "stuffA = 0.00750"
+                    , "stuffB :: Integer"
+                    , "stuffB = 123"
+                    ])]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA as A (stuffB)"
+                    , "main = print (stuffA, stuffB)"
+                    ])
+            (Range (Position 2 17) (Position 2 18))
+            ["Add stuffA to the import list of ModuleA"]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA as A (stuffB, stuffA)"
+                    , "main = print (stuffA, stuffB)"
+                    ])
+        , testSession "extend single line import with operator" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "(.*) :: Integer -> Integer -> Integer"
+                    , "x .* y = x * y"
+                    , "stuffB :: Integer"
+                    , "stuffB = 123"
+                    ])]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA as A (stuffB)"
+                    , "main = print (stuffB .* stuffB)"
+                    ])
+            (Range (Position 2 17) (Position 2 18))
+            ["Add (.*) to the import list of ModuleA"]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA as A (stuffB, (.*))"
+                    , "main = print (stuffB .* stuffB)"
+                    ])
+        , testSession "extend single line import with infix constructor" $ template
+            []
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import Data.List.NonEmpty (fromList)"
+                    , "main = case (fromList []) of _ :| _ -> pure ()"
+                    ])
+            (Range (Position 2 5) (Position 2 6))
+            [ "Add NonEmpty((:|)) to the import list of Data.List.NonEmpty"
+            , "Add NonEmpty(..) to the import list of Data.List.NonEmpty"
+            ]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import Data.List.NonEmpty (fromList, NonEmpty ((:|)))"
+                    , "main = case (fromList []) of _ :| _ -> pure ()"
+                    ])
+        , testSession "extend single line import with prefix constructor" $ template
+            []
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import Prelude hiding (Maybe(..))"
+                    , "import Data.Maybe (catMaybes)"
+                    , "x = Just 10"
+                    ])
+            (Range (Position 3 5) (Position 2 6))
+            [ "Add Maybe(Just) to the import list of Data.Maybe"
+            , "Add Maybe(..) to the import list of Data.Maybe"
+            ]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import Prelude hiding (Maybe(..))"
+                    , "import Data.Maybe (catMaybes, Maybe (Just))"
+                    , "x = Just 10"
+                    ])
+        , testSession "extend single line import with type" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "type A = Double"
+                    ])]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA ()"
+                    , "b :: A"
+                    , "b = 0"
+                    ])
+            (Range (Position 2 5) (Position 2 5))
+            ["Add A to the import list of ModuleA"]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (A)"
+                    , "b :: A"
+                    , "b = 0"
+                    ])
+        , testSession "extend single line import with constructor" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "data A = Constructor"
+                    ])]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (A)"
+                    , "b :: A"
+                    , "b = Constructor"
+                    ])
+            (Range (Position 3 5) (Position 3 5))
+            [ "Add A(Constructor) to the import list of ModuleA"
+            , "Add A(..) to the import list of ModuleA"
+            ]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (A (Constructor))"
+                    , "b :: A"
+                    , "b = Constructor"
+                    ])
+        , testSession "extend single line import with constructor (with comments)" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "data A = Constructor"
+                    ])]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (A ({-Constructor-}))"
+                    , "b :: A"
+                    , "b = Constructor"
+                    ])
+            (Range (Position 3 5) (Position 3 5))
+            [ "Add A(Constructor) to the import list of ModuleA"
+            , "Add A(..) to the import list of ModuleA"
+            ]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (A (Constructor{-Constructor-}))"
+                    , "b :: A"
+                    , "b = Constructor"
+                    ])
+        , testSession "extend single line import with mixed constructors" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "data A = ConstructorFoo | ConstructorBar"
+                    , "a = 1"
+                    ])]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (A (ConstructorBar), a)"
+                    , "b :: A"
+                    , "b = ConstructorFoo"
+                    ])
+            (Range (Position 3 5) (Position 3 5))
+            [ "Add A(ConstructorFoo) to the import list of ModuleA"
+            , "Add A(..) to the import list of ModuleA"
+            ]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (A (ConstructorBar, ConstructorFoo), a)"
+                    , "b :: A"
+                    , "b = ConstructorFoo"
+                    ])
+        , testSession "extend single line qualified import with value" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "stuffA :: Double"
+                    , "stuffA = 0.00750"
+                    , "stuffB :: Integer"
+                    , "stuffB = 123"
+                    ])]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import qualified ModuleA as A (stuffB)"
+                    , "main = print (A.stuffA, A.stuffB)"
+                    ])
+            (Range (Position 2 17) (Position 2 18))
+            ["Add stuffA to the import list of ModuleA"]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import qualified ModuleA as A (stuffB, stuffA)"
+                    , "main = print (A.stuffA, A.stuffB)"
+                    ])
+        , testSession "extend multi line import with value" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "stuffA :: Double"
+                    , "stuffA = 0.00750"
+                    , "stuffB :: Integer"
+                    , "stuffB = 123"
+                    ])]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (stuffB"
+                    , "               )"
+                    , "main = print (stuffA, stuffB)"
+                    ])
+            (Range (Position 3 17) (Position 3 18))
+            ["Add stuffA to the import list of ModuleA"]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (stuffB, stuffA"
+                    , "               )"
+                    , "main = print (stuffA, stuffB)"
+                    ])
+        , testSession "extend multi line import with trailing comma" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "stuffA :: Double"
+                    , "stuffA = 0.00750"
+                    , "stuffB :: Integer"
+                    , "stuffB = 123"
+                    ])]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (stuffB,"
+                    , "               )"
+                    , "main = print (stuffA, stuffB)"
+                    ])
+            (Range (Position 3 17) (Position 3 18))
+            ["Add stuffA to the import list of ModuleA"]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (stuffB, stuffA,"
+                    , "               )"
+                    , "main = print (stuffA, stuffB)"
+                    ])
+        , testSession "extend single line import with method within class" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "class C a where"
+                    , "  m1 :: a -> a"
+                    , "  m2 :: a -> a"
+                    ])]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (C(m1))"
+                    , "b = m2"
+                    ])
+            (Range (Position 2 5) (Position 2 5))
+            [ "Add C(m2) to the import list of ModuleA"
+            , "Add m2 to the import list of ModuleA"
+            , "Add C(..) to the import list of ModuleA"
+            ]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (C(m1, m2))"
+                    , "b = m2"
+                    ])
+        , testSession "extend single line import with method without class" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "class C a where"
+                    , "  m1 :: a -> a"
+                    , "  m2 :: a -> a"
+                    ])]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (C(m1))"
+                    , "b = m2"
+                    ])
+            (Range (Position 2 5) (Position 2 5))
+            [ "Add m2 to the import list of ModuleA"
+            , "Add C(m2) to the import list of ModuleA"
+            , "Add C(..) to the import list of ModuleA"
+            ]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA (C(m1), m2)"
+                    , "b = m2"
+                    ])
+        , testSession "extend import list with multiple choices" $ template
+            [("ModuleA.hs", T.unlines
+                    --  this is just a dummy module to help the arguments needed for this test
+                    [  "module ModuleA (bar) where"
+                    , "bar = 10"
+                    ]),
+            ("ModuleB.hs", T.unlines
+                    --  this is just a dummy module to help the arguments needed for this test
+                    [  "module ModuleB (bar) where"
+                    , "bar = 10"
+                    ])]
+            ("ModuleC.hs", T.unlines
+                    [ "module ModuleC where"
+                    , "import ModuleB ()"
+                    , "import ModuleA ()"
+                    , "foo = bar"
+                    ])
+            (Range (Position 3 17) (Position 3 18))
+            ["Add bar to the import list of ModuleA",
+            "Add bar to the import list of ModuleB"]
+            (T.unlines
+                    [ "module ModuleC where"
+                    , "import ModuleB ()"
+                    , "import ModuleA (bar)"
+                    , "foo = bar"
+                    ])
+        , testSession "extend import list with constructor of type operator" $ template
+            []
+            ("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "import Data.Type.Equality ((:~:))"
+                    , "x :: (:~:) [] []"
+                    , "x = Refl"
+                    ])
+            (Range (Position 3 17) (Position 3 18))
+            [ "Add type (:~:)(Refl) to the import list of Data.Type.Equality"
+            , "Add (:~:)(..) to the import list of Data.Type.Equality"]
+            (T.unlines
+                    [ "module ModuleA where"
+                    , "import Data.Type.Equality ((:~:) (Refl))"
+                    , "x :: (:~:) [] []"
+                    , "x = Refl"
+                    ])
+        , expectFailBecause "importing pattern synonyms is unsupported"
+          $ testSession "extend import list with pattern synonym" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "{-# LANGUAGE PatternSynonyms #-}"
+                      , "module ModuleA where"
+                      , "pattern Some x = Just x"
+                    ])
+            ]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import A ()"
+                    , "k (Some x) = x"
+                    ])
+            (Range (Position 2 3) (Position 2 7))
+            ["Add pattern Some to the import list of A"]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import A (pattern Some)"
+                    , "k (Some x) = x"
+                    ])
+        , ignoreForGHC92 "Diagnostic message has no suggestions" $
+          testSession "type constructor name same as data constructor name" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "newtype Foo = Foo Int"
+                    ])]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA(Foo)"
+                    , "f :: Foo"
+                    , "f = Foo 1"
+                    ])
+            (Range (Position 3 4) (Position 3 6))
+            ["Add Foo(Foo) to the import list of ModuleA", "Add Foo(..) to the import list of ModuleA"]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA(Foo (Foo))"
+                    , "f :: Foo"
+                    , "f = Foo 1"
+                    ])
+        , testSession "type constructor name same as data constructor name, data constructor extraneous" $ template
+            [("ModuleA.hs", T.unlines
+                    [ "module ModuleA where"
+                    , "data Foo = Foo"
+                    ])]
+            ("ModuleB.hs", T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA()"
+                    , "f :: Foo"
+                    , "f = undefined"
+                    ])
+            (Range (Position 2 4) (Position 2 6))
+            ["Add Foo to the import list of ModuleA"]
+            (T.unlines
+                    [ "module ModuleB where"
+                    , "import ModuleA(Foo)"
+                    , "f :: Foo"
+                    , "f = undefined"
+                    ])
+        ]
+      where
+        codeActionTitle CodeAction{_title=x} = x
+
+        template setUpModules moduleUnderTest range expectedTitles expectedContentB = do
+            configureCheckProject overrideCheckProject
+
+            mapM_ (\x -> createDoc (fst x) "haskell" (snd x)) setUpModules
+            docB <- createDoc (fst moduleUnderTest) "haskell" (snd moduleUnderTest)
+            _  <- waitForDiagnostics
+            waitForProgressDone
+            actionsOrCommands <- getCodeActions docB range
+            let codeActions =
+                  filter
+                    (T.isPrefixOf "Add" . codeActionTitle)
+                    [ca | InR ca <- actionsOrCommands]
+                actualTitles = codeActionTitle <$> codeActions
+            -- Note that we are not testing the order of the actions, as the
+            -- order of the expected actions indicates which one we'll execute
+            -- in this test, i.e., the first one.
+            liftIO $ sort expectedTitles @=? sort actualTitles
+
+            -- Execute the action with the same title as the first expected one.
+            -- Since we tested that both lists have the same elements (possibly
+            -- in a different order), this search cannot fail.
+            let firstTitle:_ = expectedTitles
+                action = fromJust $
+                  find ((firstTitle ==) . codeActionTitle) codeActions
+            executeCodeAction action
+            contentAfterAction <- documentContents docB
+            liftIO $ expectedContentB @=? contentAfterAction
+
+fixModuleImportTypoTests :: TestTree
+fixModuleImportTypoTests = testGroup "fix module import typo"
+    [ testSession "works when single module suggested" $ do
+        doc <- createDoc "A.hs" "haskell" "import Data.Cha"
+        _ <- waitForDiagnostics
+        InR action@CodeAction { _title = actionTitle } : _  <- getCodeActions doc (R 0 0 0 10)
+        liftIO $ actionTitle @?= "replace with Data.Char"
+        executeCodeAction action
+        contentAfterAction <- documentContents doc
+        liftIO $ contentAfterAction @?= "import Data.Char"
+    , testSession "works when multiple modules suggested" $ do
+        doc <- createDoc "A.hs" "haskell" "import Data.I"
+        _ <- waitForDiagnostics
+        actions <- sortOn (\(InR CodeAction{_title=x}) -> x) <$> getCodeActions doc (R 0 0 0 10)
+        let actionTitles = [ title | InR CodeAction{_title=title} <- actions ]
+        liftIO $ actionTitles @?= [ "replace with Data.Eq"
+                                  , "replace with Data.Int"
+                                  , "replace with Data.Ix"
+                                  ]
+        let InR replaceWithDataEq : _ = actions
+        executeCodeAction replaceWithDataEq
+        contentAfterAction <- documentContents doc
+        liftIO $ contentAfterAction @?= "import Data.Eq"
+    ]
+
+suggestImportClassMethodTests :: TestTree
+suggestImportClassMethodTests =
+  testGroup
+    "suggest import class methods"
+    [ testGroup
+        "new"
+        [ testSession "via parent" $
+            template'
+            "import Data.Semigroup (Semigroup(stimes))"
+            (Range (Position 4 2) (Position 4 8)),
+          testSession "top level" $
+            template'
+              "import Data.Semigroup (stimes)"
+              (Range (Position 4 2) (Position 4 8)),
+          testSession "all" $
+            template'
+              "import Data.Semigroup"
+              (Range (Position 4 2) (Position 4 8))
+        ],
+      testGroup
+        "extend"
+        [ testSession "via parent" $
+            template
+              [ "module A where",
+                "",
+                "import Data.Semigroup ()"
+              ]
+              (Range (Position 6 2) (Position 6 8))
+              "Add Semigroup(stimes) to the import list of Data.Semigroup"
+              [ "module A where",
+                "",
+                "import Data.Semigroup (Semigroup (stimes))"
+              ],
+          testSession "top level" $
+            template
+              [ "module A where",
+                "",
+                "import Data.Semigroup ()"
+              ]
+              (Range (Position 6 2) (Position 6 8))
+              "Add stimes to the import list of Data.Semigroup"
+              [ "module A where",
+                "",
+                "import Data.Semigroup (stimes)"
+              ]
+        ]
+    ]
+  where
+    decls =
+      [ "data X = X",
+        "instance Semigroup X where",
+        "  (<>) _ _ = X",
+        "  stimes _ _ = X"
+      ]
+    template beforeContent range executeTitle expectedContent = do
+      doc <- createDoc "A.hs" "haskell" $ T.unlines (beforeContent <> decls)
+      _ <- waitForDiagnostics
+      waitForProgressDone
+      actions <- getCodeActions doc range
+      let actions' = [x | InR x <- actions]
+          titles = [_title | CodeAction {_title} <- actions']
+      liftIO $ executeTitle `elem` titles @? T.unpack executeTitle <> " does not in " <> show titles
+      executeCodeAction $ fromJust $ find (\CodeAction {_title} -> _title == executeTitle) actions'
+      content <- documentContents doc
+      liftIO $ T.unlines (expectedContent <> decls) @=? content
+    template' executeTitle range = let c = ["module A where"] in template c range executeTitle $ c <> [executeTitle]
+
+suggestImportTests :: TestTree
+suggestImportTests = testGroup "suggest import actions"
+  [ testGroup "Dont want suggestion"
+    [ -- extend import
+      test False ["Data.List.NonEmpty ()"] "f = nonEmpty" []                "import Data.List.NonEmpty (nonEmpty)"
+      -- data constructor
+    , test False []                        "f = First"    []                "import Data.Monoid (First)"
+      -- internal module
+    , test False []         "f :: Typeable a => a"        ["f = undefined"] "import Data.Typeable.Internal (Typeable)"
+      -- package not in scope
+    , test False []         "f = quickCheck"              []                "import Test.QuickCheck (quickCheck)"
+      -- don't omit the parent data type of a constructor
+    , test False []         "f ExitSuccess = ()"          []                "import System.Exit (ExitSuccess)"
+      -- don't suggest data constructor when we only need the type
+    , test False []         "f :: Bar"                    []                "import Bar (Bar(Bar))"
+      -- don't suggest all data constructors for the data type
+    , test False []         "f :: Bar"                    []                "import Bar (Bar(..))"
+    ]
+  , testGroup "want suggestion"
+    [ wantWait  []          "f = foo"                     []                "import Foo (foo)"
+    , wantWait  []          "f = Bar"                     []                "import Bar (Bar(Bar))"
+    , wantWait  []          "f :: Bar"                    []                "import Bar (Bar)"
+    , wantWait  []          "f = Bar"                     []                "import Bar (Bar(..))"
+    , test True []          "f = nonEmpty"                []                "import Data.List.NonEmpty (nonEmpty)"
+    , test True []          "f = (:|)"                    []                "import Data.List.NonEmpty (NonEmpty((:|)))"
+    , test True []          "f :: Natural"                ["f = undefined"] "import Numeric.Natural (Natural)"
+    , test True []          "f :: Natural"                ["f = undefined"] "import Numeric.Natural"
+    , test True []          "f :: NonEmpty ()"            ["f = () :| []"]  "import Data.List.NonEmpty (NonEmpty)"
+    , test True []          "f :: NonEmpty ()"            ["f = () :| []"]  "import Data.List.NonEmpty"
+    , test True []          "f = First"                   []                "import Data.Monoid (First(First))"
+    , test True []          "f = Endo"                    []                "import Data.Monoid (Endo(Endo))"
+    , test True []          "f = Version"                 []                "import Data.Version (Version(Version))"
+    , test True []          "f ExitSuccess = ()"          []                "import System.Exit (ExitCode(ExitSuccess))"
+    , test True []          "f = AssertionFailed"         []                "import Control.Exception (AssertionFailed(AssertionFailed))"
+    , test True ["Prelude"] "f = nonEmpty"                []                "import Data.List.NonEmpty (nonEmpty)"
+    , test True []          "f :: Alternative f => f ()"  ["f = undefined"] "import Control.Applicative (Alternative)"
+    , test True []          "f :: Alternative f => f ()"  ["f = undefined"] "import Control.Applicative"
+    , test True []          "f = empty"                   []                "import Control.Applicative (Alternative(empty))"
+    , test True []          "f = empty"                   []                "import Control.Applicative (empty)"
+    , test True []          "f = empty"                   []                "import Control.Applicative"
+    , test True []          "f = (&)"                     []                "import Data.Function ((&))"
+    , test True []          "f = NE.nonEmpty"             []                "import qualified Data.List.NonEmpty as NE"
+    , test True []          "f = Data.List.NonEmpty.nonEmpty" []            "import qualified Data.List.NonEmpty"
+    , test True []          "f :: Typeable a => a"        ["f = undefined"] "import Data.Typeable (Typeable)"
+    , test True []          "f = pack"                    []                "import Data.Text (pack)"
+    , test True []          "f :: Text"                   ["f = undefined"] "import Data.Text (Text)"
+    , test True []          "f = [] & id"                 []                "import Data.Function ((&))"
+    , test True []          "f = (&) [] id"               []                "import Data.Function ((&))"
+    , test True []          "f = (.|.)"                   []                "import Data.Bits (Bits((.|.)))"
+    , test True []          "f = (.|.)"                   []                "import Data.Bits ((.|.))"
+    , test True []          "f :: a ~~ b"                 []                "import Data.Type.Equality (type (~~))"
+    , test True
+      ["qualified Data.Text as T"
+      ]                     "f = T.putStrLn"              []                "import qualified Data.Text.IO as T"
+    , test True
+      [ "qualified Data.Text as T"
+      , "qualified Data.Function as T"
+      ]                     "f = T.putStrLn"              []                "import qualified Data.Text.IO as T"
+    , test True
+      [ "qualified Data.Text as T"
+      , "qualified Data.Function as T"
+      , "qualified Data.Functor as T"
+      , "qualified Data.Data as T"
+      ]                     "f = T.putStrLn"              []                "import qualified Data.Text.IO as T"
+    , test True []          "f = (.|.)"                   []                "import Data.Bits (Bits(..))"
+    , test True []          "f = empty"                   []                "import Control.Applicative (Alternative(..))"
+    ]
+  , expectFailBecause "importing pattern synonyms is unsupported" $ test True [] "k (Some x) = x" [] "import B (pattern Some)"
+  ]
+  where
+    test = test' False
+    wantWait = test' True True
+
+    test' waitForCheckProject wanted imps def other newImp = testSessionWithExtraFiles "hover" (T.unpack def) $ \dir -> do
+      configureCheckProject waitForCheckProject
+      let before = T.unlines $ "module A where" : ["import " <> x | x <- imps] ++ def : other
+          after  = T.unlines $ "module A where" : ["import " <> x | x <- imps] ++ [newImp] ++ def : other
+          cradle = "cradle: {direct: {arguments: [-hide-all-packages, -package, base, -package, text, -package-env, -, A, Bar, Foo, B]}}"
+      liftIO $ writeFileUTF8 (dir </> "hie.yaml") cradle
+      liftIO $ writeFileUTF8 (dir </> "B.hs") $ unlines ["{-# LANGUAGE PatternSynonyms #-}", "module B where", "pattern Some x = Just x"]
+      doc <- createDoc "Test.hs" "haskell" before
+      waitForProgressDone
+      _ <- waitForDiagnostics
+      -- there isn't a good way to wait until the whole project is checked atm
+      when waitForCheckProject $ liftIO $ sleep 0.5
+      let defLine = fromIntegral $ length imps + 1
+          range = Range (Position defLine 0) (Position defLine maxBound)
+      actions <- getCodeActions doc range
+      if wanted
+         then do
+             action <- liftIO $ pickActionWithTitle newImp actions
+             executeCodeAction action
+             contentAfterAction <- documentContents doc
+             liftIO $ after @=? contentAfterAction
+          else
+              liftIO $ [_title | InR CodeAction{_title} <- actions, _title == newImp ] @?= []
+
+suggestImportDisambiguationTests :: TestTree
+suggestImportDisambiguationTests = testGroup "suggest import disambiguation actions"
+  [ testGroup "Hiding strategy works"
+    [ testGroup "fromList"
+        [ testCase "AVec" $
+            compareHideFunctionTo [(8,9),(10,8)]
+                "Use AVec for fromList, hiding other imports"
+                "HideFunction.expected.fromList.A.hs"
+        , testCase "BVec" $
+            compareHideFunctionTo [(8,9),(10,8)]
+                "Use BVec for fromList, hiding other imports"
+                "HideFunction.expected.fromList.B.hs"
+        ]
+    , testGroup "(++)"
+        [ testCase "EVec" $
+            compareHideFunctionTo [(8,9),(10,8)]
+                "Use EVec for ++, hiding other imports"
+                "HideFunction.expected.append.E.hs"
+        , testCase "Hide functions without local" $
+            compareTwo
+                "HideFunctionWithoutLocal.hs" [(8,8)]
+                "Use local definition for ++, hiding other imports"
+                "HideFunctionWithoutLocal.expected.hs"
+        , testCase "Prelude" $
+            compareHideFunctionTo [(8,9),(10,8)]
+                "Use Prelude for ++, hiding other imports"
+                "HideFunction.expected.append.Prelude.hs"
+        , testCase "Prelude and local definition, infix" $
+            compareTwo
+                "HidePreludeLocalInfix.hs" [(2,19)]
+                "Use local definition for ++, hiding other imports"
+                "HidePreludeLocalInfix.expected.hs"
+        , testCase "AVec, indented" $
+            compareTwo "HidePreludeIndented.hs" [(3,8)]
+            "Use AVec for ++, hiding other imports"
+            "HidePreludeIndented.expected.hs"
+
+        ]
+    , testGroup "Vec (type)"
+        [ testCase "AVec" $
+            compareTwo
+                "HideType.hs" [(8,15)]
+                "Use AVec for Vec, hiding other imports"
+                "HideType.expected.A.hs"
+        , testCase "EVec" $
+            compareTwo
+                "HideType.hs" [(8,15)]
+                "Use EVec for Vec, hiding other imports"
+                "HideType.expected.E.hs"
+        ]
+    ]
+  , testGroup "Qualify strategy"
+    [ testCase "won't suggest full name for qualified module" $
+      withHideFunction [(8,9),(10,8)] $ \_ _ actions -> do
+        liftIO $
+            assertBool "EVec.fromList must not be suggested" $
+                "Replace with qualified: EVec.fromList" `notElem`
+                [ actionTitle
+                | InR CodeAction { _title = actionTitle } <- actions
+                ]
+        liftIO $
+            assertBool "EVec.++ must not be suggested" $
+                "Replace with qualified: EVec.++" `notElem`
+                [ actionTitle
+                | InR CodeAction { _title = actionTitle } <- actions
+                ]
+    , testGroup "fromList"
+        [ testCase "EVec" $
+            compareHideFunctionTo [(8,9),(10,8)]
+                "Replace with qualified: E.fromList"
+                "HideFunction.expected.qualified.fromList.E.hs"
+        , testCase "Hide DuplicateRecordFields" $
+            compareTwo
+                "HideQualifyDuplicateRecordFields.hs" [(9, 9)]
+                "Replace with qualified: AVec.fromList"
+                "HideQualifyDuplicateRecordFields.expected.hs"
+        , testCase "Duplicate record fields should not be imported" $ do
+          withTarget ("HideQualifyDuplicateRecordFields" <.> ".hs") [(9, 9)] $
+            \_ _ actions -> do
+              liftIO $
+                assertBool "Hidings should not be presented while DuplicateRecordFields exists" $
+                  all not [ actionTitle =~ T.pack "Use ([A-Za-z][A-Za-z0-9]*) for fromList, hiding other imports"
+                      | InR CodeAction { _title = actionTitle } <- actions]
+          withTarget ("HideQualifyDuplicateRecordFieldsSelf" <.> ".hs") [(4, 4)] $
+            \_ _ actions -> do
+              liftIO $
+                assertBool "ambiguity from DuplicateRecordFields should not be imported" $
+                  null actions
+        ]
+    , testGroup "(++)"
+        [ testCase "Prelude, parensed" $
+            compareHideFunctionTo [(8,9),(10,8)]
+                "Replace with qualified: Prelude.++"
+                "HideFunction.expected.qualified.append.Prelude.hs"
+        , testCase "Prelude, infix" $
+            compareTwo
+                "HideQualifyInfix.hs" [(4,19)]
+                "Replace with qualified: Prelude.++"
+                "HideQualifyInfix.expected.hs"
+        , testCase "Prelude, left section" $
+            compareTwo
+                "HideQualifySectionLeft.hs" [(4,15)]
+                "Replace with qualified: Prelude.++"
+                "HideQualifySectionLeft.expected.hs"
+        , testCase "Prelude, right section" $
+            compareTwo
+                "HideQualifySectionRight.hs" [(4,18)]
+                "Replace with qualified: Prelude.++"
+                "HideQualifySectionRight.expected.hs"
+        ]
+    ]
+  ]
+  where
+    compareTwo original locs cmd expected =
+        withTarget original locs $ \dir doc actions -> do
+            expected <- liftIO $
+                readFileUtf8 (dir </> expected)
+            action <- liftIO $ pickActionWithTitle cmd actions
+            executeCodeAction action
+            contentAfterAction <- documentContents doc
+            liftIO $ T.replace "\r\n" "\n" expected @=? contentAfterAction
+    compareHideFunctionTo = compareTwo "HideFunction.hs"
+    auxFiles = ["AVec.hs", "BVec.hs", "CVec.hs", "DVec.hs", "EVec.hs", "FVec.hs"]
+    withTarget file locs k = runWithExtraFiles "hiding" $ \dir -> do
+        doc <- openDoc file "haskell"
+        waitForProgressDone
+        void $ expectDiagnostics [(file, [(DsError, loc, "Ambiguous occurrence") | loc <- locs])]
+        actions <- getAllCodeActions doc
+        k dir doc actions
+    withHideFunction = withTarget ("HideFunction" <.> "hs")
+
+suggestHideShadowTests :: TestTree
+suggestHideShadowTests =
+  testGroup
+    "suggest hide shadow"
+    [ testGroup
+        "single"
+        [ testOneCodeAction
+            "hide unsued"
+            "Hide on from Data.Function"
+            (1, 2)
+            (1, 4)
+            [ "import Data.Function"
+            , "f on = on"
+            , "g on = on"
+            ]
+            [ "import Data.Function hiding (on)"
+            , "f on = on"
+            , "g on = on"
+            ]
+        , testOneCodeAction
+            "extend hiding unsued"
+            "Hide on from Data.Function"
+            (1, 2)
+            (1, 4)
+            [ "import Data.Function hiding ((&))"
+            , "f on = on"
+            ]
+            [ "import Data.Function hiding (on, (&))"
+            , "f on = on"
+            ]
+        , testOneCodeAction
+            "delete unsued"
+            "Hide on from Data.Function"
+            (1, 2)
+            (1, 4)
+            [ "import Data.Function ((&), on)"
+            , "f on = on"
+            ]
+            [ "import Data.Function ((&))"
+            , "f on = on"
+            ]
+        , testOneCodeAction
+            "hide operator"
+            "Hide & from Data.Function"
+            (1, 2)
+            (1, 5)
+            [ "import Data.Function"
+            , "f (&) = (&)"
+            ]
+            [ "import Data.Function hiding ((&))"
+            , "f (&) = (&)"
+            ]
+        , testOneCodeAction
+            "remove operator"
+            "Hide & from Data.Function"
+            (1, 2)
+            (1, 5)
+            [ "import Data.Function ((&), on)"
+            , "f (&) = (&)"
+            ]
+            [ "import Data.Function ( on)"
+            , "f (&) = (&)"
+            ]
+        , noCodeAction
+            "don't remove already used"
+            (2, 2)
+            (2, 4)
+            [ "import Data.Function"
+            , "g = on"
+            , "f on = on"
+            ]
+        ]
+    , testGroup
+        "multi"
+        [ testOneCodeAction
+            "hide from B"
+            "Hide ++ from B"
+            (2, 2)
+            (2, 6)
+            [ "import B"
+            , "import C"
+            , "f (++) = (++)"
+            ]
+            [ "import B hiding ((++))"
+            , "import C"
+            , "f (++) = (++)"
+            ]
+        , testOneCodeAction
+            "hide from C"
+            "Hide ++ from C"
+            (2, 2)
+            (2, 6)
+            [ "import B"
+            , "import C"
+            , "f (++) = (++)"
+            ]
+            [ "import B"
+            , "import C hiding ((++))"
+            , "f (++) = (++)"
+            ]
+        , testOneCodeAction
+            "hide from Prelude"
+            "Hide ++ from Prelude"
+            (2, 2)
+            (2, 6)
+            [ "import B"
+            , "import C"
+            , "f (++) = (++)"
+            ]
+            [ "import B"
+            , "import C"
+            , "import Prelude hiding ((++))"
+            , "f (++) = (++)"
+            ]
+        , testMultiCodeActions
+            "manual hide all"
+            [ "Hide ++ from Prelude"
+            , "Hide ++ from C"
+            , "Hide ++ from B"
+            ]
+            (2, 2)
+            (2, 6)
+            [ "import B"
+            , "import C"
+            , "f (++) = (++)"
+            ]
+            [ "import B hiding ((++))"
+            , "import C hiding ((++))"
+            , "import Prelude hiding ((++))"
+            , "f (++) = (++)"
+            ]
+        , testOneCodeAction
+            "auto hide all"
+            "Hide ++ from all occurence imports"
+            (2, 2)
+            (2, 6)
+            [ "import B"
+            , "import C"
+            , "f (++) = (++)"
+            ]
+            [ "import B hiding ((++))"
+            , "import C hiding ((++))"
+            , "import Prelude hiding ((++))"
+            , "f (++) = (++)"
+            ]
+        ]
+    ]
+ where
+  testOneCodeAction testName actionName start end origin expected =
+    helper testName start end origin expected $ \cas -> do
+      action <- liftIO $ pickActionWithTitle actionName cas
+      executeCodeAction action
+  noCodeAction testName start end origin =
+    helper testName start end origin origin $ \cas -> do
+      liftIO $ cas @?= []
+  testMultiCodeActions testName actionNames start end origin expected =
+    helper testName start end origin expected $ \cas -> do
+      let r = [ca | (InR ca) <- cas, ca ^. L.title `elem` actionNames]
+      liftIO $
+        (length r == length actionNames)
+          @? "Expected " <> show actionNames <> ", but got " <> show cas <> " which is not its superset"
+      forM_ r executeCodeAction
+  helper testName (line1, col1) (line2, col2) origin expected k = testSession testName $ do
+    void $ createDoc "B.hs" "haskell" $ T.unlines docB
+    void $ createDoc "C.hs" "haskell" $ T.unlines docC
+    doc <- createDoc "A.hs" "haskell" $ T.unlines (header <> origin)
+    void waitForDiagnostics
+    waitForProgressDone
+    cas <- getCodeActions doc (Range (Position (fromIntegral $ line1 + length header) col1) (Position (fromIntegral $ line2 + length header) col2))
+    void $ k [x | x@(InR ca) <- cas, "Hide" `T.isPrefixOf` (ca ^. L.title)]
+    contentAfter <- documentContents doc
+    liftIO $ contentAfter @?= T.unlines (header <> expected)
+  header =
+    [ "{-# OPTIONS_GHC -Wname-shadowing #-}"
+    , "module A where"
+    , ""
+    ]
+  -- for multi group
+  docB =
+    [ "module B where"
+    , "(++) = id"
+    ]
+  docC =
+    [ "module C where"
+    , "(++) = id"
+    ]
+
+insertNewDefinitionTests :: TestTree
+insertNewDefinitionTests = testGroup "insert new definition actions"
+  [ testSession "insert new function definition" $ do
+      let txtB =
+            ["foo True = select [True]"
+            , ""
+            ,"foo False = False"
+            ]
+          txtB' =
+            [""
+            ,"someOtherCode = ()"
+            ]
+      docB <- createDoc "ModuleB.hs" "haskell" (T.unlines $ txtB ++ txtB')
+      _ <- waitForDiagnostics
+      InR action@CodeAction { _title = actionTitle } : _
+                  <- sortOn (\(InR CodeAction{_title=x}) -> x) <$>
+                     getCodeActions docB (R 0 0 0 50)
+      liftIO $ actionTitle @?= "Define select :: [Bool] -> Bool"
+      executeCodeAction action
+      contentAfterAction <- documentContents docB
+      liftIO $ contentAfterAction @?= T.unlines (txtB ++
+        [ ""
+        , "select :: [Bool] -> Bool"
+        , "select = _"
+        ]
+        ++ txtB')
+  , testSession "define a hole" $ do
+      let txtB =
+            ["foo True = _select [True]"
+            , ""
+            ,"foo False = False"
+            ]
+          txtB' =
+            [""
+            ,"someOtherCode = ()"
+            ]
+      docB <- createDoc "ModuleB.hs" "haskell" (T.unlines $ txtB ++ txtB')
+      _ <- waitForDiagnostics
+      InR action@CodeAction { _title = actionTitle } : _
+                  <- sortOn (\(InR CodeAction{_title=x}) -> x) <$>
+                     getCodeActions docB (R 0 0 0 50)
+      liftIO $ actionTitle @?= "Define select :: [Bool] -> Bool"
+      executeCodeAction action
+      contentAfterAction <- documentContents docB
+      liftIO $ contentAfterAction @?= T.unlines (
+        ["foo True = select [True]"
+        , ""
+        ,"foo False = False"
+        , ""
+        , "select :: [Bool] -> Bool"
+        , "select = _"
+        ]
+        ++ txtB')
+  , testSession "insert new function definition - Haddock comments" $ do
+    let start =  ["foo :: Int -> Bool"
+                 , "foo x = select (x + 1)"
+                 , ""
+                 , "-- | This is a haddock comment"
+                 , "haddock :: Int -> Int"
+                 , "haddock = undefined"
+                 ]
+    let expected =  ["foo :: Int -> Bool"
+             , "foo x = select (x + 1)"
+             , ""
+             , "select :: Int -> Bool"
+             , "select = _"
+             , ""
+             , "-- | This is a haddock comment"
+             , "haddock :: Int -> Int"
+             , "haddock = undefined"]
+    docB <- createDoc "ModuleB.hs" "haskell" (T.unlines start)
+    _ <- waitForDiagnostics
+    InR action@CodeAction { _title = actionTitle } : _
+                <- sortOn (\(InR CodeAction{_title=x}) -> x) <$>
+                    getCodeActions docB (R 1 0 0 50)
+    liftIO $ actionTitle @?= "Define select :: Int -> Bool"
+    executeCodeAction action
+    contentAfterAction <- documentContents docB
+    liftIO $ contentAfterAction @?= T.unlines expected
+  , testSession "insert new function definition - normal comments" $ do
+    let start =  ["foo :: Int -> Bool"
+                 , "foo x = select (x + 1)"
+                 , ""
+                 , "-- This is a normal comment"
+                 , "normal :: Int -> Int"
+                 , "normal = undefined"
+                 ]
+    let expected =  ["foo :: Int -> Bool"
+             , "foo x = select (x + 1)"
+             , ""
+             , "select :: Int -> Bool"
+             , "select = _"
+             , ""
+             , "-- This is a normal comment"
+             , "normal :: Int -> Int"
+             , "normal = undefined"]
+    docB <- createDoc "ModuleB.hs" "haskell" (T.unlines start)
+    _ <- waitForDiagnostics
+    InR action@CodeAction { _title = actionTitle } : _
+                <- sortOn (\(InR CodeAction{_title=x}) -> x) <$>
+                    getCodeActions docB (R 1 0 0 50)
+    liftIO $ actionTitle @?= "Define select :: Int -> Bool"
+    executeCodeAction action
+    contentAfterAction <- documentContents docB
+    liftIO $ contentAfterAction @?= T.unlines expected
+  ]
+
+
+deleteUnusedDefinitionTests :: TestTree
+deleteUnusedDefinitionTests = testGroup "delete unused definition action"
+  [ testSession "delete unused top level binding" $
+    testFor
+    (T.unlines [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+               , "module A (some) where"
+               , ""
+               , "f :: Int -> Int"
+               , "f 1 = let a = 1"
+               , "      in a"
+               , "f 2 = 2"
+               , ""
+               , "some = ()"
+               ])
+    (4, 0)
+    "Delete ‘f’"
+    (T.unlines [
+        "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+        , "module A (some) where"
+        , ""
+        , "some = ()"
+        ])
+
+  , testSession "delete unused top level binding defined in infix form" $
+    testFor
+    (T.unlines [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+               , "module A (some) where"
+               , ""
+               , "myPlus :: Int -> Int -> Int"
+               , "a `myPlus` b = a + b"
+               , ""
+               , "some = ()"
+               ])
+    (4, 2)
+    "Delete ‘myPlus’"
+    (T.unlines [
+        "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+        , "module A (some) where"
+        , ""
+        , "some = ()"
+      ])
+  , testSession "delete unused binding in where clause" $
+    testFor
+    (T.unlines [ "{-# OPTIONS_GHC -Wunused-binds #-}"
+               , "module A (h, g) where"
+               , ""
+               , "h :: Int"
+               , "h = 3"
+               , ""
+               , "g :: Int"
+               , "g = 6"
+               , "  where"
+               , "    h :: Int"
+               , "    h = 4"
+               , ""
+               ])
+    (10, 4)
+    "Delete ‘h’"
+    (T.unlines [ "{-# OPTIONS_GHC -Wunused-binds #-}"
+               , "module A (h, g) where"
+               , ""
+               , "h :: Int"
+               , "h = 3"
+               , ""
+               , "g :: Int"
+               , "g = 6"
+               , "  where"
+               , ""
+               ])
+  , testSession "delete unused binding with multi-oneline signatures front" $
+    testFor
+    (T.unlines [ "{-# OPTIONS_GHC -Wunused-binds #-}"
+               , "module A (b, c) where"
+               , ""
+               , "a, b, c :: Int"
+               , "a = 3"
+               , "b = 4"
+               , "c = 5"
+               ])
+    (4, 0)
+    "Delete ‘a’"
+    (T.unlines [ "{-# OPTIONS_GHC -Wunused-binds #-}"
+               , "module A (b, c) where"
+               , ""
+               , "b, c :: Int"
+               , "b = 4"
+               , "c = 5"
+               ])
+  , testSession "delete unused binding with multi-oneline signatures mid" $
+    testFor
+    (T.unlines [ "{-# OPTIONS_GHC -Wunused-binds #-}"
+               , "module A (a, c) where"
+               , ""
+               , "a, b, c :: Int"
+               , "a = 3"
+               , "b = 4"
+               , "c = 5"
+               ])
+    (5, 0)
+    "Delete ‘b’"
+    (T.unlines [ "{-# OPTIONS_GHC -Wunused-binds #-}"
+               , "module A (a, c) where"
+               , ""
+               , "a, c :: Int"
+               , "a = 3"
+               , "c = 5"
+               ])
+  , testSession "delete unused binding with multi-oneline signatures end" $
+    testFor
+    (T.unlines [ "{-# OPTIONS_GHC -Wunused-binds #-}"
+               , "module A (a, b) where"
+               , ""
+               , "a, b, c :: Int"
+               , "a = 3"
+               , "b = 4"
+               , "c = 5"
+               ])
+    (6, 0)
+    "Delete ‘c’"
+    (T.unlines [ "{-# OPTIONS_GHC -Wunused-binds #-}"
+               , "module A (a, b) where"
+               , ""
+               , "a, b :: Int"
+               , "a = 3"
+               , "b = 4"
+               ])
+  ]
+  where
+    testFor source pos expectedTitle expectedResult = do
+      docId <- createDoc "A.hs" "haskell" source
+      expectDiagnostics [ ("A.hs", [(DsWarning, pos, "not used")]) ]
+
+      (action, title) <- extractCodeAction docId "Delete" pos
+
+      liftIO $ title @?= expectedTitle
+      executeCodeAction action
+      contentAfterAction <- documentContents docId
+      liftIO $ contentAfterAction @?= expectedResult
+
+    extractCodeAction docId actionPrefix (l, c) = do
+      [action@CodeAction { _title = actionTitle }]  <- findCodeActionsByPrefix docId (R l c l c) [actionPrefix]
+      return (action, actionTitle)
+
+addTypeAnnotationsToLiteralsTest :: TestTree
+addTypeAnnotationsToLiteralsTest = testGroup "add type annotations to literals to satisfy constraints"
+  [
+    testSession "add default type to satisfy one constraint" $
+    testFor
+    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
+               , "module A (f) where"
+               , ""
+               , "f = 1"
+               ])
+    [ (DsWarning, (3, 4), "Defaulting the following constraint") ]
+    "Add type annotation ‘Integer’ to ‘1’"
+    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
+               , "module A (f) where"
+               , ""
+               , "f = (1 :: Integer)"
+               ])
+
+  , testSession "add default type to satisfy one constraint in nested expressions" $
+    testFor
+    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
+               , "module A where"
+               , ""
+               , "f ="
+               , "    let x = 3"
+               , "    in x"
+               ])
+    [ (DsWarning, (4, 12), "Defaulting the following constraint") ]
+    "Add type annotation ‘Integer’ to ‘3’"
+    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
+               , "module A where"
+               , ""
+               , "f ="
+               , "    let x = (3 :: Integer)"
+               , "    in x"
+               ])
+  , testSession "add default type to satisfy one constraint in more nested expressions" $
+    testFor
+    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
+               , "module A where"
+               , ""
+               , "f ="
+               , "    let x = let y = 5 in y"
+               , "    in x"
+               ])
+    [ (DsWarning, (4, 20), "Defaulting the following constraint") ]
+    "Add type annotation ‘Integer’ to ‘5’"
+    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
+               , "module A where"
+               , ""
+               , "f ="
+               , "    let x = let y = (5 :: Integer) in y"
+               , "    in x"
+               ])
+  , testSession "add default type to satisfy one constraint with duplicate literals" $
+    testFor
+    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
+               , "{-# LANGUAGE OverloadedStrings #-}"
+               , "module A (f) where"
+               , ""
+               , "import Debug.Trace"
+               , ""
+               , "f = seq \"debug\" traceShow \"debug\""
+               ])
+    [ (DsWarning, (6, 8), "Defaulting the following constraint")
+    , (DsWarning, (6, 16), "Defaulting the following constraint")
+    ]
+    ("Add type annotation ‘" <> listOfChar <> "’ to ‘\"debug\"’")
+    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
+               , "{-# LANGUAGE OverloadedStrings #-}"
+               , "module A (f) where"
+               , ""
+               , "import Debug.Trace"
+               , ""
+               , "f = seq (\"debug\" :: " <> listOfChar <> ") traceShow \"debug\""
+               ])
+  , knownBrokenForGhcVersions [GHC92] "GHC 9.2 only has 'traceShow' in error span" $
+    testSession "add default type to satisfy two constraints" $
+    testFor
+    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
+               , "{-# LANGUAGE OverloadedStrings #-}"
+               , "module A (f) where"
+               , ""
+               , "import Debug.Trace"
+               , ""
+               , "f a = traceShow \"debug\" a"
+               ])
+    [ (DsWarning, (6, 6), "Defaulting the following constraint") ]
+    ("Add type annotation ‘" <> listOfChar <> "’ to ‘\"debug\"’")
+    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
+               , "{-# LANGUAGE OverloadedStrings #-}"
+               , "module A (f) where"
+               , ""
+               , "import Debug.Trace"
+               , ""
+               , "f a = traceShow (\"debug\" :: " <> listOfChar <> ") a"
+               ])
+  , knownBrokenForGhcVersions [GHC92] "GHC 9.2 only has 'traceShow' in error span" $
+    testSession "add default type to satisfy two constraints with duplicate literals" $
+    testFor
+    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
+               , "{-# LANGUAGE OverloadedStrings #-}"
+               , "module A (f) where"
+               , ""
+               , "import Debug.Trace"
+               , ""
+               , "f = seq (\"debug\" :: [Char]) (seq (\"debug\" :: [Char]) (traceShow \"debug\"))"
+               ])
+    [ (DsWarning, (6, 54), "Defaulting the following constraint") ]
+    ("Add type annotation ‘" <> listOfChar <> "’ to ‘\"debug\"’")
+    (T.unlines [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
+               , "{-# LANGUAGE OverloadedStrings #-}"
+               , "module A (f) where"
+               , ""
+               , "import Debug.Trace"
+               , ""
+               , "f = seq (\"debug\" :: [Char]) (seq (\"debug\" :: [Char]) (traceShow (\"debug\" :: " <> listOfChar <> ")))"
+               ])
+  ]
+  where
+    testFor source diag expectedTitle expectedResult = do
+      docId <- createDoc "A.hs" "haskell" source
+      expectDiagnostics [ ("A.hs", diag) ]
+
+      let cursors = map snd3 diag
+      (action, title) <- extractCodeAction docId "Add type annotation" (minimum cursors) (maximum cursors)
+
+      liftIO $ title @?= expectedTitle
+      executeCodeAction action
+      contentAfterAction <- documentContents docId
+      liftIO $ contentAfterAction @?= expectedResult
+
+    extractCodeAction docId actionPrefix (l,c) (l', c')= do
+      [action@CodeAction { _title = actionTitle }]  <- findCodeActionsByPrefix docId (R l c l' c') [actionPrefix]
+      return (action, actionTitle)
+
+
+fixConstructorImportTests :: TestTree
+fixConstructorImportTests = testGroup "fix import actions"
+  [ testSession "fix constructor import" $ template
+      (T.unlines
+            [ "module ModuleA where"
+            , "data A = Constructor"
+            ])
+      (T.unlines
+            [ "module ModuleB where"
+            , "import ModuleA(Constructor)"
+            ])
+      (Range (Position 1 10) (Position 1 11))
+      "Fix import of A(Constructor)"
+      (T.unlines
+            [ "module ModuleB where"
+            , "import ModuleA(A(Constructor))"
+            ])
+  ]
+  where
+    template contentA contentB range expectedAction expectedContentB = do
+      _docA <- createDoc "ModuleA.hs" "haskell" contentA
+      docB  <- createDoc "ModuleB.hs" "haskell" contentB
+      _diags <- waitForDiagnostics
+      InR action@CodeAction { _title = actionTitle } : _
+                  <- sortOn (\(InR CodeAction{_title=x}) -> x) <$>
+                     getCodeActions docB range
+      liftIO $ expectedAction @=? actionTitle
+      executeCodeAction action
+      contentAfterAction <- documentContents docB
+      liftIO $ expectedContentB @=? contentAfterAction
+
+importRenameActionTests :: TestTree
+importRenameActionTests = testGroup "import rename actions"
+  [ testSession "Data.Mape -> Data.Map"   $ check "Map"
+  , testSession "Data.Mape -> Data.Maybe" $ check "Maybe" ] where
+  check modname = do
+      let content = T.unlines
+            [ "module Testing where"
+            , "import Data.Mape"
+            ]
+      doc <- createDoc "Testing.hs" "haskell" content
+      _ <- waitForDiagnostics
+      actionsOrCommands <- getCodeActions doc (Range (Position 1 8) (Position 1 16))
+      let [changeToMap] = [action | InR action@CodeAction{ _title = actionTitle } <- actionsOrCommands, ("Data." <> modname) `T.isInfixOf` actionTitle ]
+      executeCodeAction changeToMap
+      contentAfterAction <- documentContents doc
+      let expectedContentAfterAction = T.unlines
+            [ "module Testing where"
+            , "import Data." <> modname
+            ]
+      liftIO $ expectedContentAfterAction @=? contentAfterAction
+
+fillTypedHoleTests :: TestTree
+fillTypedHoleTests = let
+
+  sourceCode :: T.Text -> T.Text -> T.Text -> T.Text
+  sourceCode a b c = T.unlines
+    [ "module Testing where"
+      , ""
+      , "globalConvert :: Int -> String"
+      , "globalConvert = undefined"
+      , ""
+      , "globalInt :: Int"
+      , "globalInt = 3"
+      , ""
+      , "bar :: Int -> Int -> String"
+      , "bar n parameterInt = " <> a <> " (n + " <> b <> " + " <> c <> ")  where"
+      , "  localConvert = (flip replicate) 'x'"
+      , ""
+      , "foo :: () -> Int -> String"
+      , "foo = undefined"
+
+    ]
+
+  check :: T.Text -> T.Text -> T.Text -> T.Text -> T.Text -> T.Text -> T.Text -> TestTree
+  check actionTitle
+        oldA oldB oldC
+        newA newB newC = testSession (T.unpack actionTitle) $ do
+    let originalCode = sourceCode oldA oldB oldC
+    let expectedCode = sourceCode newA newB newC
+    doc <- createDoc "Testing.hs" "haskell" originalCode
+    _ <- waitForDiagnostics
+    actionsOrCommands <- getCodeActions doc (Range (Position 9 0) (Position 9 maxBound))
+    chosenAction <- liftIO $ pickActionWithTitle actionTitle actionsOrCommands
+    executeCodeAction chosenAction
+    modifiedCode <- documentContents doc
+    liftIO $ expectedCode @=? modifiedCode
+  in
+  testGroup "fill typed holes"
+  [ check "replace _ with show"
+          "_"    "n" "n"
+          "show" "n" "n"
+
+  , check "replace _ with globalConvert"
+          "_"             "n" "n"
+          "globalConvert" "n" "n"
+
+  , check "replace _convertme with localConvert"
+          "_convertme"   "n" "n"
+          "localConvert" "n" "n"
+
+  , check "replace _b with globalInt"
+          "_a" "_b"        "_c"
+          "_a" "globalInt" "_c"
+
+  , check "replace _c with globalInt"
+          "_a" "_b"        "_c"
+          "_a" "_b" "globalInt"
+
+  , check "replace _c with parameterInt"
+          "_a" "_b" "_c"
+          "_a" "_b"  "parameterInt"
+  , check "replace _ with foo _"
+          "_" "n" "n"
+          "(foo _)" "n" "n"
+  , testSession "replace _toException with E.toException" $ do
+      let mkDoc x = T.unlines
+            [ "module Testing where"
+            , "import qualified Control.Exception as E"
+            , "ioToSome :: E.IOException -> E.SomeException"
+            , "ioToSome = " <> x ]
+      doc <- createDoc "Test.hs" "haskell" $ mkDoc "_toException"
+      _ <- waitForDiagnostics
+      actions <- getCodeActions doc (Range (Position 3 0) (Position 3 maxBound))
+      chosen <- liftIO $ pickActionWithTitle "replace _toException with E.toException" actions
+      executeCodeAction chosen
+      modifiedCode <- documentContents doc
+      liftIO $ mkDoc "E.toException" @=? modifiedCode
+  , testSession "filling infix type hole uses prefix notation" $ do
+      let mkDoc x = T.unlines
+              [ "module Testing where"
+              , "data A = A"
+              , "foo :: A -> A -> A"
+              , "foo A A = A"
+              , "test :: A -> A -> A"
+              , "test a1 a2 = a1 " <> x <> " a2"
+              ]
+      doc <- createDoc "Test.hs" "haskell" $ mkDoc "`_`"
+      _ <- waitForDiagnostics
+      actions <- getCodeActions doc (Range (Position 5 16) (Position 5 19))
+      chosen <- liftIO $ pickActionWithTitle "replace _ with foo" actions
+      executeCodeAction chosen
+      modifiedCode <- documentContents doc
+      liftIO $ mkDoc "`foo`" @=? modifiedCode
+  , testSession "postfix hole uses postfix notation of infix operator" $ do
+      let mkDoc x = T.unlines
+              [ "module Testing where"
+              , "test :: Int -> Int -> Int"
+              , "test a1 a2 = " <> x <> " a1 a2"
+              ]
+      doc <- createDoc "Test.hs" "haskell" $ mkDoc "_"
+      _ <- waitForDiagnostics
+      actions <- getCodeActions doc (Range (Position 2 13) (Position 2 14))
+      chosen <- liftIO $ pickActionWithTitle "replace _ with (+)" actions
+      executeCodeAction chosen
+      modifiedCode <- documentContents doc
+      liftIO $ mkDoc "(+)" @=? modifiedCode
+  , testSession "filling infix type hole uses infix operator" $ do
+      let mkDoc x = T.unlines
+              [ "module Testing where"
+              , "test :: Int -> Int -> Int"
+              , "test a1 a2 = a1 " <> x <> " a2"
+              ]
+      doc <- createDoc "Test.hs" "haskell" $ mkDoc "`_`"
+      _ <- waitForDiagnostics
+      actions <- getCodeActions doc (Range (Position 2 16) (Position 2 19))
+      chosen <- liftIO $ pickActionWithTitle "replace _ with (+)" actions
+      executeCodeAction chosen
+      modifiedCode <- documentContents doc
+      liftIO $ mkDoc "+" @=? modifiedCode
+  ]
+
+addInstanceConstraintTests :: TestTree
+addInstanceConstraintTests = let
+  missingConstraintSourceCode :: Maybe T.Text -> T.Text
+  missingConstraintSourceCode mConstraint =
+    let constraint = maybe "" (<> " => ") mConstraint
+     in T.unlines
+    [ "module Testing where"
+    , ""
+    , "data Wrap a = Wrap a"
+    , ""
+    , "instance " <> constraint <> "Eq (Wrap a) where"
+    , "  (Wrap x) == (Wrap y) = x == y"
+    ]
+
+  incompleteConstraintSourceCode :: Maybe T.Text -> T.Text
+  incompleteConstraintSourceCode mConstraint =
+    let constraint = maybe "Eq a" (\c -> "(Eq a, " <> c <> ")")  mConstraint
+     in T.unlines
+    [ "module Testing where"
+    , ""
+    , "data Pair a b = Pair a b"
+    , ""
+    , "instance " <> constraint <> " => Eq (Pair a b) where"
+    , "  (Pair x y) == (Pair x' y') = x == x' && y == y'"
+    ]
+
+  incompleteConstraintSourceCode2 :: Maybe T.Text -> T.Text
+  incompleteConstraintSourceCode2 mConstraint =
+    let constraint = maybe "(Eq a, Eq b)" (\c -> "(Eq a, Eq b, " <> c <> ")")  mConstraint
+     in T.unlines
+    [ "module Testing where"
+    , ""
+    , "data Three a b c = Three a b c"
+    , ""
+    , "instance " <> constraint <> " => Eq (Three a b c) where"
+    , "  (Three x y z) == (Three x' y' z') = x == x' && y == y' && z == z'"
+    ]
+
+  check :: T.Text -> T.Text -> T.Text -> TestTree
+  check actionTitle originalCode expectedCode = testSession (T.unpack actionTitle) $ do
+    doc <- createDoc "Testing.hs" "haskell" originalCode
+    _ <- waitForDiagnostics
+    actionsOrCommands <- getAllCodeActions doc
+    chosenAction <- liftIO $ pickActionWithTitle actionTitle actionsOrCommands
+    executeCodeAction chosenAction
+    modifiedCode <- documentContents doc
+    liftIO $ expectedCode @=? modifiedCode
+
+  in testGroup "add instance constraint"
+  [ check
+    "Add `Eq a` to the context of the instance declaration"
+    (missingConstraintSourceCode Nothing)
+    (missingConstraintSourceCode $ Just "Eq a")
+  , check
+    "Add `Eq b` to the context of the instance declaration"
+    (incompleteConstraintSourceCode Nothing)
+    (incompleteConstraintSourceCode $ Just "Eq b")
+  , check
+    "Add `Eq c` to the context of the instance declaration"
+    (incompleteConstraintSourceCode2 Nothing)
+    (incompleteConstraintSourceCode2 $ Just "Eq c")
+  ]
+
+addFunctionConstraintTests :: TestTree
+addFunctionConstraintTests = let
+  missingConstraintSourceCode :: T.Text -> T.Text
+  missingConstraintSourceCode constraint =
+    T.unlines
+    [ "module Testing where"
+    , ""
+    , "eq :: " <> constraint <> "a -> a -> Bool"
+    , "eq x y = x == y"
+    ]
+
+  missingConstraintWithForAllSourceCode :: T.Text -> T.Text
+  missingConstraintWithForAllSourceCode constraint =
+    T.unlines
+    [ "{-# LANGUAGE ExplicitForAll #-}"
+    , "module Testing where"
+    , ""
+    , "eq :: forall a. " <> constraint <> "a -> a -> Bool"
+    , "eq x y = x == y"
+    ]
+
+  incompleteConstraintWithForAllSourceCode :: T.Text -> T.Text
+  incompleteConstraintWithForAllSourceCode constraint =
+    T.unlines
+    [ "{-# LANGUAGE ExplicitForAll #-}"
+    , "module Testing where"
+    , ""
+    , "data Pair a b = Pair a b"
+    , ""
+    , "eq :: " <> constraint <> " => Pair a b -> Pair a b -> Bool"
+    , "eq (Pair x y) (Pair x' y') = x == x' && y == y'"
+    ]
+
+  incompleteConstraintSourceCode :: T.Text -> T.Text
+  incompleteConstraintSourceCode constraint =
+    T.unlines
+    [ "module Testing where"
+    , ""
+    , "data Pair a b = Pair a b"
+    , ""
+    , "eq :: " <> constraint <> " => Pair a b -> Pair a b -> Bool"
+    , "eq (Pair x y) (Pair x' y') = x == x' && y == y'"
+    ]
+
+  incompleteConstraintSourceCode2 :: T.Text -> T.Text
+  incompleteConstraintSourceCode2 constraint =
+    T.unlines
+    [ "module Testing where"
+    , ""
+    , "data Three a b c = Three a b c"
+    , ""
+    , "eq :: " <> constraint <> " => Three a b c -> Three a b c -> Bool"
+    , "eq (Three x y z) (Three x' y' z') = x == x' && y == y' && z == z'"
+    ]
+
+  incompleteConstraintSourceCodeWithExtraCharsInContext :: T.Text -> T.Text
+  incompleteConstraintSourceCodeWithExtraCharsInContext constraint =
+    T.unlines
+    [ "module Testing where"
+    , ""
+    , "data Pair a b = Pair a b"
+    , ""
+    , "eq :: ( " <> constraint <> " ) => Pair a b -> Pair a b -> Bool"
+    , "eq (Pair x y) (Pair x' y') = x == x' && y == y'"
+    ]
+
+  incompleteConstraintSourceCodeWithNewlinesInTypeSignature :: T.Text -> T.Text
+  incompleteConstraintSourceCodeWithNewlinesInTypeSignature constraint =
+    T.unlines
+    [ "module Testing where"
+    , "data Pair a b = Pair a b"
+    , "eq "
+    , "    :: (" <> constraint <> ")"
+    , "    => Pair a b -> Pair a b -> Bool"
+    , "eq (Pair x y) (Pair x' y') = x == x' && y == y'"
+    ]
+
+  missingMonadConstraint constraint = T.unlines
+    [ "module Testing where"
+    , "f :: " <> constraint <> "m ()"
+    , "f = do "
+    , "  return ()"
+    ]
+
+  in testGroup "add function constraint"
+  [ checkCodeAction
+    "no preexisting constraint"
+    "Add `Eq a` to the context of the type signature for `eq`"
+    (missingConstraintSourceCode "")
+    (missingConstraintSourceCode "Eq a => ")
+  , checkCodeAction
+    "no preexisting constraint, with forall"
+    "Add `Eq a` to the context of the type signature for `eq`"
+    (missingConstraintWithForAllSourceCode "")
+    (missingConstraintWithForAllSourceCode "Eq a => ")
+  , checkCodeAction
+    "preexisting constraint, no parenthesis"
+    "Add `Eq b` to the context of the type signature for `eq`"
+    (incompleteConstraintSourceCode "Eq a")
+    (incompleteConstraintSourceCode "(Eq a, Eq b)")
+  , checkCodeAction
+    "preexisting constraints in parenthesis"
+    "Add `Eq c` to the context of the type signature for `eq`"
+    (incompleteConstraintSourceCode2 "(Eq a, Eq b)")
+    (incompleteConstraintSourceCode2 "(Eq a, Eq b, Eq c)")
+  , checkCodeAction
+    "preexisting constraints with forall"
+    "Add `Eq b` to the context of the type signature for `eq`"
+    (incompleteConstraintWithForAllSourceCode "Eq a")
+    (incompleteConstraintWithForAllSourceCode "(Eq a, Eq b)")
+  , checkCodeAction
+    "preexisting constraint, with extra spaces in context"
+    "Add `Eq b` to the context of the type signature for `eq`"
+    (incompleteConstraintSourceCodeWithExtraCharsInContext "Eq a")
+    (incompleteConstraintSourceCodeWithExtraCharsInContext "Eq a, Eq b")
+  , checkCodeAction
+    "preexisting constraint, with newlines in type signature"
+    "Add `Eq b` to the context of the type signature for `eq`"
+    (incompleteConstraintSourceCodeWithNewlinesInTypeSignature "Eq a")
+    (incompleteConstraintSourceCodeWithNewlinesInTypeSignature "Eq a, Eq b")
+  , checkCodeAction
+    "missing Monad constraint"
+    "Add `Monad m` to the context of the type signature for `f`"
+    (missingMonadConstraint "")
+    (missingMonadConstraint "Monad m => ")
+  ]
+
+checkCodeAction :: String -> T.Text -> T.Text -> T.Text -> TestTree
+checkCodeAction testName actionTitle originalCode expectedCode = testSession testName $ do
+  doc <- createDoc "Testing.hs" "haskell" originalCode
+  _ <- waitForDiagnostics
+  actionsOrCommands <- getAllCodeActions doc
+  chosenAction <- liftIO $ pickActionWithTitle actionTitle actionsOrCommands
+  executeCodeAction chosenAction
+  modifiedCode <- documentContents doc
+  liftIO $ expectedCode @=? modifiedCode
+
+addImplicitParamsConstraintTests :: TestTree
+addImplicitParamsConstraintTests =
+  testGroup
+    "add missing implicit params constraints"
+    [ testGroup
+        "introduced"
+        [ let ex ctxtA = exampleCode "?a" ctxtA ""
+           in checkCodeAction "at top level" "Add ?a::() to the context of fBase" (ex "") (ex "?a::()"),
+          let ex ctxA = exampleCode "x where x = ?a" ctxA ""
+           in checkCodeAction "in nested def" "Add ?a::() to the context of fBase" (ex "") (ex "?a::()")
+        ],
+      testGroup
+        "inherited"
+        [ let ex = exampleCode "()" "?a::()"
+           in checkCodeAction
+                "with preexisting context"
+                "Add `?a::()` to the context of the type signature for `fCaller`"
+                (ex "Eq ()")
+                (ex "Eq (), ?a::()"),
+          let ex = exampleCode "()" "?a::()"
+           in checkCodeAction "without preexisting context" "Add ?a::() to the context of fCaller" (ex "") (ex "?a::()")
+        ]
+    ]
+  where
+    mkContext ""       = ""
+    mkContext contents = "(" <> contents <> ") => "
+
+    exampleCode bodyBase contextBase contextCaller =
+      T.unlines
+        [ "{-# LANGUAGE FlexibleContexts, ImplicitParams #-}",
+          "module Testing where",
+          "fBase :: " <> mkContext contextBase <> "()",
+          "fBase = " <> bodyBase,
+          "fCaller :: " <> mkContext contextCaller <> "()",
+          "fCaller = fBase"
+        ]
+
+removeRedundantConstraintsTests :: TestTree
+removeRedundantConstraintsTests = let
+  header =
+    [ "{-# OPTIONS_GHC -Wredundant-constraints #-}"
+    , "module Testing where"
+    , ""
+    ]
+
+  headerExt :: [T.Text] -> [T.Text]
+  headerExt exts =
+    redunt : extTxt ++ ["module Testing where"]
+    where
+      redunt = "{-# OPTIONS_GHC -Wredundant-constraints #-}"
+      extTxt = map (\ext -> "{-# LANGUAGE " <> ext <> " #-}") exts
+
+  redundantConstraintsCode :: Maybe T.Text -> T.Text
+  redundantConstraintsCode mConstraint =
+    let constraint = maybe "" (\c -> "" <> c <> " => ") mConstraint
+      in T.unlines $ header <>
+        [ "foo :: " <> constraint <> "a -> a"
+        , "foo = id"
+        ]
+
+  redundantMixedConstraintsCode :: Maybe T.Text -> T.Text
+  redundantMixedConstraintsCode mConstraint =
+    let constraint = maybe "(Num a, Eq a)" (\c -> "(Num a, Eq a, " <> c <> ")") mConstraint
+      in T.unlines $ header <>
+        [ "foo :: " <> constraint <> " => a -> Bool"
+        , "foo x = x == 1"
+        ]
+
+  typeSignatureSpaces :: Maybe T.Text -> T.Text
+  typeSignatureSpaces mConstraint =
+    let constraint = maybe "(Num a, Eq a)" (\c -> "(Num a, Eq a, " <> c <> ")") mConstraint
+      in T.unlines $ header <>
+        [ "foo ::  " <> constraint <> " => a -> Bool"
+        , "foo x = x == 1"
+        ]
+
+  redundantConstraintsForall :: Maybe T.Text -> T.Text
+  redundantConstraintsForall mConstraint =
+    let constraint = maybe "" (\c -> "" <> c <> " => ") mConstraint
+      in T.unlines $ headerExt ["RankNTypes"] <>
+        [ "foo :: forall a. " <> constraint <> "a -> a"
+        , "foo = id"
+        ]
+
+  typeSignatureDo :: Maybe T.Text -> T.Text
+  typeSignatureDo mConstraint =
+    let constraint = maybe "" (\c -> "" <> c <> " => ") mConstraint
+      in T.unlines $ header <>
+        [ "f :: Int -> IO ()"
+        , "f n = do"
+        , "  let foo :: " <> constraint <> "a -> IO ()"
+        , "      foo _ = return ()"
+        , "  r n"
+        ]
+
+  typeSignatureNested :: Maybe T.Text -> T.Text
+  typeSignatureNested mConstraint =
+    let constraint = maybe "" (\c -> "" <> c <> " => ") mConstraint
+      in T.unlines $ header <>
+        [ "f :: Int -> ()"
+        , "f = g"
+        , "  where"
+        , "    g :: " <> constraint <> "a -> ()"
+        , "    g _ = ()"
+        ]
+
+  typeSignatureNested' :: Maybe T.Text -> T.Text
+  typeSignatureNested' mConstraint =
+    let constraint = maybe "" (\c -> "" <> c <> " => ") mConstraint
+      in T.unlines $ header <>
+        [ "f :: Int -> ()"
+        , "f ="
+        , "  let"
+        , "    g :: Int -> ()"
+        , "    g = h"
+        , "      where"
+        , "        h :: " <> constraint <> "a -> ()"
+        , "        h _ = ()"
+        , "  in g"
+        ]
+
+  typeSignatureNested'' :: Maybe T.Text -> T.Text
+  typeSignatureNested'' mConstraint =
+    let constraint = maybe "" (\c -> "" <> c <> " => ") mConstraint
+      in T.unlines $ header <>
+        [ "f :: Int -> ()"
+        , "f = g"
+        , "  where"
+        , "    g :: Int -> ()"
+        , "    g = "
+        , "      let"
+        , "        h :: " <> constraint <> "a -> ()"
+        , "        h _ = ()"
+        , "      in h"
+        ]
+
+  typeSignatureLined1 = T.unlines $ header <>
+    [ "foo :: Eq a =>"
+    , "  a -> Bool"
+    , "foo _ = True"
+    ]
+
+  typeSignatureLined2 = T.unlines $ header <>
+    [ "foo :: (Eq a, Show a)"
+    , "  => a -> Bool"
+    , "foo _ = True"
+    ]
+
+  typeSignatureOneLine = T.unlines $ header <>
+    [ "foo :: a -> Bool"
+    , "foo _ = True"
+    ]
+
+  typeSignatureLined3 = T.unlines $ header <>
+    [ "foo :: ( Eq a"
+    , "       , Show a"
+    , "       )"
+    , "    => a -> Bool"
+    , "foo x = x == x"
+    ]
+
+  typeSignatureLined3' = T.unlines $ header <>
+    [ "foo :: ( Eq a"
+    , "       )"
+    , "    => a -> Bool"
+    , "foo x = x == x"
+    ]
+
+
+  check :: T.Text -> T.Text -> T.Text -> TestTree
+  check actionTitle originalCode expectedCode = testSession (T.unpack actionTitle) $ do
+    doc <- createDoc "Testing.hs" "haskell" originalCode
+    _ <- waitForDiagnostics
+    actionsOrCommands <- getAllCodeActions doc
+    chosenAction <- liftIO $ pickActionWithTitle actionTitle actionsOrCommands
+    executeCodeAction chosenAction
+    modifiedCode <- documentContents doc
+    liftIO $ expectedCode @=? modifiedCode
+
+  in testGroup "remove redundant function constraints"
+  [ check
+    "Remove redundant constraint `Eq a` from the context of the type signature for `foo`"
+    (redundantConstraintsCode $ Just "Eq a")
+    (redundantConstraintsCode Nothing)
+  , check
+    "Remove redundant constraints `(Eq a, Monoid a)` from the context of the type signature for `foo`"
+    (redundantConstraintsCode $ Just "(Eq a, Monoid a)")
+    (redundantConstraintsCode Nothing)
+  , check
+    "Remove redundant constraints `(Monoid a, Show a)` from the context of the type signature for `foo`"
+    (redundantMixedConstraintsCode $ Just "Monoid a, Show a")
+    (redundantMixedConstraintsCode Nothing)
+  , check
+    "Remove redundant constraint `Eq a` from the context of the type signature for `g`"
+    (typeSignatureNested $ Just "Eq a")
+    (typeSignatureNested Nothing)
+  , check
+    "Remove redundant constraint `Eq a` from the context of the type signature for `h`"
+    (typeSignatureNested' $ Just "Eq a")
+    (typeSignatureNested' Nothing)
+  , check
+    "Remove redundant constraint `Eq a` from the context of the type signature for `h`"
+    (typeSignatureNested'' $ Just "Eq a")
+    (typeSignatureNested'' Nothing)
+  , check
+    "Remove redundant constraint `Eq a` from the context of the type signature for `foo`"
+    (redundantConstraintsForall $ Just "Eq a")
+    (redundantConstraintsForall Nothing)
+  , check
+    "Remove redundant constraint `Eq a` from the context of the type signature for `foo`"
+    (typeSignatureDo $ Just "Eq a")
+    (typeSignatureDo Nothing)
+  , check
+    "Remove redundant constraints `(Monoid a, Show a)` from the context of the type signature for `foo`"
+    (typeSignatureSpaces $ Just "Monoid a, Show a")
+    (typeSignatureSpaces Nothing)
+    , check
+    "Remove redundant constraint `Eq a` from the context of the type signature for `foo`"
+    typeSignatureLined1
+    typeSignatureOneLine
+    , check
+    "Remove redundant constraints `(Eq a, Show a)` from the context of the type signature for `foo`"
+    typeSignatureLined2
+    typeSignatureOneLine
+    , check
+    "Remove redundant constraint `Show a` from the context of the type signature for `foo`"
+    typeSignatureLined3
+    typeSignatureLined3'
+  ]
+
+addSigActionTests :: TestTree
+addSigActionTests = let
+  header = [ "{-# OPTIONS_GHC -Wmissing-signatures -Wmissing-pattern-synonym-signatures #-}"
+           , "{-# LANGUAGE PatternSynonyms,BangPatterns,GADTs #-}"
+           , "module Sigs where"
+           , "data T1 a where"
+           , "  MkT1 :: (Show b) => a -> b -> T1 a"
+           ]
+  before def     = T.unlines $ header ++ [def]
+  after' def sig = T.unlines $ header ++ [sig, def]
+
+  def >:: sig = testSession (T.unpack $ T.replace "\n" "\\n" def) $ do
+    let originalCode = before def
+    let expectedCode = after' def sig
+    doc <- createDoc "Sigs.hs" "haskell" originalCode
+    _ <- waitForDiagnostics
+    actionsOrCommands <- getCodeActions doc (Range (Position 5 1) (Position 5 maxBound))
+    chosenAction <- liftIO $ pickActionWithTitle ("add signature: " <> sig) actionsOrCommands
+    executeCodeAction chosenAction
+    modifiedCode <- documentContents doc
+    liftIO $ expectedCode @=? modifiedCode
+  in
+  testGroup "add signature"
+    [ "abc = True"              >:: "abc :: Bool"
+    , "foo a b = a + b"         >:: "foo :: Num a => a -> a -> a"
+    , "bar a b = show $ a + b"  >:: "bar :: (Show a, Num a) => a -> a -> String"
+    , "(!!!) a b = a > b"       >:: "(!!!) :: Ord a => a -> a -> Bool"
+    , "a >>>> b = a + b"        >:: "(>>>>) :: Num a => a -> a -> a"
+    , "a `haha` b = a b"        >:: "haha :: (t1 -> t2) -> t1 -> t2"
+    , "pattern Some a = Just a" >:: "pattern Some :: a -> Maybe a"
+    , "pattern Some a <- Just a" >:: "pattern Some :: a -> Maybe a"
+    , "pattern Some a <- Just a\n  where Some a = Just a" >:: "pattern Some :: a -> Maybe a"
+    , "pattern Some a <- Just !a\n  where Some !a = Just a" >:: "pattern Some :: a -> Maybe a"
+    , "pattern Point{x, y} = (x, y)" >:: "pattern Point :: a -> b -> (a, b)"
+    , "pattern Point{x, y} <- (x, y)" >:: "pattern Point :: a -> b -> (a, b)"
+    , "pattern Point{x, y} <- (x, y)\n  where Point x y = (x, y)" >:: "pattern Point :: a -> b -> (a, b)"
+    , "pattern MkT1' b = MkT1 42 b" >:: "pattern MkT1' :: (Eq a, Num a) => Show b => b -> T1 a"
+    , "pattern MkT1' b <- MkT1 42 b" >:: "pattern MkT1' :: (Eq a, Num a) => Show b => b -> T1 a"
+    , "pattern MkT1' b <- MkT1 42 b\n  where MkT1' b = MkT1 42 b" >:: "pattern MkT1' :: (Eq a, Num a) => Show b => b -> T1 a"
+    ]
+
+exportUnusedTests :: TestTree
+exportUnusedTests = testGroup "export unused actions"
+  [ testGroup "don't want suggestion"
+    [ testSession "implicit exports" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "{-# OPTIONS_GHC -Wmissing-signatures #-}"
+              , "module A where"
+              , "foo = id"])
+        (R 3 0 3 3)
+        "Export ‘foo’"
+        Nothing -- codeaction should not be available
+    , testSession "not top-level" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "{-# OPTIONS_GHC -Wunused-binds #-}"
+              , "module A (foo,bar) where"
+              , "foo = ()"
+              , "  where bar = ()"
+              , "bar = ()"])
+        (R 2 0 2 11)
+        "Export ‘bar’"
+        Nothing
+    , ignoreForGHC92 "Diagnostic message has no suggestions" $
+      testSession "type is exported but not the constructor of same name" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A (Foo) where"
+              , "data Foo = Foo"])
+        (R 2 0 2 8)
+        "Export ‘Foo’"
+        Nothing -- codeaction should not be available
+    , testSession "unused data field" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A (Foo(Foo)) where"
+              , "data Foo = Foo {foo :: ()}"])
+        (R 2 0 2 20)
+        "Export ‘foo’"
+        Nothing -- codeaction should not be available
+    ]
+  , testGroup "want suggestion"
+    [ testSession "empty exports" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A ("
+              , ") where"
+              , "foo = id"])
+        (R 3 0 3 3)
+        "Export ‘foo’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A ("
+              , "foo) where"
+              , "foo = id"])
+    , testSession "single line explicit exports" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A (foo) where"
+              , "foo = id"
+              , "bar = foo"])
+        (R 3 0 3 3)
+        "Export ‘bar’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A (foo, bar) where"
+              , "foo = id"
+              , "bar = foo"])
+    , testSession "multi line explicit exports" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A"
+              , "  ("
+              , "    foo) where"
+              , "foo = id"
+              , "bar = foo"])
+        (R 5 0 5 3)
+        "Export ‘bar’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A"
+              , "  ("
+              , "    foo, bar) where"
+              , "foo = id"
+              , "bar = foo"])
+    , testSession "export list ends in comma" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A"
+              , "  (foo,"
+              , "  ) where"
+              , "foo = id"
+              , "bar = foo"])
+        (R 5 0 5 3)
+        "Export ‘bar’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A"
+              , "  (foo,"
+              , "  bar) where"
+              , "foo = id"
+              , "bar = foo"])
+    , testSession "style of multiple exports is preserved 1" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A"
+              , "  ( foo"
+              , "  , bar"
+              , "  ) where"
+              , "foo = id"
+              , "bar = foo"
+              , "baz = bar"
+              ])
+        (R 7 0 7 3)
+        "Export ‘baz’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A"
+              , "  ( foo"
+              , "  , bar"
+              , "  , baz"
+              , "  ) where"
+              , "foo = id"
+              , "bar = foo"
+              , "baz = bar"
+              ])
+    , testSession "style of multiple exports is preserved 2" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A"
+              , "  ( foo,"
+              , "    bar"
+              , "  ) where"
+              , "foo = id"
+              , "bar = foo"
+              , "baz = bar"
+              ])
+        (R 7 0 7 3)
+        "Export ‘baz’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A"
+              , "  ( foo,"
+              , "    bar,"
+              , "    baz"
+              , "  ) where"
+              , "foo = id"
+              , "bar = foo"
+              , "baz = bar"
+              ])
+    , testSession "style of multiple exports is preserved and selects smallest export separator" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A"
+              , "  ( foo"
+              , "  , bar"
+              , "  -- * For testing"
+              , "  , baz"
+              , "  ) where"
+              , "foo = id"
+              , "bar = foo"
+              , "baz = bar"
+              , "quux = bar"
+              ])
+        (R 10 0 10 4)
+        "Export ‘quux’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A"
+              , "  ( foo"
+              , "  , bar"
+              , "  -- * For testing"
+              , "  , baz"
+              , "  , quux"
+              , "  ) where"
+              , "foo = id"
+              , "bar = foo"
+              , "baz = bar"
+              , "quux = bar"
+              ])
+    , testSession "unused pattern synonym" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "{-# LANGUAGE PatternSynonyms #-}"
+              , "module A () where"
+              , "pattern Foo a <- (a, _)"])
+        (R 3 0 3 10)
+        "Export ‘Foo’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "{-# LANGUAGE PatternSynonyms #-}"
+              , "module A (pattern Foo) where"
+              , "pattern Foo a <- (a, _)"])
+    , testSession "unused data type" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A () where"
+              , "data Foo = Foo"])
+        (R 2 0 2 7)
+        "Export ‘Foo’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A (Foo(..)) where"
+              , "data Foo = Foo"])
+    , testSession "unused newtype" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A () where"
+              , "newtype Foo = Foo ()"])
+        (R 2 0 2 10)
+        "Export ‘Foo’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A (Foo(..)) where"
+              , "newtype Foo = Foo ()"])
+    , testSession "unused type synonym" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A () where"
+              , "type Foo = ()"])
+        (R 2 0 2 7)
+        "Export ‘Foo’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A (Foo) where"
+              , "type Foo = ()"])
+    , testSession "unused type family" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "{-# LANGUAGE TypeFamilies #-}"
+              , "module A () where"
+              , "type family Foo p"])
+        (R 3 0 3 15)
+        "Export ‘Foo’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "{-# LANGUAGE TypeFamilies #-}"
+              , "module A (Foo) where"
+              , "type family Foo p"])
+    , testSession "unused typeclass" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A () where"
+              , "class Foo a"])
+        (R 2 0 2 8)
+        "Export ‘Foo’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A (Foo(..)) where"
+              , "class Foo a"])
+    , testSession "infix" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A () where"
+              , "a `f` b = ()"])
+        (R 2 0 2 11)
+        "Export ‘f’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A (f) where"
+              , "a `f` b = ()"])
+    , testSession "function operator" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A () where"
+              , "(<|) = ($)"])
+        (R 2 0 2 9)
+        "Export ‘<|’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "module A ((<|)) where"
+              , "(<|) = ($)"])
+    , testSession "type synonym operator" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "{-# LANGUAGE TypeOperators #-}"
+              , "module A () where"
+              , "type (:<) = ()"])
+        (R 3 0 3 13)
+        "Export ‘:<’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "{-# LANGUAGE TypeOperators #-}"
+              , "module A ((:<)) where"
+              , "type (:<) = ()"])
+    , testSession "type family operator" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "{-# LANGUAGE TypeFamilies #-}"
+              , "{-# LANGUAGE TypeOperators #-}"
+              , "module A () where"
+              , "type family (:<)"])
+        (R 4 0 4 15)
+        "Export ‘:<’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "{-# LANGUAGE TypeFamilies #-}"
+              , "{-# LANGUAGE TypeOperators #-}"
+              , "module A (type (:<)) where"
+              , "type family (:<)"])
+    , testSession "typeclass operator" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "{-# LANGUAGE TypeOperators #-}"
+              , "module A () where"
+              , "class (:<) a"])
+        (R 3 0 3 11)
+        "Export ‘:<’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "{-# LANGUAGE TypeOperators #-}"
+              , "module A (type (:<)(..)) where"
+              , "class (:<) a"])
+    , testSession "newtype operator" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "{-# LANGUAGE TypeOperators #-}"
+              , "module A () where"
+              , "newtype (:<) = Foo ()"])
+        (R 3 0 3 20)
+        "Export ‘:<’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "{-# LANGUAGE TypeOperators #-}"
+              , "module A (type (:<)(..)) where"
+              , "newtype (:<) = Foo ()"])
+    , testSession "data type operator" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "{-# LANGUAGE TypeOperators #-}"
+              , "module A () where"
+              , "data (:<) = Foo ()"])
+        (R 3 0 3 17)
+        "Export ‘:<’"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
+              , "{-# LANGUAGE TypeOperators #-}"
+              , "module A (type (:<)(..)) where"
+              , "data (:<) = Foo ()"])
+    ]
+  ]
+  where
+    template doc range = exportTemplate (Just range) doc
+
+exportTemplate :: Maybe Range -> T.Text -> T.Text -> Maybe T.Text -> Session ()
+exportTemplate mRange initialContent expectedAction expectedContents = do
+  doc <- createDoc "A.hs" "haskell" initialContent
+  _ <- waitForDiagnostics
+  actions <- case mRange of
+    Nothing    -> getAllCodeActions doc
+    Just range -> getCodeActions doc range
+  case expectedContents of
+    Just content -> do
+      action <- liftIO $ pickActionWithTitle expectedAction actions
+      executeCodeAction action
+      contentAfterAction <- documentContents doc
+      liftIO $ content @=? contentAfterAction
+    Nothing ->
+      liftIO $ [_title | InR CodeAction{_title} <- actions, _title == expectedAction ] @?= []
+
+removeExportTests :: TestTree
+removeExportTests = testGroup "remove export actions"
+    [ testSession "single export" $ template
+        (T.unlines
+              [ "module A (  a   ) where"
+              , "b :: ()"
+              , "b = ()"])
+        "Remove ‘a’ from export"
+        (Just $ T.unlines
+              [ "module A (     ) where"
+              , "b :: ()"
+              , "b = ()"])
+    , testSession "ending comma" $ template
+        (T.unlines
+              [ "module A (  a,   ) where"
+              , "b :: ()"
+              , "b = ()"])
+        "Remove ‘a’ from export"
+        (Just $ T.unlines
+              [ "module A (  ) where"
+              , "b :: ()"
+              , "b = ()"])
+    , testSession "multiple exports" $ template
+        (T.unlines
+              [ "module A (a  ,   c,    b ) where"
+              , "a, c :: ()"
+              , "a = ()"
+              , "c = ()"])
+        "Remove ‘b’ from export"
+        (Just $ T.unlines
+              [ "module A (a  ,   c ) where"
+              , "a, c :: ()"
+              , "a = ()"
+              , "c = ()"])
+    , testSession "not in scope constructor" $ template
+        (T.unlines
+              [ "module A (A (X,Y,Z,(:<)), ab) where"
+              , "data A = X Int | Y | (:<) Int"
+              , "ab :: ()"
+              , "ab = ()"
+              ])
+        "Remove ‘Z’ from export"
+        (Just $ T.unlines
+              [ "module A (A (X,Y,(:<)), ab) where"
+              , "data A = X Int | Y | (:<) Int"
+              , "ab :: ()"
+              , "ab = ()"])
+    , testSession "multiline export" $ template
+        (T.unlines
+              [ "module A (a"
+              , " ,  b"
+              , " , (:*:)"
+              , " , ) where"
+              , "a,b :: ()"
+              , "a = ()"
+              , "b = ()"])
+        "Remove ‘:*:’ from export"
+        (Just $ T.unlines
+              [ "module A (a"
+              , " ,  b"
+              , " "
+              , " , ) where"
+              , "a,b :: ()"
+              , "a = ()"
+              , "b = ()"])
+    , testSession "qualified re-export" $ template
+        (T.unlines
+              [ "module A (M.x,a) where"
+              , "import qualified Data.List as M"
+              , "a :: ()"
+              , "a = ()"])
+        "Remove ‘M.x’ from export"
+        (Just $ T.unlines
+              [ "module A (a) where"
+              , "import qualified Data.List as M"
+              , "a :: ()"
+              , "a = ()"])
+    , testSession "qualified re-export ending in '.'" $ template
+        (T.unlines
+              [ "module A ((M.@.),a) where"
+              , "import qualified Data.List as M"
+              , "a :: ()"
+              , "a = ()"])
+        "Remove ‘M.@.’ from export"
+        (Just $ T.unlines
+              [ "module A (a) where"
+              , "import qualified Data.List as M"
+              , "a :: ()"
+              , "a = ()"])
+    , testSession "export module" $ template
+        (T.unlines
+              [ "module A (module B) where"
+              , "a :: ()"
+              , "a = ()"])
+        "Remove ‘module B’ from export"
+        (Just $ T.unlines
+              [ "module A () where"
+              , "a :: ()"
+              , "a = ()"])
+    , testSession "dodgy export" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wall #-}"
+              , "module A (A (..)) where"
+              , "data X = X"
+              , "type A = X"])
+        "Remove ‘A(..)’ from export"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wall #-}"
+              , "module A () where"
+              , "data X = X"
+              , "type A = X"])
+    , testSession "dodgy export" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wall #-}"
+              , "module A (A (..)) where"
+              , "data X = X"
+              , "type A = X"])
+        "Remove ‘A(..)’ from export"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wall #-}"
+              , "module A () where"
+              , "data X = X"
+              , "type A = X"])
+    , testSession "duplicate module export" $ template
+        (T.unlines
+              [ "{-# OPTIONS_GHC -Wall #-}"
+              , "module A (module L,module L) where"
+              , "import Data.List as L"
+              , "a :: ()"
+              , "a = ()"])
+        "Remove ‘Module L’ from export"
+        (Just $ T.unlines
+              [ "{-# OPTIONS_GHC -Wall #-}"
+              , "module A (module L) where"
+              , "import Data.List as L"
+              , "a :: ()"
+              , "a = ()"])
+    , testSession "remove all exports single" $ template
+        (T.unlines
+              [ "module A (x) where"
+              , "a :: ()"
+              , "a = ()"])
+        "Remove all redundant exports"
+        (Just $ T.unlines
+              [ "module A () where"
+              , "a :: ()"
+              , "a = ()"])
+    , testSession "remove all exports two" $ template
+        (T.unlines
+              [ "module A (x,y) where"
+              , "a :: ()"
+              , "a = ()"])
+        "Remove all redundant exports"
+        (Just $ T.unlines
+              [ "module A () where"
+              , "a :: ()"
+              , "a = ()"])
+    , testSession "remove all exports three" $ template
+        (T.unlines
+              [ "module A (a,x,y) where"
+              , "a :: ()"
+              , "a = ()"])
+        "Remove all redundant exports"
+        (Just $ T.unlines
+              [ "module A (a) where"
+              , "a :: ()"
+              , "a = ()"])
+    , testSession "remove all exports composite" $ template
+        (T.unlines
+              [ "module A (x,y,b, module Ls, a, A(X,getW, Y, Z,(:-),getV), (-+), B(B)) where"
+              , "data A = X {getV :: Int} | Y {getV :: Int}"
+              , "data B = B"
+              , "a,b :: ()"
+              , "a = ()"
+              , "b = ()"])
+        "Remove all redundant exports"
+        (Just $ T.unlines
+              [ "module A (b, a, A(X, Y,getV), B(B)) where"
+              , "data A = X {getV :: Int} | Y {getV :: Int}"
+              , "data B = B"
+              , "a,b :: ()"
+              , "a = ()"
+              , "b = ()"])
+    ]
+  where
+    template = exportTemplate Nothing
+
+
+codeActionHelperFunctionTests :: TestTree
+codeActionHelperFunctionTests = testGroup "code action helpers"
+    [
+    extendImportTestsRegEx
+    ]
+
+extendImportTestsRegEx :: TestTree
+extendImportTestsRegEx = testGroup "regex parsing"
+    [
+      testCase "parse invalid multiple imports" $ template "foo bar foo" Nothing
+    , testCase "parse malformed import list" $ template
+                  "\n\8226 Perhaps you want to add \8216fromList\8217 to one of these import lists:\n    \8216Data.Map\8217)"
+                  Nothing
+    , testCase "parse multiple imports" $ template
+                 "\n\8226 Perhaps you want to add \8216fromList\8217 to one of these import lists:\n    \8216Data.Map\8217 (app/testlsp.hs:7:1-18)\n    \8216Data.HashMap.Strict\8217 (app/testlsp.hs:8:1-29)"
+                 $ Just ("fromList",[("Data.Map","app/testlsp.hs:7:1-18"),("Data.HashMap.Strict","app/testlsp.hs:8:1-29")])
+    ]
+    where
+        template message expected = do
+            liftIO $ matchRegExMultipleImports message @=? expected
+
+pickActionWithTitle :: T.Text -> [Command |? CodeAction] -> IO CodeAction
+pickActionWithTitle title actions = do
+  assertBool ("Found no matching actions for " <> show title <> " in " <> show titles) (not $ null matches)
+  return $ head matches
+  where
+    titles =
+        [ actionTitle
+        | InR CodeAction { _title = actionTitle } <- actions
+        ]
+    matches =
+        [ action
+        | InR action@CodeAction { _title = actionTitle } <- actions
+        , title == actionTitle
+        ]
+
+findCodeActions :: TextDocumentIdentifier -> Range -> [T.Text] -> Session [CodeAction]
+findCodeActions = findCodeActions' (==) "is not a superset of"
+
+findCodeActionsByPrefix :: TextDocumentIdentifier -> Range -> [T.Text] -> Session [CodeAction]
+findCodeActionsByPrefix = findCodeActions' T.isPrefixOf "is not prefix of"
+
+findCodeActions' :: (T.Text -> T.Text -> Bool) -> String -> TextDocumentIdentifier -> Range -> [T.Text] -> Session [CodeAction]
+findCodeActions' op errMsg doc range expectedTitles = do
+  actions <- getCodeActions doc range
+  let matches = sequence
+        [ listToMaybe
+          [ action
+          | InR action@CodeAction { _title = actionTitle } <- actions
+          , expectedTitle `op` actionTitle]
+        | expectedTitle <- expectedTitles]
+  let msg = show
+            [ actionTitle
+            | InR CodeAction { _title = actionTitle } <- actions
+            ]
+            ++ " " <> errMsg <> " "
+            ++ show expectedTitles
+  liftIO $ case matches of
+    Nothing -> assertFailure msg
+    Just _  -> pure ()
+  return (fromJust matches)
+
+findCodeAction :: TextDocumentIdentifier -> Range -> T.Text -> Session CodeAction
+findCodeAction doc range t = head <$> findCodeActions doc range [t]
+
+testSession :: String -> Session () -> TestTree
+testSession name = testCase name . run
+
+testSessionWithExtraFiles :: HasCallStack => FilePath -> String -> (FilePath -> Session ()) -> TestTree
+testSessionWithExtraFiles prefix name = testCase name . runWithExtraFiles prefix
+
+runWithExtraFiles :: HasCallStack => FilePath -> (FilePath -> Session a) -> IO a
+runWithExtraFiles prefix s = withTempDir $ \dir -> do
+  copyTestDataFiles dir prefix
+  runInDir dir (s dir)
+
+copyTestDataFiles :: HasCallStack => FilePath -> FilePath -> IO ()
+copyTestDataFiles dir prefix = do
+  -- Copy all the test data files to the temporary workspace
+  testDataFiles <- getDirectoryFilesIO ("test/data" </> prefix) ["//*"]
+  for_ testDataFiles $ \f -> do
+    createDirectoryIfMissing True $ dir </> takeDirectory f
+    copyFile ("test/data" </> prefix </> f) (dir </> f)
+
+run :: Session a -> IO a
+run s = run' (const s)
+
+run' :: (FilePath -> Session a) -> IO a
+run' s = withTempDir $ \dir -> runInDir dir (s dir)
+
+runInDir :: FilePath -> Session a -> IO a
+runInDir dir = runSessionWithServer' refactorPlugin def def lspTestCaps dir
+
+lspTestCaps :: ClientCapabilities
+lspTestCaps = fullCaps { _window = Just $ WindowClientCapabilities (Just True) Nothing Nothing }
+
+pattern R :: UInt -> UInt -> UInt -> UInt -> Range
+pattern R x y x' y' = Range (Position x y) (Position x' y')
+
+-- | Version of 'System.IO.Extra.withTempDir' that canonicalizes the path
+-- Which we need to do on macOS since the $TMPDIR can be in @/private/var@ or
+-- @/var@
+withTempDir :: (FilePath -> IO a) -> IO a
+withTempDir f = System.IO.Extra.withTempDir $ \dir -> do
+  dir' <- canonicalizePath dir
+  f dir'
+
+ignoreForGHC92 :: String -> TestTree -> TestTree
+ignoreForGHC92 = ignoreFor (BrokenForGHC [GHC92])
+
+data BrokenTarget =
+    BrokenSpecific OS [GhcVersion]
+    -- ^Broken for `BrokenOS` with `GhcVersion`
+    | BrokenForOS OS
+    -- ^Broken for `BrokenOS`
+    | BrokenForGHC [GhcVersion]
+    -- ^Broken for `GhcVersion`
+    deriving (Show)
+
+-- | Ignore test for specific os and ghc with reason.
+ignoreFor :: BrokenTarget -> String -> TestTree -> TestTree
+ignoreFor = knownIssueFor Ignore
+
+-- | Deal with `IssueSolution` for specific OS and GHC.
+knownIssueFor :: IssueSolution -> BrokenTarget -> String -> TestTree -> TestTree
+knownIssueFor solution = go . \case
+    BrokenSpecific bos vers -> isTargetOS bos && isTargetGhc vers
+    BrokenForOS bos         -> isTargetOS bos
+    BrokenForGHC vers       -> isTargetGhc vers
+    where
+        isTargetOS = \case
+            Windows -> isWindows
+            MacOS   -> isMac
+            Linux   -> not isWindows && not isMac
+
+        isTargetGhc = elem ghcVersion
+
+        go True = case solution of
+            Broken -> expectFailBecause
+            Ignore -> ignoreTestBecause
+        go False = \_ -> id
+
+
+data IssueSolution = Broken | Ignore deriving (Show)
+
+-- | Assert that a value is not 'Nothing', and extract the value.
+assertJust :: MonadIO m => String -> Maybe a -> m a
+assertJust s = \case
+  Nothing -> liftIO $ assertFailure s
+  Just x  -> pure x
+
+-- | Before ghc9, lists of Char is displayed as [Char], but with ghc9 and up, it's displayed as String
+listOfChar :: T.Text
+listOfChar | ghcVersion >= GHC90 = "String"
+           | otherwise = "[Char]"
+
diff --git a/ghcide/test/data/hiding/AVec.hs b/plugins/hls-refactor-plugin/test/data/hiding/AVec.hs
similarity index 100%
rename from ghcide/test/data/hiding/AVec.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/AVec.hs
diff --git a/ghcide/test/data/hiding/BVec.hs b/plugins/hls-refactor-plugin/test/data/hiding/BVec.hs
similarity index 100%
rename from ghcide/test/data/hiding/BVec.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/BVec.hs
diff --git a/ghcide/test/data/hiding/CVec.hs b/plugins/hls-refactor-plugin/test/data/hiding/CVec.hs
similarity index 100%
rename from ghcide/test/data/hiding/CVec.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/CVec.hs
diff --git a/ghcide/test/data/hiding/DVec.hs b/plugins/hls-refactor-plugin/test/data/hiding/DVec.hs
similarity index 100%
rename from ghcide/test/data/hiding/DVec.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/DVec.hs
diff --git a/ghcide/test/data/hiding/EVec.hs b/plugins/hls-refactor-plugin/test/data/hiding/EVec.hs
similarity index 100%
rename from ghcide/test/data/hiding/EVec.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/EVec.hs
diff --git a/ghcide/test/data/hiding/FVec.hs b/plugins/hls-refactor-plugin/test/data/hiding/FVec.hs
similarity index 100%
rename from ghcide/test/data/hiding/FVec.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/FVec.hs
diff --git a/ghcide/test/data/hiding/HideFunction.expected.append.E.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideFunction.expected.append.E.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideFunction.expected.append.E.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideFunction.expected.append.E.hs
diff --git a/ghcide/test/data/hiding/HideFunction.expected.append.Prelude.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideFunction.expected.append.Prelude.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideFunction.expected.append.Prelude.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideFunction.expected.append.Prelude.hs
diff --git a/ghcide/test/data/hiding/HideFunction.expected.fromList.A.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideFunction.expected.fromList.A.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideFunction.expected.fromList.A.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideFunction.expected.fromList.A.hs
diff --git a/ghcide/test/data/hiding/HideFunction.expected.fromList.B.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideFunction.expected.fromList.B.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideFunction.expected.fromList.B.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideFunction.expected.fromList.B.hs
diff --git a/ghcide/test/data/hiding/HideFunction.expected.qualified.append.Prelude.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideFunction.expected.qualified.append.Prelude.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideFunction.expected.qualified.append.Prelude.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideFunction.expected.qualified.append.Prelude.hs
diff --git a/ghcide/test/data/hiding/HideFunction.expected.qualified.fromList.E.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideFunction.expected.qualified.fromList.E.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideFunction.expected.qualified.fromList.E.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideFunction.expected.qualified.fromList.E.hs
diff --git a/ghcide/test/data/hiding/HideFunction.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideFunction.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideFunction.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideFunction.hs
diff --git a/ghcide/test/data/hiding/HideFunctionWithoutLocal.expected.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideFunctionWithoutLocal.expected.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideFunctionWithoutLocal.expected.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideFunctionWithoutLocal.expected.hs
diff --git a/ghcide/test/data/hiding/HideFunctionWithoutLocal.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideFunctionWithoutLocal.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideFunctionWithoutLocal.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideFunctionWithoutLocal.hs
diff --git a/ghcide/test/data/hiding/HidePreludeIndented.expected.hs b/plugins/hls-refactor-plugin/test/data/hiding/HidePreludeIndented.expected.hs
similarity index 100%
rename from ghcide/test/data/hiding/HidePreludeIndented.expected.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HidePreludeIndented.expected.hs
diff --git a/ghcide/test/data/hiding/HidePreludeIndented.hs b/plugins/hls-refactor-plugin/test/data/hiding/HidePreludeIndented.hs
similarity index 100%
rename from ghcide/test/data/hiding/HidePreludeIndented.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HidePreludeIndented.hs
diff --git a/ghcide/test/data/hiding/HidePreludeLocalInfix.expected.hs b/plugins/hls-refactor-plugin/test/data/hiding/HidePreludeLocalInfix.expected.hs
similarity index 100%
rename from ghcide/test/data/hiding/HidePreludeLocalInfix.expected.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HidePreludeLocalInfix.expected.hs
diff --git a/ghcide/test/data/hiding/HidePreludeLocalInfix.hs b/plugins/hls-refactor-plugin/test/data/hiding/HidePreludeLocalInfix.hs
similarity index 100%
rename from ghcide/test/data/hiding/HidePreludeLocalInfix.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HidePreludeLocalInfix.hs
diff --git a/ghcide/test/data/hiding/HideQualifyDuplicateRecordFields.expected.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideQualifyDuplicateRecordFields.expected.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideQualifyDuplicateRecordFields.expected.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideQualifyDuplicateRecordFields.expected.hs
diff --git a/ghcide/test/data/hiding/HideQualifyDuplicateRecordFields.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideQualifyDuplicateRecordFields.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideQualifyDuplicateRecordFields.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideQualifyDuplicateRecordFields.hs
diff --git a/ghcide/test/data/hiding/HideQualifyDuplicateRecordFieldsSelf.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideQualifyDuplicateRecordFieldsSelf.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideQualifyDuplicateRecordFieldsSelf.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideQualifyDuplicateRecordFieldsSelf.hs
diff --git a/ghcide/test/data/hiding/HideQualifyInfix.expected.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideQualifyInfix.expected.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideQualifyInfix.expected.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideQualifyInfix.expected.hs
diff --git a/ghcide/test/data/hiding/HideQualifyInfix.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideQualifyInfix.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideQualifyInfix.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideQualifyInfix.hs
diff --git a/ghcide/test/data/hiding/HideQualifySectionLeft.expected.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideQualifySectionLeft.expected.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideQualifySectionLeft.expected.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideQualifySectionLeft.expected.hs
diff --git a/ghcide/test/data/hiding/HideQualifySectionLeft.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideQualifySectionLeft.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideQualifySectionLeft.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideQualifySectionLeft.hs
diff --git a/ghcide/test/data/hiding/HideQualifySectionRight.expected.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideQualifySectionRight.expected.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideQualifySectionRight.expected.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideQualifySectionRight.expected.hs
diff --git a/ghcide/test/data/hiding/HideQualifySectionRight.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideQualifySectionRight.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideQualifySectionRight.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideQualifySectionRight.hs
diff --git a/ghcide/test/data/hiding/HideType.expected.A.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideType.expected.A.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideType.expected.A.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideType.expected.A.hs
diff --git a/ghcide/test/data/hiding/HideType.expected.E.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideType.expected.E.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideType.expected.E.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideType.expected.E.hs
diff --git a/ghcide/test/data/hiding/HideType.hs b/plugins/hls-refactor-plugin/test/data/hiding/HideType.hs
similarity index 100%
rename from ghcide/test/data/hiding/HideType.hs
rename to plugins/hls-refactor-plugin/test/data/hiding/HideType.hs
diff --git a/ghcide/test/data/hiding/hie.yaml b/plugins/hls-refactor-plugin/test/data/hiding/hie.yaml
similarity index 90%
rename from ghcide/test/data/hiding/hie.yaml
rename to plugins/hls-refactor-plugin/test/data/hiding/hie.yaml
index 075686555ea..538f854ddf8 100644
--- a/ghcide/test/data/hiding/hie.yaml
+++ b/plugins/hls-refactor-plugin/test/data/hiding/hie.yaml
@@ -8,3 +8,4 @@ cradle:
         - CVec.hs
         - DVec.hs
         - EVec.hs
+        - FVec.hs
diff --git a/plugins/hls-refactor-plugin/test/data/hover/Bar.hs b/plugins/hls-refactor-plugin/test/data/hover/Bar.hs
new file mode 100644
index 00000000000..f9fde2a7ccb
--- /dev/null
+++ b/plugins/hls-refactor-plugin/test/data/hover/Bar.hs
@@ -0,0 +1,4 @@
+module Bar (Bar(..)) where
+
+-- | Bar Haddock
+data Bar = Bar
diff --git a/plugins/hls-refactor-plugin/test/data/hover/Foo.hs b/plugins/hls-refactor-plugin/test/data/hover/Foo.hs
new file mode 100644
index 00000000000..489a6ccd6b2
--- /dev/null
+++ b/plugins/hls-refactor-plugin/test/data/hover/Foo.hs
@@ -0,0 +1,6 @@
+module Foo (Bar, foo) where
+
+import Bar
+
+-- | foo Haddock
+foo = Bar
diff --git a/plugins/hls-refactor-plugin/test/data/hover/GotoHover.hs b/plugins/hls-refactor-plugin/test/data/hover/GotoHover.hs
new file mode 100644
index 00000000000..e1802580e27
--- /dev/null
+++ b/plugins/hls-refactor-plugin/test/data/hover/GotoHover.hs
@@ -0,0 +1,66 @@
+{-# LANGUAGE OverloadedStrings, TemplateHaskell #-}
+{- HLINT ignore -}
+module GotoHover ( module GotoHover) where
+import Data.Text (Text, pack)
+import Foo (Bar, foo)
+
+
+data TypeConstructor = DataConstructor
+  { fff :: Text
+  , ggg :: Int }
+aaa :: TypeConstructor
+aaa = DataConstructor
+  { fff = "dfgy"
+  , ggg = 832
+  }
+bbb :: TypeConstructor
+bbb = DataConstructor "mjgp" 2994
+ccc :: (Text, Int)
+ccc = (fff bbb, ggg aaa)
+ddd :: Num a => a -> a -> a
+ddd vv ww = vv +! ww
+a +! b = a - b
+hhh (Just a) (><) = a >< a
+iii a b = a `b` a
+jjj s = pack $ s <> s
+class MyClass a where
+  method :: a -> Int
+instance MyClass Int where
+  method = succ
+kkk :: MyClass a => Int -> a -> Int
+kkk n c = n + method c
+
+doBind :: Maybe ()
+doBind = do unwrapped <- Just ()
+            return unwrapped
+
+listCompBind :: [Char]
+listCompBind = [ succ c | c <- "ptfx" ]
+
+multipleClause :: Bool -> Char
+multipleClause True  =    't'
+multipleClause False = 'f'
+
+-- | Recognizable docs: kpqz
+documented :: Monad m => Either Int (m a)
+documented = Left 7518
+
+listOfInt = [ 8391 :: Int, 6268 ]
+
+outer :: Bool
+outer = undefined inner where
+
+  inner :: Char
+  inner = undefined
+
+imported :: Bar
+imported = foo
+
+aa2 :: Bool
+aa2 = $(id [| True |])
+
+hole :: Int
+hole = _
+
+hole2 :: a -> Maybe a
+hole2 = _
diff --git a/plugins/hls-refactor-plugin/test/data/hover/RecordDotSyntax.hs b/plugins/hls-refactor-plugin/test/data/hover/RecordDotSyntax.hs
new file mode 100644
index 00000000000..2f43b99977f
--- /dev/null
+++ b/plugins/hls-refactor-plugin/test/data/hover/RecordDotSyntax.hs
@@ -0,0 +1,21 @@
+{-# LANGUAGE CPP #-}
+#if __GLASGOW_HASKELL__ >= 902
+{-# LANGUAGE OverloadedRecordDot, DuplicateRecordFields, NoFieldSelectors #-}
+
+module RecordDotSyntax ( module RecordDotSyntax) where
+
+import qualified Data.Maybe as M
+
+data MyRecord = MyRecord
+  { a :: String
+  , b :: Integer
+  , c :: MyChild
+  } deriving (Eq, Show)
+
+newtype MyChild = MyChild
+  { z :: String
+  } deriving (Eq, Show)
+
+x = MyRecord { a = "Hello", b = 12, c = MyChild { z = "there" } }
+y = x.a ++ show x.b ++ x.c.z
+#endif
diff --git a/plugins/hls-refactor-plugin/test/data/hover/hie.yaml b/plugins/hls-refactor-plugin/test/data/hover/hie.yaml
new file mode 100644
index 00000000000..e2b3e97c5d2
--- /dev/null
+++ b/plugins/hls-refactor-plugin/test/data/hover/hie.yaml
@@ -0,0 +1 @@
+cradle: {direct: {arguments: ["Foo", "Bar", "GotoHover", "RecordDotSyntax"]}}
diff --git a/ghcide/test/data/import-placement/CommentAtTop.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/CommentAtTop.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/CommentAtTop.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/CommentAtTop.expected.hs
diff --git a/ghcide/test/data/import-placement/CommentAtTop.hs b/plugins/hls-refactor-plugin/test/data/import-placement/CommentAtTop.hs
similarity index 100%
rename from ghcide/test/data/import-placement/CommentAtTop.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/CommentAtTop.hs
diff --git a/ghcide/test/data/import-placement/CommentAtTopMultipleComments.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/CommentAtTopMultipleComments.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/CommentAtTopMultipleComments.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/CommentAtTopMultipleComments.expected.hs
diff --git a/ghcide/test/data/import-placement/CommentAtTopMultipleComments.hs b/plugins/hls-refactor-plugin/test/data/import-placement/CommentAtTopMultipleComments.hs
similarity index 100%
rename from ghcide/test/data/import-placement/CommentAtTopMultipleComments.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/CommentAtTopMultipleComments.hs
diff --git a/ghcide/test/data/import-placement/CommentCurlyBraceAtTop.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/CommentCurlyBraceAtTop.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/CommentCurlyBraceAtTop.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/CommentCurlyBraceAtTop.expected.hs
diff --git a/ghcide/test/data/import-placement/CommentCurlyBraceAtTop.hs b/plugins/hls-refactor-plugin/test/data/import-placement/CommentCurlyBraceAtTop.hs
similarity index 100%
rename from ghcide/test/data/import-placement/CommentCurlyBraceAtTop.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/CommentCurlyBraceAtTop.hs
diff --git a/ghcide/test/data/import-placement/DataAtTop.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/DataAtTop.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/DataAtTop.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/DataAtTop.expected.hs
diff --git a/ghcide/test/data/import-placement/DataAtTop.hs b/plugins/hls-refactor-plugin/test/data/import-placement/DataAtTop.hs
similarity index 100%
rename from ghcide/test/data/import-placement/DataAtTop.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/DataAtTop.hs
diff --git a/ghcide/test/data/import-placement/ImportAtTop.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/ImportAtTop.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/ImportAtTop.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/ImportAtTop.expected.hs
diff --git a/ghcide/test/data/import-placement/ImportAtTop.hs b/plugins/hls-refactor-plugin/test/data/import-placement/ImportAtTop.hs
similarity index 100%
rename from ghcide/test/data/import-placement/ImportAtTop.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/ImportAtTop.hs
diff --git a/ghcide/test/data/import-placement/LangPragmaModuleAtTop.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/LangPragmaModuleAtTop.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/LangPragmaModuleAtTop.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/LangPragmaModuleAtTop.expected.hs
diff --git a/ghcide/test/data/import-placement/LangPragmaModuleAtTop.hs b/plugins/hls-refactor-plugin/test/data/import-placement/LangPragmaModuleAtTop.hs
similarity index 100%
rename from ghcide/test/data/import-placement/LangPragmaModuleAtTop.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/LangPragmaModuleAtTop.hs
diff --git a/ghcide/test/data/import-placement/LangPragmaModuleExplicitExports.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/LangPragmaModuleExplicitExports.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/LangPragmaModuleExplicitExports.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/LangPragmaModuleExplicitExports.expected.hs
diff --git a/ghcide/test/data/import-placement/LangPragmaModuleExplicitExports.hs b/plugins/hls-refactor-plugin/test/data/import-placement/LangPragmaModuleExplicitExports.hs
similarity index 100%
rename from ghcide/test/data/import-placement/LangPragmaModuleExplicitExports.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/LangPragmaModuleExplicitExports.hs
diff --git a/ghcide/test/data/import-placement/LangPragmaModuleWithComment.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/LangPragmaModuleWithComment.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/LangPragmaModuleWithComment.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/LangPragmaModuleWithComment.expected.hs
diff --git a/ghcide/test/data/import-placement/LangPragmaModuleWithComment.hs b/plugins/hls-refactor-plugin/test/data/import-placement/LangPragmaModuleWithComment.hs
similarity index 100%
rename from ghcide/test/data/import-placement/LangPragmaModuleWithComment.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/LangPragmaModuleWithComment.hs
diff --git a/ghcide/test/data/import-placement/LanguagePragmaAtTop.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/LanguagePragmaAtTop.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/LanguagePragmaAtTop.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/LanguagePragmaAtTop.expected.hs
diff --git a/ghcide/test/data/import-placement/LanguagePragmaAtTop.hs b/plugins/hls-refactor-plugin/test/data/import-placement/LanguagePragmaAtTop.hs
similarity index 100%
rename from ghcide/test/data/import-placement/LanguagePragmaAtTop.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/LanguagePragmaAtTop.hs
diff --git a/ghcide/test/data/import-placement/LanguagePragmaAtTopWithComment.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/LanguagePragmaAtTopWithComment.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/LanguagePragmaAtTopWithComment.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/LanguagePragmaAtTopWithComment.expected.hs
diff --git a/ghcide/test/data/import-placement/LanguagePragmaAtTopWithComment.hs b/plugins/hls-refactor-plugin/test/data/import-placement/LanguagePragmaAtTopWithComment.hs
similarity index 100%
rename from ghcide/test/data/import-placement/LanguagePragmaAtTopWithComment.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/LanguagePragmaAtTopWithComment.hs
diff --git a/ghcide/test/data/import-placement/LanguagePragmasThenShebangs.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/LanguagePragmasThenShebangs.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/LanguagePragmasThenShebangs.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/LanguagePragmasThenShebangs.expected.hs
diff --git a/ghcide/test/data/import-placement/LanguagePragmasThenShebangs.hs b/plugins/hls-refactor-plugin/test/data/import-placement/LanguagePragmasThenShebangs.hs
similarity index 100%
rename from ghcide/test/data/import-placement/LanguagePragmasThenShebangs.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/LanguagePragmasThenShebangs.hs
diff --git a/ghcide/test/data/import-placement/ModuleDeclAndImports.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/ModuleDeclAndImports.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/ModuleDeclAndImports.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/ModuleDeclAndImports.expected.hs
diff --git a/ghcide/test/data/import-placement/ModuleDeclAndImports.hs b/plugins/hls-refactor-plugin/test/data/import-placement/ModuleDeclAndImports.hs
similarity index 100%
rename from ghcide/test/data/import-placement/ModuleDeclAndImports.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/ModuleDeclAndImports.hs
diff --git a/ghcide/test/data/import-placement/MultiLineCommentAtTop.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/MultiLineCommentAtTop.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/MultiLineCommentAtTop.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/MultiLineCommentAtTop.expected.hs
diff --git a/ghcide/test/data/import-placement/MultiLineCommentAtTop.hs b/plugins/hls-refactor-plugin/test/data/import-placement/MultiLineCommentAtTop.hs
similarity index 100%
rename from ghcide/test/data/import-placement/MultiLineCommentAtTop.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/MultiLineCommentAtTop.hs
diff --git a/ghcide/test/data/import-placement/MultiLinePragma.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/MultiLinePragma.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/MultiLinePragma.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/MultiLinePragma.expected.hs
diff --git a/ghcide/test/data/import-placement/MultiLinePragma.hs b/plugins/hls-refactor-plugin/test/data/import-placement/MultiLinePragma.hs
similarity index 100%
rename from ghcide/test/data/import-placement/MultiLinePragma.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/MultiLinePragma.hs
diff --git a/ghcide/test/data/import-placement/MultipleImportsAtTop.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/MultipleImportsAtTop.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/MultipleImportsAtTop.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/MultipleImportsAtTop.expected.hs
diff --git a/ghcide/test/data/import-placement/MultipleImportsAtTop.hs b/plugins/hls-refactor-plugin/test/data/import-placement/MultipleImportsAtTop.hs
similarity index 100%
rename from ghcide/test/data/import-placement/MultipleImportsAtTop.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/MultipleImportsAtTop.hs
diff --git a/ghcide/test/data/import-placement/MultipleLanguagePragmasNoModuleDeclaration.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/MultipleLanguagePragmasNoModuleDeclaration.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/MultipleLanguagePragmasNoModuleDeclaration.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/MultipleLanguagePragmasNoModuleDeclaration.expected.hs
diff --git a/ghcide/test/data/import-placement/MultipleLanguagePragmasNoModuleDeclaration.hs b/plugins/hls-refactor-plugin/test/data/import-placement/MultipleLanguagePragmasNoModuleDeclaration.hs
similarity index 100%
rename from ghcide/test/data/import-placement/MultipleLanguagePragmasNoModuleDeclaration.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/MultipleLanguagePragmasNoModuleDeclaration.hs
diff --git a/ghcide/test/data/import-placement/NewTypeAtTop.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/NewTypeAtTop.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/NewTypeAtTop.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/NewTypeAtTop.expected.hs
diff --git a/ghcide/test/data/import-placement/NewTypeAtTop.hs b/plugins/hls-refactor-plugin/test/data/import-placement/NewTypeAtTop.hs
similarity index 100%
rename from ghcide/test/data/import-placement/NewTypeAtTop.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/NewTypeAtTop.hs
diff --git a/ghcide/test/data/import-placement/NoExplicitExportCommentAtTop.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/NoExplicitExportCommentAtTop.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/NoExplicitExportCommentAtTop.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/NoExplicitExportCommentAtTop.expected.hs
diff --git a/ghcide/test/data/import-placement/NoExplicitExportCommentAtTop.hs b/plugins/hls-refactor-plugin/test/data/import-placement/NoExplicitExportCommentAtTop.hs
similarity index 100%
rename from ghcide/test/data/import-placement/NoExplicitExportCommentAtTop.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/NoExplicitExportCommentAtTop.hs
diff --git a/ghcide/test/data/import-placement/NoExplicitExports.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/NoExplicitExports.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/NoExplicitExports.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/NoExplicitExports.expected.hs
diff --git a/ghcide/test/data/import-placement/NoExplicitExports.hs b/plugins/hls-refactor-plugin/test/data/import-placement/NoExplicitExports.hs
similarity index 100%
rename from ghcide/test/data/import-placement/NoExplicitExports.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/NoExplicitExports.hs
diff --git a/ghcide/test/data/import-placement/NoModuleDeclaration.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/NoModuleDeclaration.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/NoModuleDeclaration.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/NoModuleDeclaration.expected.hs
diff --git a/ghcide/test/data/import-placement/NoModuleDeclaration.hs b/plugins/hls-refactor-plugin/test/data/import-placement/NoModuleDeclaration.hs
similarity index 100%
rename from ghcide/test/data/import-placement/NoModuleDeclaration.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/NoModuleDeclaration.hs
diff --git a/ghcide/test/data/import-placement/NoModuleDeclarationCommentAtTop.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/NoModuleDeclarationCommentAtTop.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/NoModuleDeclarationCommentAtTop.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/NoModuleDeclarationCommentAtTop.expected.hs
diff --git a/ghcide/test/data/import-placement/NoModuleDeclarationCommentAtTop.hs b/plugins/hls-refactor-plugin/test/data/import-placement/NoModuleDeclarationCommentAtTop.hs
similarity index 100%
rename from ghcide/test/data/import-placement/NoModuleDeclarationCommentAtTop.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/NoModuleDeclarationCommentAtTop.hs
diff --git a/ghcide/test/data/import-placement/OptionsNotAtTopWithSpaces.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/OptionsNotAtTopWithSpaces.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/OptionsNotAtTopWithSpaces.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/OptionsNotAtTopWithSpaces.expected.hs
diff --git a/ghcide/test/data/import-placement/OptionsNotAtTopWithSpaces.hs b/plugins/hls-refactor-plugin/test/data/import-placement/OptionsNotAtTopWithSpaces.hs
similarity index 100%
rename from ghcide/test/data/import-placement/OptionsNotAtTopWithSpaces.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/OptionsNotAtTopWithSpaces.hs
diff --git a/ghcide/test/data/import-placement/OptionsPragmaNotAtTop.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/OptionsPragmaNotAtTop.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/OptionsPragmaNotAtTop.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/OptionsPragmaNotAtTop.expected.hs
diff --git a/ghcide/test/data/import-placement/OptionsPragmaNotAtTop.hs b/plugins/hls-refactor-plugin/test/data/import-placement/OptionsPragmaNotAtTop.hs
similarity index 100%
rename from ghcide/test/data/import-placement/OptionsPragmaNotAtTop.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/OptionsPragmaNotAtTop.hs
diff --git a/ghcide/test/data/import-placement/PragmaNotAtTopMultipleComments.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/PragmaNotAtTopMultipleComments.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/PragmaNotAtTopMultipleComments.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/PragmaNotAtTopMultipleComments.expected.hs
diff --git a/ghcide/test/data/import-placement/PragmaNotAtTopMultipleComments.hs b/plugins/hls-refactor-plugin/test/data/import-placement/PragmaNotAtTopMultipleComments.hs
similarity index 100%
rename from ghcide/test/data/import-placement/PragmaNotAtTopMultipleComments.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/PragmaNotAtTopMultipleComments.hs
diff --git a/ghcide/test/data/import-placement/PragmaNotAtTopWithCommentsAtTop.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/PragmaNotAtTopWithCommentsAtTop.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/PragmaNotAtTopWithCommentsAtTop.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/PragmaNotAtTopWithCommentsAtTop.expected.hs
diff --git a/ghcide/test/data/import-placement/PragmaNotAtTopWithCommentsAtTop.hs b/plugins/hls-refactor-plugin/test/data/import-placement/PragmaNotAtTopWithCommentsAtTop.hs
similarity index 100%
rename from ghcide/test/data/import-placement/PragmaNotAtTopWithCommentsAtTop.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/PragmaNotAtTopWithCommentsAtTop.hs
diff --git a/ghcide/test/data/import-placement/PragmaNotAtTopWithImports.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/PragmaNotAtTopWithImports.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/PragmaNotAtTopWithImports.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/PragmaNotAtTopWithImports.expected.hs
diff --git a/ghcide/test/data/import-placement/PragmaNotAtTopWithImports.hs b/plugins/hls-refactor-plugin/test/data/import-placement/PragmaNotAtTopWithImports.hs
similarity index 100%
rename from ghcide/test/data/import-placement/PragmaNotAtTopWithImports.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/PragmaNotAtTopWithImports.hs
diff --git a/ghcide/test/data/import-placement/PragmaNotAtTopWithModuleDecl.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/PragmaNotAtTopWithModuleDecl.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/PragmaNotAtTopWithModuleDecl.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/PragmaNotAtTopWithModuleDecl.expected.hs
diff --git a/ghcide/test/data/import-placement/PragmaNotAtTopWithModuleDecl.hs b/plugins/hls-refactor-plugin/test/data/import-placement/PragmaNotAtTopWithModuleDecl.hs
similarity index 100%
rename from ghcide/test/data/import-placement/PragmaNotAtTopWithModuleDecl.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/PragmaNotAtTopWithModuleDecl.hs
diff --git a/ghcide/test/data/import-placement/PragmasAndShebangsNoComment.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/PragmasAndShebangsNoComment.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/PragmasAndShebangsNoComment.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/PragmasAndShebangsNoComment.expected.hs
diff --git a/ghcide/test/data/import-placement/PragmasAndShebangsNoComment.hs b/plugins/hls-refactor-plugin/test/data/import-placement/PragmasAndShebangsNoComment.hs
similarity index 100%
rename from ghcide/test/data/import-placement/PragmasAndShebangsNoComment.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/PragmasAndShebangsNoComment.hs
diff --git a/ghcide/test/data/import-placement/PragmasShebangsAndModuleDecl.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/PragmasShebangsAndModuleDecl.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/PragmasShebangsAndModuleDecl.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/PragmasShebangsAndModuleDecl.expected.hs
diff --git a/ghcide/test/data/import-placement/PragmasShebangsAndModuleDecl.hs b/plugins/hls-refactor-plugin/test/data/import-placement/PragmasShebangsAndModuleDecl.hs
similarity index 100%
rename from ghcide/test/data/import-placement/PragmasShebangsAndModuleDecl.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/PragmasShebangsAndModuleDecl.hs
diff --git a/ghcide/test/data/import-placement/PragmasShebangsModuleExplicitExports.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/PragmasShebangsModuleExplicitExports.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/PragmasShebangsModuleExplicitExports.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/PragmasShebangsModuleExplicitExports.expected.hs
diff --git a/ghcide/test/data/import-placement/PragmasShebangsModuleExplicitExports.hs b/plugins/hls-refactor-plugin/test/data/import-placement/PragmasShebangsModuleExplicitExports.hs
similarity index 100%
rename from ghcide/test/data/import-placement/PragmasShebangsModuleExplicitExports.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/PragmasShebangsModuleExplicitExports.hs
diff --git a/ghcide/test/data/import-placement/PragmasThenShebangsMultilineComment.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/PragmasThenShebangsMultilineComment.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/PragmasThenShebangsMultilineComment.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/PragmasThenShebangsMultilineComment.expected.hs
diff --git a/ghcide/test/data/import-placement/PragmasThenShebangsMultilineComment.hs b/plugins/hls-refactor-plugin/test/data/import-placement/PragmasThenShebangsMultilineComment.hs
similarity index 100%
rename from ghcide/test/data/import-placement/PragmasThenShebangsMultilineComment.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/PragmasThenShebangsMultilineComment.hs
diff --git a/ghcide/test/data/import-placement/ShebangNotAtTop.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/ShebangNotAtTop.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/ShebangNotAtTop.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/ShebangNotAtTop.expected.hs
diff --git a/ghcide/test/data/import-placement/ShebangNotAtTop.hs b/plugins/hls-refactor-plugin/test/data/import-placement/ShebangNotAtTop.hs
similarity index 100%
rename from ghcide/test/data/import-placement/ShebangNotAtTop.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/ShebangNotAtTop.hs
diff --git a/ghcide/test/data/import-placement/ShebangNotAtTopNoSpace.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/ShebangNotAtTopNoSpace.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/ShebangNotAtTopNoSpace.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/ShebangNotAtTopNoSpace.expected.hs
diff --git a/ghcide/test/data/import-placement/ShebangNotAtTopNoSpace.hs b/plugins/hls-refactor-plugin/test/data/import-placement/ShebangNotAtTopNoSpace.hs
similarity index 100%
rename from ghcide/test/data/import-placement/ShebangNotAtTopNoSpace.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/ShebangNotAtTopNoSpace.hs
diff --git a/ghcide/test/data/import-placement/ShebangNotAtTopWithSpaces.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/ShebangNotAtTopWithSpaces.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/ShebangNotAtTopWithSpaces.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/ShebangNotAtTopWithSpaces.expected.hs
diff --git a/ghcide/test/data/import-placement/ShebangNotAtTopWithSpaces.hs b/plugins/hls-refactor-plugin/test/data/import-placement/ShebangNotAtTopWithSpaces.hs
similarity index 100%
rename from ghcide/test/data/import-placement/ShebangNotAtTopWithSpaces.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/ShebangNotAtTopWithSpaces.hs
diff --git a/ghcide/test/data/import-placement/TwoDashOnlyComment.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/TwoDashOnlyComment.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/TwoDashOnlyComment.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/TwoDashOnlyComment.expected.hs
diff --git a/ghcide/test/data/import-placement/TwoDashOnlyComment.hs b/plugins/hls-refactor-plugin/test/data/import-placement/TwoDashOnlyComment.hs
similarity index 100%
rename from ghcide/test/data/import-placement/TwoDashOnlyComment.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/TwoDashOnlyComment.hs
diff --git a/ghcide/test/data/import-placement/WhereDeclLowerInFile.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/WhereDeclLowerInFile.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/WhereDeclLowerInFile.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/WhereDeclLowerInFile.expected.hs
diff --git a/ghcide/test/data/import-placement/WhereDeclLowerInFile.hs b/plugins/hls-refactor-plugin/test/data/import-placement/WhereDeclLowerInFile.hs
similarity index 100%
rename from ghcide/test/data/import-placement/WhereDeclLowerInFile.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/WhereDeclLowerInFile.hs
diff --git a/ghcide/test/data/import-placement/WhereDeclLowerInFileWithCommentsBeforeIt.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/WhereDeclLowerInFileWithCommentsBeforeIt.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/WhereDeclLowerInFileWithCommentsBeforeIt.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/WhereDeclLowerInFileWithCommentsBeforeIt.expected.hs
diff --git a/ghcide/test/data/import-placement/WhereDeclLowerInFileWithCommentsBeforeIt.hs b/plugins/hls-refactor-plugin/test/data/import-placement/WhereDeclLowerInFileWithCommentsBeforeIt.hs
similarity index 100%
rename from ghcide/test/data/import-placement/WhereDeclLowerInFileWithCommentsBeforeIt.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/WhereDeclLowerInFileWithCommentsBeforeIt.hs
diff --git a/ghcide/test/data/import-placement/WhereKeywordLowerInFileNoExports.expected.hs b/plugins/hls-refactor-plugin/test/data/import-placement/WhereKeywordLowerInFileNoExports.expected.hs
similarity index 100%
rename from ghcide/test/data/import-placement/WhereKeywordLowerInFileNoExports.expected.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/WhereKeywordLowerInFileNoExports.expected.hs
diff --git a/ghcide/test/data/import-placement/WhereKeywordLowerInFileNoExports.hs b/plugins/hls-refactor-plugin/test/data/import-placement/WhereKeywordLowerInFileNoExports.hs
similarity index 100%
rename from ghcide/test/data/import-placement/WhereKeywordLowerInFileNoExports.hs
rename to plugins/hls-refactor-plugin/test/data/import-placement/WhereKeywordLowerInFileNoExports.hs
diff --git a/plugins/hls-refine-imports-plugin/hls-refine-imports-plugin.cabal b/plugins/hls-refine-imports-plugin/hls-refine-imports-plugin.cabal
index 98d36465e4a..ebbe0b271c3 100644
--- a/plugins/hls-refine-imports-plugin/hls-refine-imports-plugin.cabal
+++ b/plugins/hls-refine-imports-plugin/hls-refine-imports-plugin.cabal
@@ -16,6 +16,10 @@ extra-source-files:
   test/testdata/*.yaml
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:    Ide.Plugin.RefineImports
   hs-source-dirs:     src
   build-depends:
@@ -38,6 +42,10 @@ library
     TypeOperators
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-rename-plugin/hls-rename-plugin.cabal b/plugins/hls-rename-plugin/hls-rename-plugin.cabal
index c6f20198fe5..43f8397fbeb 100644
--- a/plugins/hls-rename-plugin/hls-rename-plugin.cabal
+++ b/plugins/hls-rename-plugin/hls-rename-plugin.cabal
@@ -17,6 +17,10 @@ extra-source-files:
   test/testdata/*.yaml
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:  Ide.Plugin.Rename
   hs-source-dirs:   src
   build-depends:
@@ -29,6 +33,7 @@ library
     , hashable
     , hiedb
     , hls-plugin-api        ^>= 1.3 || ^>=1.4
+    , hls-refactor-plugin
     , lsp
     , lsp-types
     , mod
@@ -40,6 +45,10 @@ library
   default-language: Haskell2010
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-rename-plugin/src/Ide/Plugin/Rename.hs b/plugins/hls-rename-plugin/src/Ide/Plugin/Rename.hs
index b83423254a4..c6c1238b61e 100644
--- a/plugins/hls-rename-plugin/src/Ide/Plugin/Rename.hs
+++ b/plugins/hls-rename-plugin/src/Ide/Plugin/Rename.hs
@@ -29,6 +29,7 @@ import qualified Data.Map                              as M
 import           Data.Maybe
 import           Data.Mod.Word
 import qualified Data.Text                             as T
+import           Development.IDE                      (Recorder, WithPriority)
 import           Development.IDE.Core.PositionMapping
 import           Development.IDE.Core.RuleTypes
 import           Development.IDE.Core.Service
@@ -39,8 +40,10 @@ import           Development.IDE.GHC.Compat.Parser
 import           Development.IDE.GHC.Compat.Units
 import           Development.IDE.GHC.Error
 import           Development.IDE.GHC.ExactPrint
+import qualified Development.IDE.GHC.ExactPrint       as E
 import           Development.IDE.Spans.AtPoint
 import           Development.IDE.Types.Location
+import           Development.IDE.Plugin.CodeAction
 import           HieDb.Query
 import           Ide.Plugin.Properties
 import           Ide.PluginUtils
@@ -50,8 +53,8 @@ import           Language.LSP.Types
 
 instance Hashable (Mod a) where hash n = hash (unMod n)
 
-descriptor :: PluginId -> PluginDescriptor IdeState
-descriptor pluginId = (defaultPluginDescriptor pluginId)
+descriptor :: Recorder (WithPriority E.Log) -> PluginId -> PluginDescriptor IdeState
+descriptor recorder pluginId = mkExactprintPluginDescriptor recorder $ (defaultPluginDescriptor pluginId)
     { pluginHandlers = mkPluginHandler STextDocumentRename renameProvider
     , pluginConfigDescriptor = defaultConfigDescriptor
         { configCustomConfig = mkCustomConfig properties }
diff --git a/plugins/hls-rename-plugin/test/Main.hs b/plugins/hls-rename-plugin/test/Main.hs
index 21151dec1a3..5d662b1ad6f 100644
--- a/plugins/hls-rename-plugin/test/Main.hs
+++ b/plugins/hls-rename-plugin/test/Main.hs
@@ -13,7 +13,7 @@ main :: IO ()
 main = defaultTestRunner tests
 
 renamePlugin :: PluginDescriptor IdeState
-renamePlugin = Rename.descriptor "rename"
+renamePlugin = Rename.descriptor mempty "rename"
 
 -- See https://github.com/wz1000/HieDb/issues/45
 recordConstructorIssue :: String
diff --git a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal
index 3313ffe6105..c86bacbb209 100644
--- a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal
+++ b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal
@@ -13,6 +13,10 @@ build-type:         Simple
 extra-source-files: LICENSE
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:    Ide.Plugin.Retrie
   hs-source-dirs:     src
   build-depends:
diff --git a/plugins/hls-splice-plugin/hls-splice-plugin.cabal b/plugins/hls-splice-plugin/hls-splice-plugin.cabal
index ae13452eaa3..0ea73506de5 100644
--- a/plugins/hls-splice-plugin/hls-splice-plugin.cabal
+++ b/plugins/hls-splice-plugin/hls-splice-plugin.cabal
@@ -23,6 +23,10 @@ extra-source-files:
   test/testdata/*.yaml
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:
     Ide.Plugin.Splice
     Ide.Plugin.Splice.Types
@@ -40,6 +44,7 @@ library
     , ghc-exactprint
     , ghcide                ^>=1.6 || ^>=1.7
     , hls-plugin-api        ^>=1.3 || ^>=1.4
+    , hls-refactor-plugin
     , lens
     , lsp
     , retrie
@@ -55,6 +60,10 @@ library
     TypeOperators
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-splice-plugin/src/Ide/Plugin/Splice.hs b/plugins/hls-splice-plugin/src/Ide/Plugin/Splice.hs
index 14ce3917835..41b57747060 100644
--- a/plugins/hls-splice-plugin/src/Ide/Plugin/Splice.hs
+++ b/plugins/hls-splice-plugin/src/Ide/Plugin/Splice.hs
@@ -47,6 +47,7 @@ import           Data.Maybe                      (fromMaybe, listToMaybe,
 import qualified Data.Text                       as T
 import           Development.IDE
 import           Development.IDE.GHC.Compat      as Compat hiding (getLoc)
+import           Development.IDE.GHC.Compat.ExactPrint
 import qualified Development.IDE.GHC.Compat.Util as Util
 import           Development.IDE.GHC.ExactPrint
 import           GHC.Exts
diff --git a/plugins/hls-stan-plugin/hls-stan-plugin.cabal b/plugins/hls-stan-plugin/hls-stan-plugin.cabal
index 0f63a01a77e..5c149e18b44 100644
--- a/plugins/hls-stan-plugin/hls-stan-plugin.cabal
+++ b/plugins/hls-stan-plugin/hls-stan-plugin.cabal
@@ -76,4 +76,4 @@ test-suite test
     , text
  default-extensions:
     NamedFieldPuns
-    OverloadedStrings
\ No newline at end of file
+    OverloadedStrings
diff --git a/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal b/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal
index c161f888bf9..f7b229b4e7f 100644
--- a/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal
+++ b/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal
@@ -16,6 +16,10 @@ extra-source-files:
   test/testdata/*.hs
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:  Ide.Plugin.StylishHaskell
   hs-source-dirs:   src
   build-depends:
@@ -33,6 +37,10 @@ library
   default-language: Haskell2010
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
diff --git a/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal b/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal
index 781c39028a0..bbb7e9e104b 100644
--- a/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal
+++ b/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal
@@ -25,6 +25,10 @@ flag pedantic
   manual:      True
 
 library
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   hs-source-dirs:     src
   exposed-modules:
     Ide.Plugin.Tactic
@@ -85,6 +89,7 @@ library
     , ghcide                ^>=1.7
     , hls-graph
     , hls-plugin-api        ^>=1.4
+    , hls-refactor-plugin
     , hyphenation
     , lens
     , lsp
@@ -126,6 +131,10 @@ library
     ViewPatterns
 
 test-suite tests
+  if impl(ghc >= 9.3)
+    buildable: False
+  else
+    buildable: True
   type:               exitcode-stdio-1.0
   main-is:            Main.hs
   other-modules:
diff --git a/plugins/hls-tactics-plugin/src/Wingman/LanguageServer.hs b/plugins/hls-tactics-plugin/src/Wingman/LanguageServer.hs
index ed896a99ebe..d80e3368645 100644
--- a/plugins/hls-tactics-plugin/src/Wingman/LanguageServer.hs
+++ b/plugins/hls-tactics-plugin/src/Wingman/LanguageServer.hs
@@ -34,6 +34,7 @@ import           Development.IDE.Core.Shake (IdeState (..), uses, define, use, a
 import qualified Development.IDE.Core.Shake as IDE
 import           Development.IDE.Core.UseStale
 import           Development.IDE.GHC.Compat hiding (empty)
+import           Development.IDE.GHC.Compat.ExactPrint
 import qualified Development.IDE.GHC.Compat.Util as FastString
 import           Development.IDE.GHC.Error (realSrcSpanToRange)
 import           Development.IDE.GHC.ExactPrint hiding (LogShake, Log)
diff --git a/plugins/hls-tactics-plugin/src/Wingman/Plugin.hs b/plugins/hls-tactics-plugin/src/Wingman/Plugin.hs
index 6473a725d5c..b55ee31ae34 100644
--- a/plugins/hls-tactics-plugin/src/Wingman/Plugin.hs
+++ b/plugins/hls-tactics-plugin/src/Wingman/Plugin.hs
@@ -3,6 +3,8 @@ module Wingman.Plugin where
 
 import           Control.Monad
 import           Development.IDE.Core.Shake (IdeState (..))
+import           Development.IDE.Plugin.CodeAction
+import qualified Development.IDE.GHC.ExactPrint                   as E
 import           Ide.Types
 import           Language.LSP.Types
 import           Prelude hiding (span)
@@ -15,17 +17,20 @@ import           Wingman.LanguageServer.Metaprogram (hoverProvider)
 import           Wingman.StaticPlugin
 import Development.IDE.Types.Logger (Recorder, cmapWithPrio, WithPriority, Pretty (pretty))
 
-newtype Log
+data Log
   = LogWingmanLanguageServer WingmanLanguageServer.Log 
+  | LogExactPrint E.Log
   deriving Show
 
 instance Pretty Log where
   pretty = \case
     LogWingmanLanguageServer log -> pretty log
+    LogExactPrint exactPrintLog -> pretty exactPrintLog
 
 descriptor :: Recorder (WithPriority Log) -> PluginId -> PluginDescriptor IdeState
 descriptor recorder plId
-  = installInteractions
+  = mkExactprintPluginDescriptor (cmapWithPrio LogExactPrint recorder)
+  $ installInteractions
       ( emptyCaseInteraction
       : fmap makeTacticInteraction [minBound .. maxBound]
       )
diff --git a/src/HlsPlugins.hs b/src/HlsPlugins.hs
index 2fc1e41235a..2adef201dc8 100644
--- a/src/HlsPlugins.hs
+++ b/src/HlsPlugins.hs
@@ -115,6 +115,10 @@ import qualified Ide.Plugin.StylishHaskell         as StylishHaskell
 import qualified Ide.Plugin.Brittany               as Brittany
 #endif
 
+#if hls_refactor
+import qualified Development.IDE.Plugin.CodeAction as Refactor
+#endif
+
 data Log = forall a. (Pretty a) => Log a
 
 instance Pretty Log where
@@ -152,7 +156,7 @@ idePlugins recorder = pluginDescToIdePlugins allPlugins
       StylishHaskell.descriptor "stylish-haskell" :
 #endif
 #if hls_rename
-      Rename.descriptor "rename" :
+      Rename.descriptor pluginRecorder "rename" :
 #endif
 #if hls_retrie
       Retrie.descriptor "retrie" :
@@ -167,7 +171,7 @@ idePlugins recorder = pluginDescToIdePlugins allPlugins
       Class.descriptor pluginRecorder "class" :
 #endif
 #if hls_haddockComments
-      HaddockComments.descriptor "haddockComments" :
+      HaddockComments.descriptor pluginRecorder "haddockComments" :
 #endif
 #if hls_eval
       Eval.descriptor pluginRecorder "eval" :
@@ -204,6 +208,13 @@ idePlugins recorder = pluginDescToIdePlugins allPlugins
 #endif
 #if hls_gadt
       GADT.descriptor "gadt" :
+#endif
+#if hls_refactor
+      Refactor.iePluginDescriptor pluginRecorder "ghcide-code-actions-imports-exports" :
+      Refactor.typeSigsPluginDescriptor pluginRecorder "ghcide-code-actions-type-signatures" :
+      Refactor.bindingsPluginDescriptor pluginRecorder "ghcide-code-actions-bindings" :
+      Refactor.fillHolePluginDescriptor pluginRecorder "ghcide-code-actions-fill-holes" :
+      Refactor.extendImportPluginDescriptor pluginRecorder "ghcide-extend-import-action" :
 #endif
       GhcIde.descriptors pluginRecorder
 #if explicitFixity
diff --git a/stack-lts16.yaml b/stack-lts16.yaml
index bbc53ea8530..50120b1841b 100644
--- a/stack-lts16.yaml
+++ b/stack-lts16.yaml
@@ -5,6 +5,7 @@ packages:
   - ./hie-compat
   - ./hls-graph
   - ./ghcide/
+  - ./ghcide/test
   - ./shake-bench
   - ./hls-plugin-api
   - ./hls-test-utils
@@ -33,6 +34,7 @@ packages:
   - ./plugins/hls-change-type-signature-plugin
   - ./plugins/hls-gadt-plugin
   - ./plugins/hls-explicit-fixity-plugin
+  - ./plugins/hls-refactor-plugin
 
 ghc-options:
   "$everything": -haddock
diff --git a/stack-lts19.yaml b/stack-lts19.yaml
index 3c9bd985085..c13433ac13c 100644
--- a/stack-lts19.yaml
+++ b/stack-lts19.yaml
@@ -5,6 +5,7 @@ packages:
   - ./hie-compat
   - ./hls-graph
   - ./ghcide/
+  - ./ghcide/test
   - ./hls-plugin-api
   - ./hls-test-utils
   # - ./shake-bench
@@ -32,6 +33,7 @@ packages:
   - ./plugins/hls-change-type-signature-plugin
   - ./plugins/hls-gadt-plugin
   - ./plugins/hls-explicit-fixity-plugin
+  - ./plugins/hls-refactor-plugin
 
 ghc-options:
   "$everything": -haddock
diff --git a/stack.yaml b/stack.yaml
index 923990c885f..5a0649322ad 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -5,6 +5,7 @@ packages:
 - ./hie-compat
 - ./hls-graph
 - ./ghcide/
+- ./ghcide/test
 - ./hls-plugin-api
 - ./hls-test-utils
 - ./shake-bench
@@ -32,6 +33,7 @@ packages:
 - ./plugins/hls-change-type-signature-plugin
 - ./plugins/hls-gadt-plugin
 - ./plugins/hls-explicit-fixity-plugin
+- ./plugins/hls-refactor-plugin
 
 extra-deps:
 - floskell-0.10.6@sha256:e77d194189e8540abe2ace2c7cb8efafc747ca35881a2fefcbd2d40a1292e036,3819
diff --git a/test/functional/Format.hs b/test/functional/Format.hs
index 9b853d527e6..b3829c3a9ff 100644
--- a/test/functional/Format.hs
+++ b/test/functional/Format.hs
@@ -8,6 +8,7 @@ import           Data.Aeson
 import qualified Data.ByteString.Lazy    as BS
 import qualified Data.Text.Encoding      as T
 import qualified Data.Text.IO            as T
+import qualified Data.Text               as T
 import           Language.LSP.Test
 import           Language.LSP.Types
 import qualified Language.LSP.Types.Lens as LSP
@@ -47,10 +48,13 @@ providerTests = testGroup "formatting provider" [
     testCase "respects none" $ runSessionWithConfig (formatConfig "none") hlsCommand fullCaps "test/testdata/format" $ do
         doc <- openDoc "Format.hs" "haskell"
         resp <- request STextDocumentFormatting $ DocumentFormattingParams Nothing doc (FormattingOptions 2 True Nothing Nothing Nothing)
-        liftIO $ resp ^. LSP.result @?= Left (ResponseError InvalidRequest
-            ("No plugin enabled for STextDocumentFormatting, available:\n"
-            <> "PluginId \"floskell\"\nPluginId \"fourmolu\"\nPluginId \"stylish-haskell\"\nPluginId \"brittany\"\nPluginId \"ormolu\"\n")
-            Nothing)
+        liftIO $ case resp ^. LSP.result of
+          result@(Left (ResponseError reason message Nothing)) -> case reason of
+            MethodNotFound -> pure () -- No formatter
+            InvalidRequest | "No plugin enabled for STextDocumentFormatting" `T.isPrefixOf` message -> pure ()
+            _ -> assertFailure $ "strange response from formatting provider:" ++ show result
+          result -> assertFailure $ "strange response from formatting provider:" ++ show result
+
 
     , requiresOrmoluPlugin . requiresFloskellPlugin $ testCase "can change on the fly" $ runSession hlsCommand fullCaps "test/testdata/format" $ do
         formattedOrmolu <- liftIO $ T.readFile "test/testdata/format/Format.ormolu.formatted.hs"
diff --git a/test/functional/FunctionalCodeAction.hs b/test/functional/FunctionalCodeAction.hs
index 91cb322e202..aa7bf9253ba 100644
--- a/test/functional/FunctionalCodeAction.hs
+++ b/test/functional/FunctionalCodeAction.hs
@@ -24,6 +24,7 @@ import           Test.Hls.Command
 
 tests :: TestTree
 tests = testGroup "code actions" [
+#if hls_refactor
       importTests
     , packageTests
     , redundantImportTests
@@ -31,6 +32,7 @@ tests = testGroup "code actions" [
     , signatureTests
     , typedHoleTests
     , unusedTermTests
+#endif
     ]
 
 renameTests :: TestTree