Merge pull request #355 from gilramir/errmsg

Fix error messages that still say "when ... of"

Author: robinheghan

compiler/src/Reporting/Error/Syntax.hs

@@ -3988,7 +3988,7 @@ noteForCaseError =
     [ D.toSimpleNote $
         "Here is an example of a valid `when` expression for reference.",
       D.vcat $
-        [ D.indent 4 $ D.fillSep [D.cyan "when", "maybeWidth", D.cyan "of"],
+        [ D.indent 4 $ D.fillSep [D.cyan "when", "maybeWidth", D.cyan "is"],
           D.indent 6 $ D.fillSep [D.blue "Just", "width", "->"],
           D.indent 8 $ D.fillSep ["width", "+", D.dullyellow "200"],
           "",
@@ -4007,7 +4007,7 @@ noteForCaseIndentError =
         "Sometimes I get confused by indentation, so try to make your `when` look\
         \ something like this:",
       D.vcat $
-        [ D.indent 4 $ D.fillSep [D.cyan "when", "maybeWidth", D.cyan "of"],
+        [ D.indent 4 $ D.fillSep [D.cyan "when", "maybeWidth", D.cyan "is"],
           D.indent 6 $ D.fillSep [D.blue "Just", "width", "->"],
           D.indent 8 $ D.fillSep ["width", "+", D.dullyellow "200"],
           "",

compiler/src/Reporting/Error/Type.hs

@@ -188,7 +188,7 @@ toPatternReport source localizer patternRegion category tipe expected =
                       tipe
                       expectedType
                       (addPatternCategory "The first pattern is trying to match" category)
-                      "But the expression between `when` and `of` is:"
+                      "But the expression between `when` and `is` is:"
                       [ D.reflow $
                           "These can never match! Is the pattern the problem? Or is it the expression?"
                       ]