Skip to content

Commit 4b11cbf

Browse files
committed
Fix dodgy import in hls-semantic-token-plugin
1 parent f2970f6 commit 4b11cbf

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

ghcide/src/Development/IDE/GHC/Compat/Core.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ import GHC.Tc.Types.Evidence hiding ((<.>))
461461
import GHC.Tc.Utils.Env
462462
import GHC.Tc.Utils.Monad hiding (Applicative (..), IORef,
463463
MonadFix (..), MonadIO (..), allM,
464-
anyM, concatMapM, mapMaybeM,
464+
anyM, concatMapM, mapMaybeM, foldMapM,
465465
(<$>))
466466
import GHC.Tc.Utils.TcType as TcType
467467
import qualified GHC.Types.Avail as Avail
@@ -573,7 +573,7 @@ import GHC.Hs (SrcSpanAnn')
573573

574574
mkHomeModLocation :: DynFlags -> ModuleName -> FilePath -> IO Module.ModLocation
575575
#if MIN_VERSION_ghc(9,11,0)
576-
mkHomeModLocation df mn f =
576+
mkHomeModLocation df mn f =
577577
let osf = unsafeEncodeUtf f
578578
in pure $ GHC.mkHomeModLocation (GHC.initFinderOpts df) mn osf
579579
#else

plugins/hls-semantic-tokens-plugin/src/Ide/Plugin/SemanticTokens/Tokenize.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import qualified Data.Text.Rope as Char
2020
import qualified Data.Text.Utf16.Rope as Utf16
2121
import Data.Text.Utf16.Rope.Mixed (Rope)
2222
import qualified Data.Text.Utf16.Rope.Mixed as Rope
23-
import Development.IDE.GHC.Compat hiding (foldMapM)
23+
import Development.IDE.GHC.Compat
2424
import Development.IDE.GHC.Error (realSrcSpanToCodePointRange)
2525
import Ide.Plugin.SemanticTokens.Types (HsSemanticTokenType (TModule),
2626
RangeHsSemanticTokenTypes (..))

plugins/hls-semantic-tokens-plugin/test/SemanticTokensTest.hs

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import Data.Functor (void)
1010
import qualified Data.List as T
1111
import Data.Map.Strict as Map hiding (map)
1212
import Data.String (fromString)
13-
import Data.Text hiding (length, map, show,
14-
unlines)
13+
import Data.Text (Text)
1514
import qualified Data.Text as Text
1615
import qualified Data.Text.Utf16.Rope.Mixed as Rope
1716
import Data.Version (Version (..))

0 commit comments

Comments
 (0)