From 7694ab2e132b20283ba808d043d9cce715b62f69 Mon Sep 17 00:00:00 2001 From: Patrick Date: Thu, 2 May 2024 23:49:28 +0800 Subject: [PATCH 1/4] add threadId to ghcide test --- ghcide/test/exe/Main.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghcide/test/exe/Main.hs b/ghcide/test/exe/Main.hs index 7031065aba..97f9ed9137 100644 --- a/ghcide/test/exe/Main.hs +++ b/ghcide/test/exe/Main.hs @@ -71,10 +71,11 @@ import SymlinkTests import THTests import UnitTests import WatchedFileTests +import Development.IDE (LoggingColumn(..)) main :: IO () main = do - docWithPriorityRecorder <- makeDefaultStderrRecorder (Just [PriorityColumn, DataColumn]) + docWithPriorityRecorder <- makeDefaultStderrRecorder (Just [ThreadIdColumn, PriorityColumn, DataColumn]) let docWithFilteredPriorityRecorder = docWithPriorityRecorder From 0bbf36ac744477e11a72d93d181a6b00d68e081e Mon Sep 17 00:00:00 2001 From: Patrick Date: Thu, 2 May 2024 23:50:23 +0800 Subject: [PATCH 2/4] add threadId to ghcide test --- ghcide/test/exe/Main.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghcide/test/exe/Main.hs b/ghcide/test/exe/Main.hs index 97f9ed9137..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 @@ -71,7 +72,6 @@ import SymlinkTests import THTests import UnitTests import WatchedFileTests -import Development.IDE (LoggingColumn(..)) main :: IO () main = do From 6a61ab23acf011310014f1ce1bf964d797ad6083 Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 3 May 2024 03:22:02 +0800 Subject: [PATCH 3/4] add thread id by default in ghcide-tests --- ghcide/exe/Main.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 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 From 1177c40c10487d66664cf518a5d1490618203de7 Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 3 May 2024 05:32:04 +0800 Subject: [PATCH 4/4] remove redundant log --- hls-test-utils/src/Test/Hls/FileSystem.hs | 1 - 1 file changed, 1 deletion(-) 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 ()