Skip to content

Commit ebd0912

Browse files
committed
Move CPP into compat layer
1 parent 19d1bc5 commit ebd0912

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

Diff for: ghcide/src/Development/IDE/GHC/Compat/Util.hs

+5-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ module Development.IDE.GHC.Compat.Util (
6868
hGetStringBuffer,
6969
stringToStringBuffer,
7070
nextChar,
71-
atEnd
71+
atEnd,
72+
-- * Char
73+
is_ident
7274
) where
7375

7476
#if MIN_VERSION_ghc(9,0,0)
@@ -81,6 +83,7 @@ import GHC.Data.FastString
8183
import GHC.Data.Maybe
8284
import GHC.Data.Pair
8385
import GHC.Data.StringBuffer
86+
import GHC.Parser.CharClass (is_ident)
8487
import GHC.Types.Unique
8588
import GHC.Types.Unique.DFM
8689
import GHC.Utils.Fingerprint
@@ -90,6 +93,7 @@ import GHC.Utils.Panic hiding (try)
9093
#else
9194
import Bag
9295
import BooleanFormula
96+
import Ctype (is_ident)
9397
import EnumSet
9498
import qualified Exception
9599
import FastString

Diff for: ghcide/src/Development/IDE/Plugin/CodeAction.hs

-6
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ import Control.Arrow (second,
2424
import Control.Concurrent.STM.Stats (atomically)
2525
import Control.Monad (guard, join)
2626
import Control.Monad.IO.Class
27-
#if !MIN_VERSION_ghc(9,0,0)
28-
import Ctype (is_ident)
29-
#endif
3027
import Data.Char
3128
import qualified Data.DList as DL
3229
import Data.Function
@@ -60,9 +57,6 @@ import Development.IDE.Types.Exports
6057
import Development.IDE.Types.Location
6158
import Development.IDE.Types.Options
6259
import qualified GHC.LanguageExtensions as Lang
63-
#if MIN_VERSION_ghc(9,0,0)
64-
import GHC.Parser.CharClass (is_ident)
65-
#endif
6660
import Ide.PluginUtils (subRange)
6761
import Ide.Types
6862
import qualified Language.LSP.Server as LSP

0 commit comments

Comments
 (0)