From 24272711c9d4f15adda5288710389d72d8c2a7ac Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 14 Apr 2024 19:51:11 +0800 Subject: [PATCH 1/7] enable ThreadId for when testing --- hls-test-utils/src/Test/Hls.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hls-test-utils/src/Test/Hls.hs b/hls-test-utils/src/Test/Hls.hs index 9c4c33cad2..c4edf288c0 100644 --- a/hls-test-utils/src/Test/Hls.hs +++ b/hls-test-utils/src/Test/Hls.hs @@ -348,7 +348,7 @@ pluginTestRecorder = do -- See 'runSessionWithServer'' for details. initialiseTestRecorder :: Pretty a => [String] -> IO (Recorder (WithPriority a)) initialiseTestRecorder envVars = do - docWithPriorityRecorder <- makeDefaultStderrRecorder Nothing + docWithPriorityRecorder <- makeDefaultStderrRecorder (Just [ThreadIdColumn]) -- There are potentially multiple environment variables that enable this logger definedEnvVars <- forM envVars (\var -> fromMaybe "0" <$> lookupEnv var) let logStdErr = any (/= "0") definedEnvVars From 6ff66e752b0e9d39bb7053fe3c0f8b4acebae9b3 Mon Sep 17 00:00:00 2001 From: soulomoon Date: Mon, 15 Apr 2024 00:20:20 +0800 Subject: [PATCH 2/7] Update Hls.hs Co-authored-by: fendor --- hls-test-utils/src/Test/Hls.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hls-test-utils/src/Test/Hls.hs b/hls-test-utils/src/Test/Hls.hs index c4edf288c0..4a417ffd56 100644 --- a/hls-test-utils/src/Test/Hls.hs +++ b/hls-test-utils/src/Test/Hls.hs @@ -348,7 +348,7 @@ pluginTestRecorder = do -- See 'runSessionWithServer'' for details. initialiseTestRecorder :: Pretty a => [String] -> IO (Recorder (WithPriority a)) initialiseTestRecorder envVars = do - docWithPriorityRecorder <- makeDefaultStderrRecorder (Just [ThreadIdColumn]) + docWithPriorityRecorder <- makeDefaultStderrRecorder (Just $ [ThreadIdColumn] <> defaultLoggingColumns) -- There are potentially multiple environment variables that enable this logger definedEnvVars <- forM envVars (\var -> fromMaybe "0" <$> lookupEnv var) let logStdErr = any (/= "0") definedEnvVars From 024382bcf4b80d5b2085e78bac7186fbb82edff5 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 15 Apr 2024 16:13:02 +0800 Subject: [PATCH 3/7] export defaultLoggingColumns Ide.Logger --- hls-plugin-api/src/Ide/Logger.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/hls-plugin-api/src/Ide/Logger.hs b/hls-plugin-api/src/Ide/Logger.hs index 0a6cb5237f..2e3d0ba3c8 100644 --- a/hls-plugin-api/src/Ide/Logger.hs +++ b/hls-plugin-api/src/Ide/Logger.hs @@ -27,6 +27,7 @@ module Ide.Logger , module PrettyPrinterModule , renderStrict , toCologActionWithPrio + , defaultLoggingColumns ) where import Colog.Core (LogAction (..), Severity, From e1ddd9c32f9ea251b27c4cb00a4f67b27440bb6e Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 15 Apr 2024 16:13:47 +0800 Subject: [PATCH 4/7] import defaultLoggingColumns --- hls-test-utils/src/Test/Hls.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/hls-test-utils/src/Test/Hls.hs b/hls-test-utils/src/Test/Hls.hs index 4a417ffd56..80c764db6b 100644 --- a/hls-test-utils/src/Test/Hls.hs +++ b/hls-test-utils/src/Test/Hls.hs @@ -96,6 +96,7 @@ import Ide.Logger (Pretty (pretty), cfilter, cmapWithPrio, logWith, makeDefaultStderrRecorder, + defaultLoggingColumns, (<+>)) import Ide.Types import Language.LSP.Protocol.Capabilities From 76ff018cdd87a748c2e2866cff7fd020378a4622 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 16 Apr 2024 23:10:00 +0800 Subject: [PATCH 5/7] fix format --- hls-test-utils/src/Test/Hls.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hls-test-utils/src/Test/Hls.hs b/hls-test-utils/src/Test/Hls.hs index 80c764db6b..23a6021d15 100644 --- a/hls-test-utils/src/Test/Hls.hs +++ b/hls-test-utils/src/Test/Hls.hs @@ -94,9 +94,9 @@ import Ide.Logger (Pretty (pretty), Priority (..), Recorder, WithPriority (WithPriority, priority), cfilter, cmapWithPrio, + defaultLoggingColumns, logWith, makeDefaultStderrRecorder, - defaultLoggingColumns, (<+>)) import Ide.Types import Language.LSP.Protocol.Capabilities From cf529aa627b5b6fbb7dfe5a897e65802076df841 Mon Sep 17 00:00:00 2001 From: soulomoon Date: Wed, 17 Apr 2024 00:03:24 +0800 Subject: [PATCH 6/7] Update hls-test-utils/src/Test/Hls.hs Co-authored-by: Jan Hrcek <2716069+jhrcek@users.noreply.github.com> --- hls-test-utils/src/Test/Hls.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hls-test-utils/src/Test/Hls.hs b/hls-test-utils/src/Test/Hls.hs index 23a6021d15..ab737a47dc 100644 --- a/hls-test-utils/src/Test/Hls.hs +++ b/hls-test-utils/src/Test/Hls.hs @@ -349,7 +349,7 @@ pluginTestRecorder = do -- See 'runSessionWithServer'' for details. initialiseTestRecorder :: Pretty a => [String] -> IO (Recorder (WithPriority a)) initialiseTestRecorder envVars = do - docWithPriorityRecorder <- makeDefaultStderrRecorder (Just $ [ThreadIdColumn] <> defaultLoggingColumns) + docWithPriorityRecorder <- makeDefaultStderrRecorder (Just $ ThreadIdColumn : defaultLoggingColumns) -- There are potentially multiple environment variables that enable this logger definedEnvVars <- forM envVars (\var -> fromMaybe "0" <$> lookupEnv var) let logStdErr = any (/= "0") definedEnvVars From 9b96f9c0835d3518c6028780bd6ea4fbb7edd214 Mon Sep 17 00:00:00 2001 From: Patrick Date: Wed, 17 Apr 2024 01:25:11 +0800 Subject: [PATCH 7/7] fix import --- hls-test-utils/src/Test/Hls.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hls-test-utils/src/Test/Hls.hs b/hls-test-utils/src/Test/Hls.hs index ab737a47dc..25f0f1d702 100644 --- a/hls-test-utils/src/Test/Hls.hs +++ b/hls-test-utils/src/Test/Hls.hs @@ -80,7 +80,7 @@ import Data.Proxy (Proxy (Proxy)) import qualified Data.Text as T import qualified Data.Text.Lazy as TL import qualified Data.Text.Lazy.Encoding as TL -import Development.IDE (IdeState) +import Development.IDE (IdeState, LoggingColumn (ThreadIdColumn)) import Development.IDE.Main hiding (Log) import qualified Development.IDE.Main as Ghcide import qualified Development.IDE.Main as IDEMain