Skip to content

Commit c46bdf1

Browse files
authored
Merge pull request #1516 from slpopejoy/ghc8-warning-case-change
GHC8 warning case change
2 parents 6ebf013 + 412f564 commit c46bdf1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

haskell-interactive-mode.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,7 @@ This completion function is used in interactive REPL buffer itself."
10291029
If there is one, pop that up in a buffer, similar to `debug-on-error'."
10301030
(when (and haskell-interactive-types-for-show-ambiguous
10311031
(string-match "^\n<interactive>:[-0-9]+:[-0-9]+:" response)
1032-
(not (string-match "^\n<interactive>:[-0-9]+:[-0-9]+:[\n ]+Warning:" response)))
1032+
(not (string-match "^\n<interactive>:[-0-9]+:[-0-9]+:[\n ]+[Ww]arning:" response)))
10331033
(let ((inhibit-read-only t))
10341034
(delete-region haskell-interactive-mode-prompt-start (point))
10351035
(set-marker haskell-interactive-mode-prompt-start

haskell-load.el

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ list of modules where missed IDENT was found."
201201
file
202202
(match-string 2 msg)
203203
line)))
204-
((string-match "Warning: orphan instance: " msg)
204+
((string-match "[Ww]arning: orphan instance: " msg)
205205
(when haskell-process-suggest-no-warn-orphans
206206
(haskell-process-suggest-pragma
207207
session
@@ -395,7 +395,7 @@ correspondingly-named overlay properties of OVL."
395395
(cond
396396
((not (eq haskell-msg-type 'warning))
397397
haskell-msg)
398-
((string-prefix-p "Warning:\n " haskell-msg)
398+
((string-prefix-p "[Ww]arning:\n " haskell-msg)
399399
(cl-subseq haskell-msg 13))
400400
(t
401401
(error
@@ -518,7 +518,7 @@ When MODULE-BUFFER is non-NIL, paint error overlays."
518518
(file (match-string 1 buffer))
519519
(location-raw (match-string 2 buffer))
520520
(error-msg (match-string 3 buffer))
521-
(type (cond ((string-match "^Warning:" error-msg) 'warning)
521+
(type (cond ((string-match "^[Ww]arning:" error-msg) 'warning)
522522
((string-match "^Splicing " error-msg) 'splice)
523523
(t 'error)))
524524
(critical (not (eq type 'warning)))

0 commit comments

Comments
 (0)