File tree 7 files changed +18
-9
lines changed
hls-alternate-number-format-plugin/src/Ide/Plugin
hls-change-type-signature-plugin/test
hls-eval-plugin/src/Ide/Plugin/Eval/Parse
hls-refactor-plugin/src/Development/IDE/Plugin
7 files changed +18
-9
lines changed Original file line number Diff line number Diff line change @@ -76,10 +76,10 @@ jobs:
76
76
- name : Configue non-default flags for all components
77
77
run : |
78
78
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" \
80
81
--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"
83
83
cat cabal.project.local
84
84
85
85
- name : Build everything with non-default flags
Original file line number Diff line number Diff line change 94
94
- Main
95
95
- Experiments
96
96
- Development.Benchmark.Rules
97
- - Development.IDE.Plugin.CodeAction
98
97
- Development.IDE.Plugin.Completions
99
98
- Development.IDE.Plugin.CodeAction.ExactPrint
100
99
- Development.IDE.Spans.Documentation
Original file line number Diff line number Diff line change @@ -9,9 +9,10 @@ module Ide.Plugin.Literals (
9
9
10
10
import Data.Maybe (maybeToList )
11
11
import Data.Text (Text )
12
- import qualified Data.Text as T
13
12
#if __GLASGOW_HASKELL__ >= 908
14
13
import qualified Data.Text.Encoding as T
14
+ #else
15
+ import qualified Data.Text as T
15
16
#endif
16
17
import Development.IDE.GHC.Compat hiding (getSrcSpan )
17
18
import Development.IDE.Graph.Classes (NFData (rnf ))
Original file line number Diff line number Diff line change
1
+ {-# LANGUAGE CPP #-}
2
+ #if __GLASGOW_HASKELL__ >= 908
3
+ {-# OPTIONS_GHC -Wwarn=x-partial #-}
4
+ #endif
5
+
1
6
module Main where
2
7
3
8
import Control.Monad (void )
Original file line number Diff line number Diff line change
1
+ {-# LANGUAGE CPP #-}
1
2
{-# LANGUAGE LambdaCase #-}
2
- {-# LANGUAGE OverloadedLabels #-}
3
3
{-# LANGUAGE OverloadedLists #-}
4
4
{-# LANGUAGE OverloadedStrings #-}
5
+ #if __GLASGOW_HASKELL__ >= 908
6
+ {-# OPTIONS_GHC -Wwarn=x-partial #-}
7
+ #endif
5
8
6
9
module Main
7
10
( main
Original file line number Diff line number Diff line change @@ -57,7 +57,7 @@ We build parsers combining the following three kinds of them:
57
57
-}
58
58
59
59
-- | 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
61
61
62
62
-- | Line comment group parser
63
63
type LineGroupParser = Parsec Void [(Range , RawLineComment )]
Original file line number Diff line number Diff line change @@ -1087,8 +1087,9 @@ suggestImportDisambiguation df (Just txt) ps fileContents diag@Diagnostic {..}
1087
1087
++ [HideOthers restImports | not (null restImports)]
1088
1088
] ++ [ ( renderUniquify mode T. empty symbol True
1089
1089
, 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)
1092
1093
]
1093
1094
renderUniquify HideOthers {} modName symbol local =
1094
1095
" Use " <> (if local then " local definition" else modName) <> " for " <> symbol <> " , hiding other imports"
You can’t perform that action at this time.
0 commit comments