Skip to content

Commit 06adf6b

Browse files
committed
Actually enable pedantic flag in ci flags job
1 parent 23005f8 commit 06adf6b

File tree

7 files changed

+18
-9
lines changed

7 files changed

+18
-9
lines changed

.github/workflows/flags.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ jobs:
7676
- name: Configue non-default flags for all components
7777
run: |
7878
cabal configure \
79-
--constraint "hls-graph +embed-files +stm-stats" \
79+
--constraint "haskell-language-server +pedantic" \
80+
--constraint "hls-graph +embed-files +pedantic +stm-stats" \
8081
--constraint "ghcide +ekg +executable +test-exe" \
81-
--constraint "hls-plugin-api -use-fingertree" \
82-
--constraint "all +pedantic"
82+
--constraint "hls-plugin-api +pedantic -use-fingertree"
8383
cat cabal.project.local
8484
8585
- name: Build everything with non-default flags

.hlint.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
- Main
9595
- Experiments
9696
- Development.Benchmark.Rules
97-
- Development.IDE.Plugin.CodeAction
9897
- Development.IDE.Plugin.Completions
9998
- Development.IDE.Plugin.CodeAction.ExactPrint
10099
- Development.IDE.Spans.Documentation

plugins/hls-alternate-number-format-plugin/src/Ide/Plugin/Literals.hs

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ module Ide.Plugin.Literals (
99

1010
import Data.Maybe (maybeToList)
1111
import Data.Text (Text)
12-
import qualified Data.Text as T
1312
#if __GLASGOW_HASKELL__ >= 908
1413
import qualified Data.Text.Encoding as T
14+
#else
15+
import qualified Data.Text as T
1516
#endif
1617
import Development.IDE.GHC.Compat hiding (getSrcSpan)
1718
import Development.IDE.Graph.Classes (NFData (rnf))

plugins/hls-change-type-signature-plugin/test/Main.hs

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
{-# LANGUAGE CPP #-}
2+
#if __GLASGOW_HASKELL__ >= 908
3+
{-# OPTIONS_GHC -Wwarn=x-partial #-}
4+
#endif
5+
16
module Main where
27

38
import Control.Monad (void)

plugins/hls-class-plugin/test/Main.hs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE LambdaCase #-}
2-
{-# LANGUAGE OverloadedLabels #-}
33
{-# LANGUAGE OverloadedLists #-}
44
{-# LANGUAGE OverloadedStrings #-}
5+
#if __GLASGOW_HASKELL__ >= 908
6+
{-# OPTIONS_GHC -Wwarn=x-partial #-}
7+
#endif
58

69
module Main
710
( main

plugins/hls-eval-plugin/src/Ide/Plugin/Eval/Parse/Comments.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ We build parsers combining the following three kinds of them:
5757
-}
5858

5959
-- | Line parser
60-
type LineParser a = forall m. Monad m => ParsecT Void String m a
60+
type LineParser a = forall m. ParsecT Void String m a
6161

6262
-- | Line comment group parser
6363
type LineGroupParser = Parsec Void [(Range, RawLineComment)]

plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction.hs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1087,8 +1087,9 @@ suggestImportDisambiguation df (Just txt) ps fileContents diag@Diagnostic {..}
10871087
++ [HideOthers restImports | not (null restImports)]
10881088
] ++ [ ( renderUniquify mode T.empty symbol True
10891089
, disambiguateSymbol ps fileContents diag symbol mode
1090-
) | local, not (null targetsWithRestImports)
1091-
, let mode = HideOthers (uncurry (:) (head targetsWithRestImports))
1090+
) | local
1091+
, (m,ms) <- take 1 targetsWithRestImports
1092+
, let mode = HideOthers (m:ms)
10921093
]
10931094
renderUniquify HideOthers {} modName symbol local =
10941095
"Use " <> (if local then "local definition" else modName) <> " for " <> symbol <> ", hiding other imports"

0 commit comments

Comments
 (0)