Rollup edits

configuration-ghc-92.nix

@@ -12,7 +12,13 @@ let
   hpkgsOverride = hself: hsuper:
     with pkgs.haskell.lib;
     {
+      # haddock seems broken on aarch64-darwin for some reason
+      ghc-trace-events = if pkgs.stdenv.isDarwin && pkgs.stdenv.isAarch64 then dontHaddock hsuper.ghc-trace-events else hsuper.ghc-trace-events;
+      parsers = if pkgs.stdenv.isDarwin && pkgs.stdenv.isAarch64 then dontHaddock hsuper.parsers else hsuper.parsers;
+      prettyprinter-ansi-terminal = if pkgs.stdenv.isDarwin && pkgs.stdenv.isAarch64 then dontHaddock hsuper.prettyprinter-ansi-terminal else hsuper.prettyprinter-ansi-terminal;
+
       hlsDisabledPlugins = disabledPlugins;
+
       # YOLO
       mkDerivation = args:
         hsuper.mkDerivation (args // {

flake.nix

@@ -22,6 +22,11 @@
       flake = false;
     };
 
+    hiedb_0_4_1_0 = {
+      url = "github:matthewbauer/HieDb/remove-no-break-space";
+      flake = false;
+    };
+
     # List of hackage dependencies
     lsp = {
       url = "https://hackage.haskell.org/package/lsp-1.4.0.0/lsp-1.4.0.0.tar.gz";
@@ -92,7 +97,7 @@
       flake = false;
     };
     myst-parser = {
-      url = "github:smunix/MyST-Parser?ref=fix.hls-docutils"; 
+      url = "github:smunix/MyST-Parser?ref=fix.hls-docutils";
       flake = false;
     };
     # For https://github.com/readthedocs/sphinx_rtd_theme/pull/1185, otherwise lists are broken locally
@@ -123,7 +128,7 @@
               in hsuper.mkDerivation (args // {
                 jailbreak = if broken then true else jailbreak;
                 doCheck = if broken then false else check;
-                # Library profiling is disabled as it causes long compilation time 
+                # Library profiling is disabled as it causes long compilation time
                 # on our CI jobs. Nix users are free tor revert this anytime.
                 enableLibraryProfiling = false;
                 doHaddock = false;
@@ -170,8 +175,7 @@
                 else hsuper.ormolu;
             };
 
-          hlsSources =
-            builtins.mapAttrs (_: dir: gitignoreSource dir) sourceDirs;
+          hlsSources = sourceDirs;
 
           extended = hpkgs:
             (hpkgs.override (old: {
@@ -250,7 +254,7 @@
         ghc922Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; };
 
         # GHC versions
-        # While HLS still works fine with 8.10 GHCs, we only support the versions that are cached 
+        # While HLS still works fine with 8.10 GHCs, we only support the versions that are cached
         # by upstream nixpkgs, which now only includes GHC version 9+
         supportedGHCs = let
           ghcVersion = "ghc" + (pkgs.lib.replaceStrings ["."] [""] pkgs.haskellPackages.ghc.version);
@@ -268,14 +272,14 @@
         myst-parser = pkgs.poetry2nix.mkPoetryEnv {
           projectDir = inputs.myst-parser;
           python = pkgs.python39;
-          overrides = [ 
+          overrides = [
             pkgs.poetry2nix.defaultPoetryOverrides
           ];
         };
         sphinx_rtd_theme = pkgs.poetry2nix.mkPoetryEnv {
           projectDir = inputs.sphinx_rtd_theme;
           python = pkgs.python39;
-          overrides = [ 
+          overrides = [
             pkgs.poetry2nix.defaultPoetryOverrides
             (self: super: {
               # The RTD theme doesn't work with newer docutils

ghcide/exe/Arguments.hs

@@ -15,6 +15,7 @@ data Arguments = Arguments
     ,argsOTMemoryProfiling          :: Bool
     ,argsTesting                    :: Bool
     ,argsDisableKick                :: Bool
+    ,argsVerifyCoreFile             :: Bool
     ,argsThreads                    :: Int
     ,argsVerbose                    :: Bool
     ,argsCommand                    :: Command
@@ -37,6 +38,7 @@ arguments plugins = Arguments
       <*> switch (long "ot-memory-profiling" <> help "Record OpenTelemetry info to the eventlog. Needs the -l RTS flag to have an effect")
       <*> switch (long "test" <> help "Enable additional lsp messages used by the testsuite")
       <*> switch (long "test-no-kick" <> help "Disable kick. Useful for testing cancellation")
+      <*> switch (long "verify-core-file" <> help "Verify core trips by roundtripping after serialization. Slow, only useful for testing purposes")
       <*> option auto (short 'j' <> help "Number of threads (0: automatic)" <> metavar "NUM" <> value 0 <> showDefault)
       <*> switch (short 'd' <> long "verbose" <> help "Include internal events in logging output")
       <*> (commandP plugins <|> lspCommand <|> checkCommand)

ghcide/exe/Main.hs

@@ -142,6 +142,7 @@ main = withTelemetryLogger $ \telemetryLogger -> do
                 , optCheckParents = pure $ checkParents config
                 , optCheckProject = pure $ checkProject config
                 , optRunSubset = not argsConservativeChangeTracking
+                , optVerifyCoreFile = argsVerifyCoreFile
                 }
         , IDEMain.argsMonitoring = OpenTelemetry.monitoring <> EKG.monitoring logger argsMonitoringPort
         }

ghcide/ghcide.cabal

@@ -180,6 +180,7 @@ library
         Development.IDE.GHC.Compat.Units
         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