git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge pull request #1745 from purescript/1732

Fix #1732, calculate type map separately for each error

commitcc91cad22a9823444a146b325845935f19d31f1e authorPhil Freeman <paf31@cantab.net> dateSun 20 Dec 2015, 16:58 (11 years ago) parent3c6d99d33851dc
2 files changed+15−19
compare with golang
unifiedsplit
psc/JSON.hs+1−1 src/Language/PureScript/Errors.hs+14−18
psc/JSON.hs+1−1
@@ -53,7 +53,7 @@ toJSONErrors verbose level = map (toJSONError verbose level) . P.runMultipleErro
5353toJSONError :: Bool -> P.Level -> P.ErrorMessage -> JSONError
5454toJSONError verbose level e =
5555 JSONError (toErrorPosition <$> sspan)
56− (P.renderBox (P.prettyPrintSingleError' verbose level (P.stripModuleAndSpan e)))
56+ (P.renderBox (P.prettyPrintSingleError verbose level (P.stripModuleAndSpan e)))
5757 (P.errorCode e)
5858 (P.spanName <$> sspan)
5959 (P.runModuleName <$> P.errorModule e)
src/Language/PureScript/Errors.hs+14−18
@@ -412,14 +412,11 @@ onTypesInErrorMessageM f (ErrorMessage hints simple) = ErrorMessage <$> traverse
412412 gHint (ErrorInInstance cl ts) = ErrorInInstance cl <$> traverse f ts
413413 gHint other = pure other
414414
415−prettyPrintSingleError' :: Bool -> Level -> ErrorMessage ->Box.Box
416−prettyPrintSingleError' full level = flip evalState defaultUnknownMap . prettyPrintSingleError full level
417−
418415-- |
419416-- Pretty print a single error, simplifying if necessary
420417--
421−prettyPrintSingleError :: Bool -> Level -> ErrorMessage -> State TypeMap Box.Box
422−prettyPrintSingleError full level e = do
418+prettyPrintSingleError :: Bool -> Level -> ErrorMessage -> Box.Box
419+prettyPrintSingleError full level e = flip evalState defaultUnknownMap $ do
423420 em <- onTypesInErrorMessageM replaceUnknowns (if full then e else simplifyErrorMessage e)
424421 um <- get
425422 return (prettyPrintErrorMessage um em)
@@ -1061,22 +1058,21 @@ prettyPrintMultipleWarnings full = renderBox . prettyPrintMultipleWarningsBox fu
10611058
10621059-- | Pretty print warnings as a Box
10631060prettyPrintMultipleWarningsBox :: Bool -> MultipleErrors -> Box.Box
1064−prettyPrintMultipleWarningsBox full = flip evalState defaultUnknownMap . prettyPrintMultipleErrorsWith Warning "Warning found:" "Warning" full
1061+prettyPrintMultipleWarningsBox full = prettyPrintMultipleErrorsWith Warning "Warning found:" "Warning" full
10651062
10661063-- | Pretty print errors as a Box
10671064prettyPrintMultipleErrorsBox :: Bool -> MultipleErrors -> Box.Box
1068−prettyPrintMultipleErrorsBox full = flip evalState defaultUnknownMap . prettyPrintMultipleErrorsWith Error "Error found:" "Error" full
1069−
1070−prettyPrintMultipleErrorsWith :: Level -> String -> String -> Bool -> MultipleErrors -> State TypeMap Box.Box
1071−prettyPrintMultipleErrorsWith level intro _ full (MultipleErrors [e]) = do
1072− result <- prettyPrintSingleError full level e
1073− return $
1074− Box.vcat Box.left [ Box.text intro
1075− , result
1076− ]
1077−prettyPrintMultipleErrorsWith level _ intro full (MultipleErrors es) = do
1078− result <- forM es $ prettyPrintSingleError full level
1079− return $ Box.vsep 1 Box.left $ concat $ zipWith withIntro [1 :: Int ..] result
1065+prettyPrintMultipleErrorsBox full = prettyPrintMultipleErrorsWith Error "Error found:" "Error" full
1066+
1067+prettyPrintMultipleErrorsWith :: Level -> String -> String -> Bool -> MultipleErrors -> Box.Box
1068+prettyPrintMultipleErrorsWith level intro _ full (MultipleErrors [e]) =
1069+ let result = prettyPrintSingleError full level e
1070+ in Box.vcat Box.left [ Box.text intro
1071+ , result
1072+ ]
1073+prettyPrintMultipleErrorsWith level _ intro full (MultipleErrors es) =
1074+ let result = map (prettyPrintSingleError full level) es
1075+ in Box.vsep 1 Box.left $ concat $ zipWith withIntro [1 :: Int ..] result
10801076 where
10811077 withIntro i err = [ Box.text (intro ++ " " ++ show i ++ " of " ++ show (length es) ++ ":")
10821078 , Box.moveRight 2 err