Skip to content

Commit 929aaea

Browse files
committed
Combine hlint and hscEnv extensions
1 parent eeb62e0 commit 929aaea

File tree

1 file changed

+3
-3
lines changed
  • plugins/hls-hlint-plugin/src/Ide/Plugin

1 file changed

+3
-3
lines changed

plugins/hls-hlint-plugin/src/Ide/Plugin/Hlint.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ import Development.IDE.Core.Rules (defineNoFile)
3737
import Development.IDE.Core.Shake (getDiagnostics)
3838

3939
#ifdef GHC_LIB
40-
import Development.IDE.Core.RuleTypes (GhcSession(..))
41-
import Development.IDE.GHC.Util (hscEnv)
40+
import Data.List (nub)
4241
import "ghc-lib" GHC hiding (DynFlags(..))
4342
import "ghc" GHC as RealGHC (DynFlags(..))
4443
import "ghc" HscTypes as RealGHC.HscTypes (hsc_dflags)
@@ -182,7 +181,8 @@ getIdeas nfp = do
182181
hsc <- hscEnv <$> use_ GhcSession nfp
183182
let dflags = hsc_dflags hsc
184183
let hscExts = EnumSet.toList (extensionFlags dflags)
185-
let hlintExts = mapMaybe (GhclibParserEx.readExtension . show) hscExts
184+
let hscExts' = mapMaybe (GhclibParserEx.readExtension . show) hscExts
185+
let hlintExts = nub $ enabledExtensions flags ++ hscExts'
186186
logm $ "hlint:getIdeas:setExtensions:" ++ show hlintExts
187187
return $ flags { enabledExtensions = hlintExts }
188188
#else

0 commit comments

Comments
 (0)