3946fed · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

Merge pull request #2004 from purescript/1823-redundant-import-warnings

Remove RedundantUnqualifiedImport

commit3946fed4aecb4ce909ede0ba0519904ad2e2aca6 authorGary Burgess <gary.burgess@gmail.com> dateSun 10 Apr 2016, 18:08 (11 years ago) parentfd966ef caf2354

2 files changed+23−31

compare with golang

unifiedsplit

src/Language/PureScript/Errors.hs−6 src/Language/PureScript/Sugar/Names/Imports.hs+23−25

src/Language/PureScript/Errors.hs−6

@@ -139,7 +139,6 @@ data SimpleErrorMessage

139139 | DeprecatedQualifiedSyntax ModuleName ModuleName

140140 | DeprecatedClassImport ModuleName (ProperName 'ClassName)

141141 | DeprecatedClassExport (ProperName 'ClassName)

142− | RedundantUnqualifiedImport ModuleName ImportDeclarationType

143142 | DuplicateSelectiveImport ModuleName

144143 | DuplicateImport ModuleName ImportDeclarationType (Maybe ModuleName)

145144 | DuplicateImportRef String

@@ -323,7 +322,6 @@ errorCode em = case unwrapErrorMessage em of

323322 DeprecatedQualifiedSyntax{} -> "DeprecatedQualifiedSyntax"

324323 DeprecatedClassImport{} -> "DeprecatedClassImport"

325324 DeprecatedClassExport{} -> "DeprecatedClassExport"

326− RedundantUnqualifiedImport{} -> "RedundantUnqualifiedImport"

327325 DuplicateSelectiveImport{} -> "DuplicateSelectiveImport"

328326 DuplicateImport{} -> "DuplicateImport"

329327 DuplicateImportRef{} -> "DuplicateImportRef"

@@ -452,7 +450,6 @@ errorSuggestion err = case err of

452450 UnusedImport{} -> emptySuggestion

453451 RedundantEmptyHidingImport{} -> emptySuggestion

454452 DuplicateImport{} -> emptySuggestion

455− RedundantUnqualifiedImport{} -> emptySuggestion

456453 DeprecatedQualifiedSyntax name qualName -> suggest $

457454 "import " ++ runModuleName name ++ " as " ++ runModuleName qualName

458455 UnusedExplicitImport mn _ qual refs -> suggest $ importSuggestion mn refs qual

@@ -944,9 +941,6 @@ prettyPrintSingleError full level showWiki e = flip evalState defaultUnknownMap

944941 , line "The deprecated syntax will be removed in PureScript 0.9."

945942 ]

946943

947− renderSimpleErrorMessage (RedundantUnqualifiedImport name imp) =

948− line $ "Import of " ++ prettyPrintImport name imp Nothing ++ " is redundant due to a whole-module import"

949−

950944 renderSimpleErrorMessage (DuplicateSelectiveImport name) =

951945 line $ "There is an existing import of " ++ runModuleName name ++ ", consider merging the import lists"

952946

src/Language/PureScript/Sugar/Names/Imports.hs+23−25

@@ -12,9 +12,10 @@ module Language.PureScript.Sugar.Names.Imports

1212import Prelude ()

1313import Prelude.Compat

1414

15−import Data.List (find, delete, (\\))

16−import Data.Maybe (fromMaybe, isJust, isNothing, fromJust)

1715import Data.Foldable (traverse_, for_)

16+import Data.Function (on)

17+import Data.List (find, sortBy, groupBy, (\\))

18+import Data.Maybe (fromMaybe, isNothing, fromJust)

1819import Data.Traversable (for)

1920

2021import Control.Arrow (first)

@@ -68,29 +69,23 @@ resolveImports env (Module ss coms currentModule decls exps) =

6869

6970 for_ (M.toList imports) $ \(mn, imps) -> do

7071

71− -- Better ordering for the warnings: the list is in last-import-first

72− -- order, but we want the first appearence of an import to be the primary,

73− -- and warnings to appear for later imports

74− let imps' = reverse imps

75−

76− warned <- foldM (checkDuplicateImports mn) [] (selfCartesianSubset imps')

77−

78− let unqual = filter (\(_, _, q) -> isJust q) (imps' \\ warned)

79−

80− warned' <- (warned ++) <$>

81− if (length unqual < 2)

82− then return []

83− else case find (\(_, typ, _) -> isImplicit typ) unqual of

84− Just i ->

85− for (delete i unqual) $ \i'@(pos, typ, _) -> do

86− warn pos $ RedundantUnqualifiedImport mn typ

87− return i'

88− Nothing ->

89− for (tail unqual) $ \i@(pos, _, _) -> do

90− warn pos $ DuplicateSelectiveImport mn

91− return i

92−

93− for_ (imps' \\ warned') $ \(pos, typ, _) ->

72+ warned <- foldM (checkDuplicateImports mn) [] (selfCartesianSubset imps)

73+

74+ let unwarned = imps \\ warned

75+ duplicates

76+ = join

77+ . map tail

78+ . filter ((> 1) . length)

79+ . groupBy ((==) `on` defQual)

80+ . sortBy (compare `on` defQual)

81+ $ unwarned

82+

83+ warned' <-

84+ for duplicates $ \i@(pos, _, _) -> do

85+ warn pos $ DuplicateSelectiveImport mn

86+ return i

87+

88+ for_ (imps \\ (warned ++ warned')) $ \(pos, typ, _) ->

9489 let (dupeRefs, dupeDctors) = findDuplicateRefs $ case typ of

9590 Explicit refs -> refs

9691 Hiding refs -> refs

@@ -105,6 +100,9 @@ resolveImports env (Module ss coms currentModule decls exps) =

105100 return (Module ss coms currentModule decls' exps, resolved)

106101

107102 where

103+ defQual :: ImportDef -> Maybe ModuleName

104+ defQual (_, _, q) = q

105+

108106 selfCartesianSubset :: [a] -> [(a, a)]

109107 selfCartesianSubset (x : xs) = [(x, y) | y <- xs] ++ selfCartesianSubset xs

110108 selfCartesianSubset [] = []