git.iko.soy/typeable/pandoc
on master help sign in
Logging: Added Deprecated constructor to LogMessage.
834e949John MacFarlane
src/Text/Pandoc/Logging.hs+9−5
compare with master
unifiedsplit
@@ -94,7 +94,7 @@ data LogMessage =
94 | InvalidLang String
94 | InvalidLang String
95 | CouldNotHighlight String
95 | CouldNotHighlight String
96 | MissingCharacter String
96 | MissingCharacter String
97− | Deprecated String
97+ | Deprecated String String
98 deriving (Show, Eq, Data, Ord, Typeable, Generic)
98 deriving (Show, Eq, Data, Ord, Typeable, Generic)
99
99
100instance ToJSON LogMessage where
100instance ToJSON LogMessage where
@@ -192,8 +192,9 @@ instance ToJSON LogMessage where
192 ["message" .= Text.pack msg]
192 ["message" .= Text.pack msg]
193 MissingCharacter msg ->
193 MissingCharacter msg ->
194 ["message" .= Text.pack msg]
194 ["message" .= Text.pack msg]
195− Deprecated msg ->
195+ Deprecated thing msg ->
196+ ["thing" .= Text.pack thing,
196− ["message" .= Text.pack msg]
197+ "message" .= Text.pack msg]
197
198
198
199
199showPos :: SourcePos -> String
200showPos :: SourcePos -> String
@@ -276,8 +277,11 @@ showLogMessage msg =
276 "Could not highlight code block:\n" ++ m
277 "Could not highlight code block:\n" ++ m
277 MissingCharacter m ->
278 MissingCharacter m ->
278 "Missing character: " ++ m
279 "Missing character: " ++ m
279− Deprecated m ->
280+ Deprecated t m ->
280− "Deprecated: " ++ m
281+ "Deprecated: " ++ t ++
282+ if null m
283+ then ""
284+ else ". " ++ m
281
285
282messageVerbosity:: LogMessage -> Verbosity
286messageVerbosity:: LogMessage -> Verbosity
283messageVerbosity msg =
287messageVerbosity msg =