From ced09a7456f2eea10dc19fc60e3d3d39315669ec Mon Sep 17 00:00:00 2001
From: soulomoon <fwy996602672@gmail.com>
Date: Sat, 4 May 2024 19:39:12 +0800
Subject: [PATCH] Add thread id in ghcide tests log (#4204)

* add threadId to ghcide test

* add threadId to ghcide test

* add thread id by default in ghcide-tests

* remove redundant log
---
 ghcide/exe/Main.hs                        | 4 ++--
 ghcide/test/exe/Main.hs                   | 3 ++-
 hls-test-utils/src/Test/Hls/FileSystem.hs | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ghcide/exe/Main.hs b/ghcide/exe/Main.hs
index a38c5909f3..823d6faba6 100644
--- a/ghcide/exe/Main.hs
+++ b/ghcide/exe/Main.hs
@@ -21,7 +21,7 @@ import qualified Development.IDE.Main                     as IDEMain
 import qualified Development.IDE.Monitoring.OpenTelemetry as OpenTelemetry
 import qualified Development.IDE.Plugin.HLS.GhcIde        as GhcIde
 import           Development.IDE.Types.Options
-import           Ide.Logger                               (LoggingColumn (DataColumn, PriorityColumn),
+import           Ide.Logger                               (LoggingColumn (..),
                                                            Pretty (pretty),
                                                            Priority (Debug, Error, Info),
                                                            WithPriority (WithPriority, priority),
@@ -73,7 +73,7 @@ main = withTelemetryRecorder $ \telemetryRecorder -> do
     -- stderr recorder just for plugin cli commands
     pluginCliRecorder <-
       cmapWithPrio pretty
-      <$> makeDefaultStderrRecorder (Just [PriorityColumn, DataColumn])
+      <$> makeDefaultStderrRecorder (Just [ThreadIdColumn, PriorityColumn, DataColumn])
 
     let hlsPlugins = pluginDescToIdePlugins (GhcIde.descriptors (cmapWithPrio LogGhcIde pluginCliRecorder))
     -- WARNING: If you write to stdout before runLanguageServer
diff --git a/ghcide/test/exe/Main.hs b/ghcide/test/exe/Main.hs
index 7031065aba..2dd21838cc 100644
--- a/ghcide/test/exe/Main.hs
+++ b/ghcide/test/exe/Main.hs
@@ -49,6 +49,7 @@ import           CompletionTests
 import           CPPTests
 import           CradleTests
 import           DependentFileTest
+import           Development.IDE              (LoggingColumn (..))
 import           DiagnosticTests
 import           ExceptionTests
 import           FindDefinitionAndHoverTests
@@ -74,7 +75,7 @@ import           WatchedFileTests
 
 main :: IO ()
 main = do
-  docWithPriorityRecorder <- makeDefaultStderrRecorder (Just [PriorityColumn, DataColumn])
+  docWithPriorityRecorder <- makeDefaultStderrRecorder (Just [ThreadIdColumn, PriorityColumn, DataColumn])
 
   let docWithFilteredPriorityRecorder =
         docWithPriorityRecorder
diff --git a/hls-test-utils/src/Test/Hls/FileSystem.hs b/hls-test-utils/src/Test/Hls/FileSystem.hs
index 1416564e38..c93643badd 100644
--- a/hls-test-utils/src/Test/Hls/FileSystem.hs
+++ b/hls-test-utils/src/Test/Hls/FileSystem.hs
@@ -115,7 +115,6 @@ materialise rootDir' fileTree testDataDir' = do
       copyDir' root dir = do
         files <- fmap FP.normalise . lines <$> withCurrentDirectory (testDataDir </> dir) (readProcess "git" ["ls-files", "--cached", "--modified", "--others"] "")
         mapM_ (createDirectoryIfMissing True . ((root </>) . takeDirectory)) files
-        mapM_ (\f -> putStrLn $ (testDataDir </> dir </> f) <> ":" <> (root </> f) ) files
         mapM_ (\f -> copyFile (testDataDir </> dir </> f) (root </> f)) files
         return ()