@@ -69,9 +69,6 @@ data Error
69 | ModuleNameMismatch ModuleName.Raw (A.Located ModuleName.Raw)
69 | ModuleNameMismatch ModuleName.Raw (A.Located ModuleName.Raw)
70 | UnexpectedPort A.Region
70 | UnexpectedPort A.Region
71 | NoPorts A.Region
71 | NoPorts A.Region
72− | NoPortsInPackage (A.Located Name.Name)
73− | NoPortModulesInPackage A.Region
74− | NoEffectsOutsideKernel A.Region
75 | ParseError Module
72 | ParseError Module
@@ -564,84 +561,10 @@ toReport source err =
567− NoPortsInPackage (A.At region _) ->
568− Report.Report "PACKAGES CANNOT HAVE PORTS" region [] $
569− Code.toSnippet source region Nothing
572− "Packages cannot declare any ports, so I am getting stuck here:"
576− "Remove this port declaration."
577− , noteForPortsInPackage
581− NoPortModulesInPackage region ->
582− Report.Report "PACKAGES CANNOT HAVE PORTS" region [] $
583− Code.toSnippet source region Nothing
586− "Packages cannot declare any ports, so I am getting stuck here:"
590− ["Remove","the",D.cyan "port","keyword","and","I"
591− ,"should","be","able","to","continue."
593− , noteForPortsInPackage
597− NoEffectsOutsideKernel region ->
598− Report.Report "INVALID EFFECT MODULE" region [] $
599− Code.toSnippet source region Nothing
602− "It is not possible to declare an `effect module` outside the @elm organization,\
603− \ so I am getting stuck here:"
607− "Switch to a normal module declaration."
609− "Effect modules are designed to allow certain core functionality to be\
610− \ defined separately from the compiler. So the @elm organization has access to\
611− \ this so that certain changes, extensions, and fixes can be introduced without\
612− \ needing to release new Elm binaries. For example, we want to make it possible\
613− \ to test effects, but this may require changes to the design of effect modules.\
614− \ By only having them defined in the @elm organization, that kind of design work\
615− \ can proceed much more smoothly."
619 ParseError modul ->
564 ParseError modul ->
620 toParseErrorReport source modul
565 toParseErrorReport source modul
623−noteForPortsInPackage :: D.Doc
624−noteForPortsInPackage =
627− "One of the major goals of the package ecosystem is to be completely written\
628− \ in Elm. This means when you install an Elm package, you can be sure you are safe\
629− \ from security issues on install and that you are not going to get any runtime\
630− \ exceptions coming from your new dependency. This design also sets the ecosystem\
631− \ up to target other platforms more easily (like mobile phones, WebAssembly, etc.)\
632− \ since no community code explicitly depends on JavaScript even existing."
634− "Given that overall goal, allowing ports in packages would lead to some pretty\
635− \ surprising behavior. If ports were allowed in packages, you could install a\
636− \ package but not realize that it brings in an indirect dependency that defines a\
637− \ port. Now you have a program that does not work and the fix is to realize that\
638− \ some JavaScript needs to be added for a dependency you did not even know about.\
639− \ That would be extremely frustrating! \"So why not allow the package author to\
640− \ include the necessary JS code as well?\" Now we are back in conflict with our\
641− \ overall goal to keep all community packages free from runtime exceptions."
645toParseErrorReport :: Code.Source -> Module -> Report.Report
568toParseErrorReport :: Code.Source -> Module -> Report.Report
646toParseErrorReport source modul =
569toParseErrorReport source modul =
647 case modul of
570 case modul of
@@ -649,9 +572,156 @@ toParseErrorReport source modul =
649 toSpaceReport source space row col
572 toSpaceReport source space row col
651 ModuleBadEnd row col ->
574 ModuleBadEnd row col ->
652− if col == 1
575+ case Code.whatIsNext source row col of
653− then toDeclStartReport source row col
576+ Code.Keyword keyword ->
654− else toWeirdEndReport source row col
577+ let
578+ region = toKeywordRegion row col keyword
580+ Report.Report "RESERVED WORD" region [] $
581+ Code.toSnippet source region Nothing
584+ "I got stuck on this reserved word:"
587+ "The name `" ++ keyword ++ "` is reserved, so try using a different name?"
592+ region = toKeywordRegion row col op
594+ Report.Report "UNEXPECTED SYMBOL" region [] $
595+ Code.toSnippet source region Nothing
598+ "I ran into an unexpected symbol:"
601+ "I was not expecting to see a " ++ op ++ " here. Try deleting it? Maybe\
602+ \ I can give a better hint from there?"
605+ Code.Close term bracket ->
607+ region = toRegion row col
609+ Report.Report ("UNEXPECTED " ++ map Char.toUpper term) region [] $
610+ Code.toSnippet source region Nothing
613+ "I ran into an unexpected " ++ term ++ ":"
616+ "This " ++ bracket : " does not match up with an earlier open " ++ term ++ ". Try deleting it?"
619+ Code.Other maybeChar ->
621+ region = toRegion row col
625+ Report.Report "UNEXPECTED SEMICOLON" region [] $
626+ Code.toSnippet source region Nothing
629+ "I got stuck on this semicolon:"
632+ [ D.reflow $ "Try removing it?"
634+ "Some languages require semicolons at the end of each statement. These are\
635+ \ often called C-like languages, and they usually share a lot of language design\
636+ \ choices. (E.g. side-effects, for loops, etc.) Elm manages effects with commands\
637+ \ and subscriptions instead, so there is no special syntax for \"statements\" and\
638+ \ therefore no need to use semicolons to separate them. I think this will make\
639+ \ more sense as you work through <https://guide.elm-lang.org> though!"
644+ Report.Report "UNEXPECTED COMMA" region [] $
645+ Code.toSnippet source region Nothing
648+ "I got stuck on this comma:"
652+ "I do not think I am parsing a list or tuple right now. Try deleting the comma?"
654+ "If this is supposed to be part of a list, the problem may be a bit earlier.\
655+ \ Perhaps the opening [ is missing? Or perhaps some value in the list has an extra\
656+ \ closing ] that is making me think the list ended earlier? The same kinds of\
657+ \ things could be going wrong if this is supposed to be a tuple."
662+ Report.Report "UNEXPECTED CHARACTER" region [] $
663+ Code.toSnippet source region Nothing
666+ "I got stuck on this character:"
670+ "It is not used for anything in Elm syntax. It is used for multi-line strings in\
671+ \ some languages though, so if you want a string that spans multiple lines, you\
672+ \ can use Elm's multi-line string syntax like this:"
674+ [ D.fillSep [D.green "markdown","=",D.dullyellow "\"\"\""]
676+ , D.dullyellow "# Multi-line Strings"
678+ , D.dullyellow "- start with triple double quotes"
679+ , D.dullyellow "- write whatever you want"
680+ , D.dullyellow "- no need to escape newlines or double quotes"
681+ , D.dullyellow "- end with triple double quotes"
683+ , D.dullyellow "\"\"\""
686+ "Otherwise I do not know what is going on! Try removing the character?"
691+ Report.Report "UNEXPECTED SYMBOL" region [] $
692+ Code.toSnippet source region Nothing
695+ "I got stuck on this dollar sign:"
698+ "It is not used for anything in Elm syntax. Are you coming from a language where\
699+ \ dollar signs can be used in variable names? If so, try a name that (1) starts\
700+ \ with a letter and (2) only contains letters, numbers, and underscores."
703+ Just c | elem c ['#','@','!','%','~'] ->
704+ Report.Report "UNEXPECTED SYMBOL" region [] $
705+ Code.toSnippet source region Nothing
708+ "I got stuck on this symbol:"
711+ "It is not used for anything in Elm syntax. Try removing it?"
715+ Report.Report "SYNTAX PROBLEM" region [] $
716+ Code.toSnippet source region Nothing
722+ "Whatever I am running into is confusing me a lot! Normally I can give fairly\
723+ \ specific hints, but something is really tripping me up this time."
656 ModuleProblem row col ->
726 ModuleProblem row col ->
@@ -797,11 +867,11 @@ toParseErrorReport source modul =
797 [ D.reflow $
867 [ D.reflow $
798 "I am not sure what is going on, but I recommend starting an Elm\
868 "I am not sure what is going on, but I recommend starting an Elm\
799 \ file with the following lines:"
869 \ file with the following lines:"
800− , D.indent 4 $ D.vcat $
870+ , D.vcat
801 [ D.fillSep [D.cyan "import","Html"]
871 [ D.fillSep [D.cyan "import","Html"]
803− , "main ="
873+ , D.fillSep [D.green "main","="]
804− , " Html.text " <> D.dullyellow "\"Hello!\""
874+ , D.indent 2 $ D.fillSep [D.cyan "Html" <> ".text",D.dullyellow "\"Hello!\""]
806 , D.reflow $
876 , D.reflow $
807 "You should be able to copy those lines directly into your file. Check out the\
877 "You should be able to copy those lines directly into your file. Check out the\
@@ -830,12 +900,11 @@ toParseErrorReport source modul =
830 , D.indent 4 $ D.vcat $
900 , D.indent 4 $ D.vcat $
831 [ D.fillSep [D.cyan "import","Dict"]
901 [ D.fillSep [D.cyan "import","Dict"]
832 , D.fillSep [D.cyan "import","Maybe"]
902 , D.fillSep [D.cyan "import","Maybe"]
833− , D.fillSep [D.cyan "import","Html.Attributes",D.cyan "as","A"]
903+ , D.fillSep [D.cyan "import","Html.Attributes"]
834− , D.fillSep [D.cyan "import","Json.Decode",D.cyan "exposing","(..)"]
904+ , D.fillSep [D.cyan "import","Json.Decode"]
836 , D.reflow $
906 , D.reflow $
837 "Notice that the module names all start with capital letters. That is required!"
907 "Notice that the module names all start with capital letters. That is required!"
838− , D.reflowLink "Read" "imports" "to learn more."
@@ -862,7 +931,6 @@ toParseErrorReport source modul =
863 , D.reflow $
932 , D.reflow $
864 "Notice that the alias always starts with a capital letter. That is required!"
933 "Notice that the alias always starts with a capital letter. That is required!"
865− , D.reflowLink "Read" "imports" "to learn more."
@@ -925,192 +993,6 @@ toParseErrorReport source modul =
931−toWeirdEndReport :: Code.Source -> Row -> Col -> Report.Report
932−toWeirdEndReport source row col =
933− case Code.whatIsNext source row col of
934− Code.Keyword keyword ->
936− region = toKeywordRegion row col keyword
938− Report.Report "RESERVED WORD" region [] $
939− Code.toSnippet source region Nothing
942− "I got stuck on this reserved word:"
945− "The name `" ++ keyword ++ "` is reserved, so try using a different name?"
950− region = toKeywordRegion row col op
952− Report.Report "UNEXPECTED SYMBOL" region [] $
953− Code.toSnippet source region Nothing
956− "I ran into an unexpected symbol:"
959− "I was not expecting to see a " ++ op ++ " here. Try deleting it? Maybe\
960− \ I can give a better hint from there?"
963− Code.Close term bracket ->
965− region = toRegion row col
967− Report.Report ("UNEXPECTED " ++ map Char.toUpper term) region [] $
968− Code.toSnippet source region Nothing
971− "I ran into an unexpected " ++ term ++ ":"
974− "This " ++ bracket : " does not match up with an earlier open " ++ term ++ ". Try deleting it?"
979− region = toKeywordRegion row col (c:cs)
981− Report.Report "UNEXPECTED NAME" region [] $
982− Code.toSnippet source region Nothing
985− "I got stuck on this name:"
988− "It is confusing me a lot! Normally I can give fairly specific hints, but\
989− \ something is really tripping me up this time."
994− region = toKeywordRegion row col (c:cs)
996− Report.Report "UNEXPECTED NAME" region [] $
997− Code.toSnippet source region Nothing
1000− "I got stuck on this name:"
1003− "It is confusing me a lot! Normally I can give fairly specific hints, but\
1004− \ something is really tripping me up this time."
1007− Code.Other maybeChar ->
1009− region = toRegion row col
1013− Report.Report "UNEXPECTED SEMICOLON" region [] $
1014− Code.toSnippet source region Nothing
1017− "I got stuck on this semicolon:"
1020− [ D.reflow $ "Try removing it?"
1022− "Some languages require semicolons at the end of each statement. These are\
1023− \ often called C-like languages, and they usually share a lot of language design\
1024− \ choices. (E.g. side-effects, for loops, etc.) Elm manages effects with commands\
1025− \ and subscriptions instead, so there is no special syntax for \"statements\" and\
1026− \ therefore no need to use semicolons to separate them. I think this will make\
1027− \ more sense as you work through <https://guide.elm-lang.org> though!"
1032− Report.Report "UNEXPECTED COMMA" region [] $
1033− Code.toSnippet source region Nothing
1036− "I got stuck on this comma:"
1040− "I do not think I am parsing a list or tuple right now. Try deleting the comma?"
1042− "If this is supposed to be part of a list, the problem may be a bit earlier.\
1043− \ Perhaps the opening [ is missing? Or perhaps some value in the list has an extra\
1044− \ closing ] that is making me think the list ended earlier? The same kinds of\
1045− \ things could be going wrong if this is supposed to be a tuple."
1050− Report.Report "UNEXPECTED CHARACTER" region [] $
1051− Code.toSnippet source region Nothing
1054− "I got stuck on this character:"
1058− "It is not used for anything in Elm syntax. It is used for multi-line strings in\
1059− \ some languages though, so if you want a string that spans multiple lines, you\
1060− \ can use Elm's multi-line string syntax like this:"
1061− , D.dullyellow $ D.indent 4 $ D.vcat $
1063− , "# Multi-line Strings"
1065− , "- start with triple double quotes"
1066− , "- write whatever you want"
1067− , "- no need to escape newlines or double quotes"
1068− , "- end with triple double quotes"
1072− "Otherwise I do not know what is going on! Try removing the character?"
1077− Report.Report "UNEXPECTED SYMBOL" region [] $
1078− Code.toSnippet source region Nothing
1081− "I got stuck on this dollar sign:"
1084− "It is not used for anything in Elm syntax. Are you coming from a language where\
1085− \ dollar signs can be used in variable names? If so, try a name that (1) starts\
1086− \ with a letter and (2) only contains letters, numbers, and underscores."
1089− Just c | elem c ['#','@','!','%','~'] ->
1090− Report.Report "UNEXPECTED SYMBOL" region [] $
1091− Code.toSnippet source region Nothing
1094− "I got stuck on this symbol:"
1097− "It is not used for anything in Elm syntax. Try removing it?"
1101− Report.Report "SYNTAX PROBLEM" region [] $
1102− Code.toSnippet source region Nothing
1105− "I got stuck here:"
1108− "Whatever I am running into is confusing me a lot! Normally I can give fairly\
1109− \ specific hints, but something is really tripping me up this time."
1114-- IMPORTS
996-- IMPORTS
@@ -1136,7 +1018,6 @@ toImportReport source row col =
1137 , D.reflow $
1019 , D.reflow $
1138 "You are probably trying to import a different module, but try to make it look like one of these examples!"
1020 "You are probably trying to import a different module, but try to make it look like one of these examples!"
1139− , D.reflowLink "Read" "imports" "to learn more."
@@ -1443,196 +1324,144 @@ toDeclarationsReport :: Code.Source -> Decl -> Report.Report
1443toDeclarationsReport source decl =
1324toDeclarationsReport source decl =
1444 case decl of
1325 case decl of
1445 DeclStart row col ->
1326 DeclStart row col ->
1446− toDeclStartReport source row col
1448− DeclSpace space row col ->
1449− toSpaceReport source space row col
1451− Port port_ row col ->
1452− toPortReport source port_ row col
1454− DeclType declType row col ->
1455− toDeclTypeReport source declType row col
1457− DeclDef name declDef row col ->
1458− toDeclDefReport source name declDef row col
1460− DeclFreshLineAfterDocComment row col ->
1462− region = toRegion row col
1464− Report.Report "EXPECTING DECLARATION" region [] $
1465− Code.toSnippet source region Nothing
1468− "I just saw a doc comment, but then I got stuck here:"
1471− "I was expecting to see the corresponding declaration next, starting on a fresh\
1472− \ line with no indentation."
1476−toDeclStartReport :: Code.Source -> Row -> Col -> Report.Report
1477−toDeclStartReport source row col =
1478− case Code.whatIsNext source row col of
1327+ case Code.whatIsNext source row col of
1479− Code.Close term bracket ->
1328+ Code.Close term bracket ->
1481− region = toRegion row col
1330+ region = toRegion row col
1483− Report.Report ("STRAY " ++ map Char.toUpper term) region [] $
1332+ Report.Report ("STRAY " ++ map Char.toUpper term) region [] $
1484− Code.toSnippet source region Nothing
1487− "I was not expecting to see a " ++ term ++ " here:"
1489− "This " ++ bracket : " does not match up with an earlier open " ++ term ++ ". Try deleting it?"
1492− Code.Keyword keyword ->
1494− region = toKeywordRegion row col keyword
1496− Report.Report "RESERVED WORD" region [] $
1497− Code.toSnippet source region Nothing
1333+ Code.toSnippet source region Nothing
1500− "I was not expecting to run into the `" ++ keyword ++ "` keyword here:"
1504 D.reflow $
1335 D.reflow $
1505− "It is reserved for declaring imports at the top of your module. If you want\
1336+ "I was not expecting to see a " ++ term ++ " here:"
1506− \ another import, try moving it up top with the other imports. If you want to\
1337+ , D.reflow $
1507− \ define a value or function, try changing the name to something else!"
1338+ "This " ++ bracket : " does not match up with an earlier open " ++ term ++ ". Try deleting it?"
1341+ Code.Keyword keyword ->
1343+ region = toKeywordRegion row col keyword
1345+ Report.Report "RESERVED WORD" region [] $
1346+ Code.toSnippet source region Nothing
1349+ "I was not expecting to run into the `" ++ keyword ++ "` keyword here:"
1354+ "It is reserved for declaring imports at the top of your module. If you want\
1355+ \ another import, try moving it up top with the other imports. If you want to\
1356+ \ define a value or function, try changing the name to something else!"
1509− "case" ->
1358+ "case" ->
1510− D.stack
1359+ D.stack
1511− [ D.reflow $
1360+ [ D.reflow $
1512− "It is reserved for writing `case` expressions. Try using a different name?"
1361+ "It is reserved for writing `case` expressions. Try using a different name?"
1513− , D.toSimpleNote $
1362+ , D.toSimpleNote $
1514− "If you are trying to write a `case` expression, it needs to be part of a\
1363+ "If you are trying to write a `case` expression, it needs to be part of a\
1515− \ definition. So you could write something like this instead:"
1364+ \ definition. So you could write something like this instead:"
1516− , D.indent 4 $ D.vcat $
1365+ , D.vcat $
1517− [ D.indent 0 $ D.fillSep ["getWidth","maybeWidth","="]
1366+ [ D.indent 0 $ D.fillSep [D.green "getWidth","maybeWidth","="]
1518− , D.indent 2 $ D.fillSep [D.cyan "case","maybeWidth",D.cyan "of"]
1367+ , D.indent 2 $ D.fillSep [D.cyan "case","maybeWidth",D.cyan "of"]
1519− , D.indent 4 $ D.fillSep [D.blue "Just","width","->"]
1368+ , D.indent 4 $ D.fillSep [D.blue "Just","width","->"]
1520− , D.indent 6 $ D.fillSep ["width","+",D.dullyellow "200"]
1369+ , D.indent 6 $ D.fillSep ["width","+",D.dullyellow "200"]
1522− , D.indent 4 $ D.fillSep [D.blue "Nothing","->"]
1371+ , D.indent 4 $ D.fillSep [D.blue "Nothing","->"]
1523− , D.indent 6 $ D.fillSep [D.dullyellow "400"]
1372+ , D.indent 6 $ D.fillSep [D.dullyellow "400"]
1375+ "This defines a `getWidth` function that we can use elsewhere in our program."
1526− "This defines a `getWidth` function that you can use elsewhere in your program."
1529− "if" ->
1378+ "if" ->
1530− D.stack
1379+ D.stack
1531− [ D.reflow $
1380+ [ D.reflow $
1532− "It is reserved for writing `if` expressions. Try using a different name?"
1381+ "It is reserved for writing `if` expressions. Try using a different name?"
1533− , D.toSimpleNote $
1382+ , D.toSimpleNote $
1534− "If you are trying to write an `if` expression, it needs to be part of a\
1383+ "If you are trying to write an `if` expression, it needs to be part of a\
1535− \ definition. So you could write something like this instead:"
1384+ \ definition. So you could write something like this instead:"
1536− , D.indent 4 $ D.vcat $
1385+ , D.vcat $
1537− [ "greet name ="
1386+ [ D.indent 0 $ D.fillSep [D.green "reviewPowerLevel","powerLevel","="]
1538− , D.fillSep $
1387+ , D.indent 2 $ D.fillSep $
1540− ,D.cyan "if","name","==",D.dullyellow "\"Abraham Lincoln\""
1388+ [D.cyan "if","powerLevel",">",D.dullyellow "9000"
1541− ,D.cyan "then",D.dullyellow "\"Greetings Mr. President.\""
1389+ ,D.cyan "then",D.dullyellow "\"OVER 9000!!!\""
1542− ,D.cyan "else",D.dullyellow "\"Hey!\""
1390+ ,D.cyan "else",D.dullyellow "\"not bad\""
1394+ "This defines a `reviewPowerLevel` function that we can use elsewhere in our program."
1546− "This defines a `reviewPowerLevel` function that you can use elsewhere in your program."
1551− "It is a reserved word. Try changing the name to something else?"
1554− Code.Upper c cs ->
1397+ _ ->
1556− region = toRegion row col
1558− Report.Report "UNEXPECTED CAPITAL LETTER" region [] $
1559− Code.toSnippet source region Nothing
1561− D.reflow $
1398+ D.reflow $
1562− "Declarations always start with a lower-case letter, so I am getting stuck here:"
1399+ "It is a reserved word. Try changing the name to something else?"
1566− ["Try","a","name","like"
1567− ,D.green (D.fromChars (Char.toLower c : cs))
1571− "Here are a couple valid declarations for reference:"
1572− , D.indent 4 $ D.vcat $
1573− [ "greet : String -> String"
1575− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
1577− , D.cyan "type" <> " User = Anonymous | LoggedIn String"
1580− "Notice that they always start with a lower-case letter. Capitalization matters!"
1584− Code.Other (Just char) | elem char ['(', '{', '[', '+', '-', '*', '/', '^', '&', '|', '"', '\'', '!', '@', '#', '$', '%'] ->
1402+ _ ->
1586− region = toRegion row col
1404+ region = toRegion row col
1588− Report.Report "UNEXPECTED SYMBOL" region [] $
1406+ Report.Report "SYNTAX PROBLEM" region [] $
1589− Code.toSnippet source region Nothing
1407+ Code.toSnippet source region Nothing
1591− D.reflow $
1409+ D.reflow $
1592− "I am getting stuck because this line starts with the " ++ [char] ++ " symbol:"
1410+ "I was expecting to see a declaration, but I am getting stuck here:"
1594− D.stack
1412+ D.stack
1595− [ D.reflow $
1413+ [ case Code.whatIsNext source row col of
1596− "When a line has no spaces at the beginning, I expect it to be a declaration like one of these:"
1414+ Code.Other (Just char) | Char.isUpper char ->
1416+ "All declarations start with lower-case letters in Elm, so maybe this letter can\
1417+ \ be changed to lower-case?"
1421+ "Declarations normally start with a lower-case name or the `type` keyword."
1423+ "Here are a couple valid declarations for reference:"
1597− , D.indent 4 $ D.vcat $
1424+ , D.vcat
1598− [ "greet : String -> String"
1425+ [ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
1599− , "greet name ="
1426+ , D.fillSep [D.green "add","x","y","="]
1600− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
1427+ , D.fillSep [" ","x","+","y"]
1602− , D.cyan "type" <> " User = Anonymous | LoggedIn String"
1429+ , D.fillSep [D.cyan "type",D.green "User","=","Anonymous","|","LoggedIn String"]
1431+ "Notice that these declarations start with lower-case letters. Capitalization\
1432+ \ makes a difference in Elm!"
1605− "If this is not supposed to be a declaration, try adding some spaces before it?"
1436+ DeclSpace space row col ->
1437+ toSpaceReport source space row col
1439+ Port port_ row col ->
1440+ toPortReport source port_ row col
1442+ DeclType declType row col ->
1443+ toDeclTypeReport source declType row col
1445+ DeclDef name declDef row col ->
1446+ toDeclDefReport source name declDef row col
1609− _ ->
1448+ DeclFreshLineAfterDocComment row col ->
1611 region = toRegion row col
1450 region = toRegion row col
1613− Report.Report "WEIRD DECLARATION" region [] $
1452+ Report.Report "EXPECTING DECLARATION" region [] $
1614 Code.toSnippet source region Nothing
1453 Code.toSnippet source region Nothing
1616 D.reflow $
1455 D.reflow $
1617− "I am trying to parse a declaration, but I am getting stuck here:"
1456+ "I just saw a doc comment, but then I got stuck here:"
1620− [ D.reflow $
1458+ D.reflow $
1621− "When a line has no spaces at the beginning, I expect it to be a declaration like one of these:"
1459+ "I was expecting to see the corresponding declaration next, starting on a fresh\
1622− , D.indent 4 $ D.vcat $
1460+ \ line with no indentation."
1623− [ "greet : String -> String"
1625− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
1627− , D.cyan "type" <> " User = Anonymous | LoggedIn String"
1630− "Try to make your declaration look like one of those? Or if this is not\
1631− \ supposed to be a declaration, try adding some spaces before it?"
@@ -1758,7 +1587,7 @@ toPortReport source port_ startRow startCol =
1758 [ D.reflow $
1587 [ D.reflow $
1759 "I was expecting to see a type next. Here are examples of outgoing and\
1588 "I was expecting to see a type next. Here are examples of outgoing and\
1760 \ incoming ports for reference:"
1589 \ incoming ports for reference:"
1761− , D.indent 4 $ D.vcat $
1590+ , D.vcat
1762 [ D.fillSep [D.cyan "port","send",":","String -> Cmd msg"]
1591 [ D.fillSep [D.cyan "port","send",":","String -> Cmd msg"]
1763 , D.fillSep [D.cyan "port","receive",":","(String -> msg) -> Sub msg"]
1592 , D.fillSep [D.cyan "port","receive",":","(String -> msg) -> Sub msg"]
@@ -1777,7 +1606,7 @@ portNote =
1778 [ D.toSimpleNote $
1607 [ D.toSimpleNote $
1779 "Here are some example `port` declarations for reference:"
1608 "Here are some example `port` declarations for reference:"
1780− , D.indent 4 $ D.vcat $
1609+ , D.vcat
1781 [ D.fillSep [D.cyan "port","send",":","String -> Cmd msg"]
1610 [ D.fillSep [D.cyan "port","send",":","String -> Cmd msg"]
1782 , D.fillSep [D.cyan "port","receive",":","(String -> msg) -> Sub msg"]
1611 , D.fillSep [D.cyan "port","receive",":","(String -> msg) -> Sub msg"]
@@ -1960,8 +1789,8 @@ typeAliasNote =
1960 [ D.toSimpleNote $
1789 [ D.toSimpleNote $
1961 "Here is an example of a valid `type alias` for reference:"
1790 "Here is an example of a valid `type alias` for reference:"
1962 , D.vcat $
1791 , D.vcat $
1963− [ D.indent 4 $ D.fillSep [D.cyan "type",D.cyan "alias","Person","="]
1792+ [ D.indent 0 $ D.fillSep [D.cyan "type",D.cyan "alias",D.green "Person","="]
1964− , D.indent 6 $ D.vcat $
1793+ , D.indent 2 $ D.vcat $
1965 ["{ name : String"
1794 ["{ name : String"
1966 ,", age : Int"
1795 ,", age : Int"
1967 ,", height : Float"
1796 ,", height : Float"
@@ -2161,10 +1990,10 @@ customTypeNote =
2161 [ D.toSimpleNote $
1990 [ D.toSimpleNote $
2162 "Here is an example of a valid `type` declaration for reference:"
1991 "Here is an example of a valid `type` declaration for reference:"
2163 , D.vcat $
1992 , D.vcat $
2164− [ D.indent 4 $ D.fillSep [D.cyan "type","Status"]
1993+ [ D.indent 0 $ D.fillSep [D.cyan "type",D.green "Status"]
2165− , D.indent 6 $ D.fillSep ["=","Failure"]
1994+ , D.indent 2 $ D.fillSep ["=","Failure"]
2166− , D.indent 6 $ D.fillSep ["|","Waiting"]
1995+ , D.indent 2 $ D.fillSep ["|","Waiting"]
2167− , D.indent 6 $ D.fillSep ["|","Success","String"]
1996+ , D.indent 2 $ D.fillSep ["|","Success","String"]
2169 , D.reflow $
1998 , D.reflow $
2170 "This defines a new `Status` type with three variants. This could be useful if\
1999 "This defines a new `Status` type with three variants. This could be useful if\
@@ -2236,10 +2065,10 @@ toDeclDefReport source name declDef startRow startCol =
2236 ,"a","type","annotation.","It","could","be","something","else","though,","so"
2065 ,"a","type","annotation.","It","could","be","something","else","though,","so"
2237 ,"here","is","a","valid","definition","for","reference:"
2066 ,"here","is","a","valid","definition","for","reference:"
2239− , D.indent 4 $ D.vcat $
2068+ , D.vcat
2240− [ "greet : String -> String"
2069+ [ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
2241− , "greet name ="
2070+ , D.fillSep [D.green "add","x","y","="]
2242− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
2071+ , D.fillSep [" ","x","+","y"]
2244 , D.reflow $
2073 , D.reflow $
2245 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
2074 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
@@ -2261,10 +2090,10 @@ toDeclDefReport source name declDef startRow startCol =
2261 [ D.reflow $
2090 [ D.reflow $
2262 "I am not sure what is going wrong exactly, so here is a valid\
2091 "I am not sure what is going wrong exactly, so here is a valid\
2263 \ definition (with an optional type annotation) for reference:"
2092 \ definition (with an optional type annotation) for reference:"
2264− , D.indent 4 $ D.vcat $
2093+ , D.vcat
2265− [ "greet : String -> String"
2094+ [ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
2266− , "greet name ="
2095+ , D.fillSep [D.green "add","x","y","="]
2267− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
2096+ , D.fillSep [" ","x","+","y"]
2269 , D.reflow $
2098 , D.reflow $
2270 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
2099 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
@@ -2286,10 +2115,10 @@ toDeclDefReport source name declDef startRow startCol =
2286 [ D.reflow $
2115 [ D.reflow $
2287 "I am not sure what is going wrong exactly, so here is a valid\
2116 "I am not sure what is going wrong exactly, so here is a valid\
2288 \ definition (with an optional type annotation) for reference:"
2117 \ definition (with an optional type annotation) for reference:"
2289− , D.indent 4 $ D.vcat $
2118+ , D.vcat
2290− [ "greet : String -> String"
2119+ [ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
2291− , "greet name ="
2120+ , D.fillSep [D.green "add","x","y","="]
2292− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
2121+ , D.fillSep [" ","x","+","y"]
2294 , D.reflow $
2123 , D.reflow $
2295 "Try to use that format!"
2124 "Try to use that format!"
@@ -2404,10 +2233,10 @@ declDefNote =
2405 [ D.reflow $
2234 [ D.reflow $
2406 "Here is a valid definition (with a type annotation) for reference:"
2235 "Here is a valid definition (with a type annotation) for reference:"
2407− , D.indent 4 $ D.vcat $
2236+ , D.vcat
2408− [ "greet : String -> String"
2237+ [ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
2409− , "greet name ="
2238+ , D.fillSep [D.green "add","x","y","="]
2410− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
2239+ , D.fillSep [" ","x","+","y"]
2412 , D.reflow $
2241 , D.reflow $
2413 "The top line (called a \"type annotation\") is optional. You can leave it off\
2242 "The top line (called a \"type annotation\") is optional. You can leave it off\
@@ -2591,7 +2420,7 @@ toExprReport source context expr startRow startCol =
2591 ,"give","a","more","specific","hint!"
2420 ,"give","a","more","specific","hint!"
2593 , D.toSimpleNote $
2422 , D.toSimpleNote $
2594− "This can also happen if I run into reserved words like `let` or `as` unexpectedly.\
2423+ "This can also happen if run into reserved words like `let` or `as` unexpectedly.\
2595 \ Or if I run into operators in unexpected spots. Point is, there are a\
2424 \ Or if I run into operators in unexpected spots. Point is, there are a\
2596 \ couple ways I can get confused and give sort of weird advice!"
2425 \ couple ways I can get confused and give sort of weird advice!"
@@ -2740,15 +2569,17 @@ toStringReport source string row col =
2740 , D.toSimpleNote $
2569 , D.toSimpleNote $
2741 "For a string that spans multiple lines, you can use the multi-line string\
2570 "For a string that spans multiple lines, you can use the multi-line string\
2742 \ syntax like this:"
2571 \ syntax like this:"
2743− , D.dullyellow $ D.indent 4 $ D.vcat $
2572+ , D.vcat
2744− [ "\"\"\""
2573+ [ D.fillSep [D.green "markdown","=",D.dullyellow "\"\"\""]
2745− , "# Multi-line Strings"
2575+ , D.dullyellow "# Multi-line Strings"
2747− , "- start with triple double quotes"
2577+ , D.dullyellow "- start with triple double quotes"
2748− , "- write whatever you want"
2578+ , D.dullyellow "- write whatever you want"
2749− , "- no need to escape newlines or double quotes"
2579+ , D.dullyellow "- no need to escape newlines or double quotes"
2750− , "- end with triple double quotes"
2580+ , D.dullyellow "- end with triple double quotes"
2751− , "\"\"\""
2582+ , D.dullyellow "\"\"\""
@@ -2767,15 +2598,17 @@ toStringReport source string row col =
2767 [ D.reflow "Add a \"\"\" somewhere after this to end the string."
2598 [ D.reflow "Add a \"\"\" somewhere after this to end the string."
2768 , D.toSimpleNote $
2599 , D.toSimpleNote $
2769 "Here is a valid multi-line string for reference:"
2600 "Here is a valid multi-line string for reference:"
2770− , D.dullyellow $ D.indent 4 $ D.vcat $
2601+ , D.vcat
2771− [ "\"\"\""
2602+ [ D.fillSep [D.green "markdown","=",D.dullyellow "\"\"\""]
2772− , "# Multi-line Strings"
2604+ , D.dullyellow "# Multi-line Strings"
2774− , "- start with triple double quotes"
2606+ , D.dullyellow "- start with triple double quotes"
2775− , "- write whatever you want"
2607+ , D.dullyellow "- write whatever you want"
2776− , "- no need to escape newlines or double quotes"
2608+ , D.dullyellow "- no need to escape newlines or double quotes"
2777− , "- end with triple double quotes"
2609+ , D.dullyellow "- end with triple double quotes"
2778− , "\"\"\""
2611+ , D.dullyellow "\"\"\""
@@ -3042,7 +2875,7 @@ toOperatorReport source context operator row col =
3042 \Maybe it was supposed to be a > sign instead?"
2875 \Maybe it was supposed to be a > sign instead?"
3043 , D.toSimpleNote $
2876 , D.toSimpleNote $
3044 "The syntax for anonymous functions is (\\x -> x + 1) so the arguments all appear\
2877 "The syntax for anonymous functions is (\\x -> x + 1) so the arguments all appear\
3045− \ after the backslash and before the arrow. Maybe a backslash is missing earlier?"
2878+ \ after the backslash and before the arrow. Maybe you forgot the backslash earlier?"
@@ -3240,8 +3073,8 @@ toUnfinishLetReport source row col startRow startCol message =
3240 [ message
3073 [ message
3241 , D.toSimpleNote $
3074 , D.toSimpleNote $
3242 "Here is an example with a valid `let` expression for reference:"
3075 "Here is an example with a valid `let` expression for reference:"
3243− , D.indent 4 $ D.vcat $
3076+ , D.vcat $
3244− [ D.indent 0 $ D.fillSep ["viewPerson","person","="]
3077+ [ D.indent 0 $ D.fillSep [D.green "viewPerson","person","="]
3245 , D.indent 2 $ D.fillSep [D.cyan "let"]
3078 , D.indent 2 $ D.fillSep [D.cyan "let"]
3246 , D.indent 4 $ D.fillSep ["fullName","="]
3079 , D.indent 4 $ D.fillSep ["fullName","="]
3247 , D.indent 6 $ D.fillSep ["person.firstName","++",D.dullyellow "\" \"","++","person.lastName"]
3080 , D.indent 6 $ D.fillSep ["person.firstName","++",D.dullyellow "\" \"","++","person.lastName"]
@@ -3359,10 +3192,10 @@ toLetDefReport source name def startRow startCol =
3359 ,"a","type","annotation.","It","could","be","something","else","though,","so"
3192 ,"a","type","annotation.","It","could","be","something","else","though,","so"
3360 ,"here","is","a","valid","definition","for","reference:"
3193 ,"here","is","a","valid","definition","for","reference:"
3362− , D.indent 4 $ D.vcat $
3195+ , D.vcat
3363− [ "greet : String -> String"
3196+ [ D.indent 4 $ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
3364− , "greet name ="
3197+ , D.indent 4 $ D.fillSep [D.green "add","x","y","="]
3365− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
3198+ , D.indent 6 $ D.fillSep ["x","+","y"]
3367 , D.reflow $
3200 , D.reflow $
3368 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
3201 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
@@ -3384,10 +3217,10 @@ toLetDefReport source name def startRow startCol =
3384 [ D.reflow $
3217 [ D.reflow $
3385 "I am not sure what is going wrong exactly, so here is a valid\
3218 "I am not sure what is going wrong exactly, so here is a valid\
3386 \ definition (with an optional type annotation) for reference:"
3219 \ definition (with an optional type annotation) for reference:"
3387− , D.indent 4 $ D.vcat $
3220+ , D.vcat
3388− [ "greet : String -> String"
3221+ [ D.indent 4 $ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
3389− , "greet name ="
3222+ , D.indent 4 $ D.fillSep [D.green "add","x","y","="]
3390− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
3223+ , D.indent 6 $ D.fillSep ["x","+","y"]
3392 , D.reflow $
3225 , D.reflow $
3393 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
3226 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
@@ -3409,10 +3242,10 @@ toLetDefReport source name def startRow startCol =
3409 [ D.reflow $
3242 [ D.reflow $
3410 "I am not sure what is going wrong exactly, so here is a valid\
3243 "I am not sure what is going wrong exactly, so here is a valid\
3411 \ definition (with an optional type annotation) for reference:"
3244 \ definition (with an optional type annotation) for reference:"
3412− , D.indent 4 $ D.vcat $
3245+ , D.vcat
3413− [ "greet : String -> String"
3246+ [ D.indent 4 $ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
3414− , "greet name ="
3247+ , D.indent 4 $ D.fillSep [D.green "add","x","y","="]
3415− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
3248+ , D.indent 4 $ D.fillSep ["x","+","y"]
3417 , D.reflow $
3250 , D.reflow $
3418 "Try to use that format!"
3251 "Try to use that format!"
@@ -3502,10 +3335,10 @@ defNote =
3503 [ D.reflow $
3336 [ D.reflow $
3504 "Here is a valid definition (with a type annotation) for reference:"
3337 "Here is a valid definition (with a type annotation) for reference:"
3505− , D.indent 4 $ D.vcat $
3338+ , D.vcat
3506− [ "greet : String -> String"
3339+ [ D.indent 4 $ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
3507− , "greet name ="
3340+ , D.indent 4 $ D.fillSep [D.green "add","x","y","="]
3508− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
3341+ , D.indent 6 $ D.fillSep ["x","+","y"]
3510 , D.reflow $
3343 , D.reflow $
3511 "The top line (called a \"type annotation\") is optional. You can leave it off\
3344 "The top line (called a \"type annotation\") is optional. You can leave it off\
@@ -3987,22 +3820,15 @@ toRecordReport source context record startRow startCol =
3987 surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
3820 surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
3988 region = toRegion row col
3821 region = toRegion row col
3990− Report.Report "PROBLEM IN RECORD" region [] $
3823+ Report.Report "UNFINISHED RECORD" region [] $
3991 Code.toSnippet source surroundings (Just region)
3824 Code.toSnippet source surroundings (Just region)
3993 D.reflow $
3826 D.reflow $
3994 "I just started parsing a record, but I got stuck here:"
3827 "I just started parsing a record, but I got stuck here:"
3997− [ D.fillSep
3829+ D.fillSep
3830+ ["Records","look","like",D.dullyellow "{ x = 3, y = 4 },"
3998− ["I","was","expecting","to","see","a","record","field","defined","next,"
3831+ ,"so","I","was","expecting","to","see","a","field","name","next."
3999− ,"so","I","am","looking","for","a","name","like"
4000− ,D.dullyellow "userName","or",D.dullyellow "plantHeight" <> "."
4003− "Field names must start with a lower-case letter. After that, you can use\
4004− \ any sequence of letters, numbers, and underscores."
4005− , noteForRecordError
@@ -4011,7 +3837,7 @@ toRecordReport source context record startRow startCol =
4011 surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
3837 surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
4012 region = toRegion row col
3838 region = toRegion row col
4014− Report.Report "PROBLEM IN RECORD" region [] $
3840+ Report.Report "UNFINISHED RECORD" region [] $
4015 Code.toSnippet source surroundings (Just region)
3841 Code.toSnippet source surroundings (Just region)
4017 D.reflow $
3843 D.reflow $
@@ -4046,67 +3872,22 @@ toRecordReport source context record startRow startCol =
4046 \ that is a reserved word. Try using a different name!"
3872 \ that is a reserved word. Try using a different name!"
4049− Code.Other (Just ',') ->
4051− surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
4052− region = toRegion row col
4054− Report.Report "EXTRA COMMA" region [] $
4055− Code.toSnippet source surroundings (Just region)
4058− "I am partway through parsing a record, but I got stuck here:"
4062− "I am seeing two commas in a row. This is the second one!"
4064− "Just delete one of the commas and you should be all set!"
4065− , noteForRecordError
4069− Code.Close _ '}' ->
4071− surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
4072− region = toRegion row col
4074− Report.Report "EXTRA COMMA" region [] $
4075− Code.toSnippet source surroundings (Just region)
4078− "I am partway through parsing a record, but I got stuck here:"
4082− "Trailing commas are not allowed in records. Try deleting the comma that appears\
4083− \ before this closing curly brace."
4084− , noteForRecordError
4090 surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
3877 surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
4091 region = toRegion row col
3878 region = toRegion row col
4093− Report.Report "PROBLEM IN RECORD" region [] $
3880+ Report.Report "UNFINISHED RECORD" region [] $
4094 Code.toSnippet source surroundings (Just region)
3881 Code.toSnippet source surroundings (Just region)
4096 D.reflow $
3883 D.reflow $
4097− "I am partway through parsing a record, but I got stuck here:"
3884+ "I am partway through parsing a record, but I got stuck after that last comma:"
4099− D.stack
3886+ addNoteForRecordError $
4100− [ D.fillSep
3887+ D.reflow $
4101− ["I","was","expecting","to","see","another","record","field","defined","next,"
3888+ "Trailing commas are not allowed in records, so I was expecting to see another\
4102− ,"so","I","am","looking","for","a","name","like"
3889+ \ record field defined next. If you are done defining the record, the fix may\
4103− ,D.dullyellow "userName","or",D.dullyellow "plantHeight" <> "."
3890+ \ be to delete that last comma?"
4106− "Field names must start with a lower-case letter. After that, you can use\
4107− \ any sequence of letters, numbers, and underscores."
4108− , noteForRecordError
4112 RecordEquals row col ->
3893 RecordEquals row col ->
@@ -4114,19 +3895,17 @@ toRecordReport source context record startRow startCol =
4114 surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
3895 surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
4115 region = toRegion row col
3896 region = toRegion row col
4117− Report.Report "PROBLEM IN RECORD" region [] $
3898+ Report.Report "UNFINISHED RECORD" region [] $
4118 Code.toSnippet source surroundings (Just region)
3899 Code.toSnippet source surroundings (Just region)
4120 D.reflow $
3901 D.reflow $
4121 "I am partway through parsing a record, but I got stuck here:"
3902 "I am partway through parsing a record, but I got stuck here:"
4123− D.stack
3904+ addNoteForRecordError $
4124− [ D.fillSep $
3905+ D.fillSep $
4125− ["I","just","saw","a","field","name,","so","I","was","expecting","to","see"
3906+ ["I","just","saw","a","field","name,","so","I","was","expecting","to","see"
4126− ,"an","equals","sign","next.","So","try","putting","an",D.green "=","sign","here?"
3907+ ,"an","equals","sign","next.","So","try","putting","an",D.green "=","sign","here?"
4128− , noteForRecordError
4132 RecordExpr expr row col ->
3911 RecordExpr expr row col ->
@@ -4146,54 +3925,29 @@ toRecordReport source context record startRow startCol =
4146 D.reflow $
3925 D.reflow $
4147 "I just saw the opening curly brace of a record, but then I got stuck here:"
3926 "I just saw the opening curly brace of a record, but then I got stuck here:"
4149− D.stack
3928+ addNoteForRecordIndentError $
4150− [ D.fillSep $
3929+ D.fillSep $
4151− ["I","am","expecting","a","record","like",D.dullyellow "{ x = 3, y = 4 }","here."
3930+ ["I","am","expecting","a","record","like",D.dullyellow "{ x = 3, y = 4 }","here."
4152− ,"Try","defining","some","fields","of","your","own?"
3931+ ,"Try","defining","some","fields","of","your","own?"
4154− , noteForRecordIndentError
4158 RecordIndentEnd row col ->
3935 RecordIndentEnd row col ->
4159− case Code.nextLineStartsWithCloseCurly source row of
4160− Just (curlyRow, curlyCol) ->
4162− surroundings = A.Region (A.Position startRow startCol) (A.Position curlyRow curlyCol)
4163− region = toRegion curlyRow curlyCol
4165− Report.Report "NEED MORE INDENTATION" region [] $
4166− Code.toSnippet source surroundings (Just region)
4169− "I was partway through parsing a record, but I got stuck here:"
4173− "I need this curly brace to be indented more. Try adding some spaces before it!"
4174− , noteForRecordError
4180− surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
3937+ surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
4181− region = toRegion row col
3938+ region = toRegion row col
4183− Report.Report "UNFINISHED RECORD" region [] $
3940+ Report.Report "UNFINISHED RECORD" region [] $
4184− Code.toSnippet source surroundings (Just region)
3941+ Code.toSnippet source surroundings (Just region)
4186− D.reflow $
3943+ D.reflow $
4187− "I was partway through parsing a record, but I got stuck here:"
4191− ["I","was","expecting","to","see","a","closing","curly","brace","next."
3944+ "I was expecting to see a closing curly brace next:"
3946+ addNoteForRecordIndentError $
4192− ,"Try","putting","a",D.green "}","next","and","see","if","that","helps?"
3948+ ["Try","putting","an",D.green "}","and","see","if","that","helps?"
4194− , noteForRecordIndentError
4198 RecordIndentField row col ->
3952 RecordIndentField row col ->
@@ -4206,13 +3960,11 @@ toRecordReport source context record startRow startCol =
4206 D.reflow $
3960 D.reflow $
4207 "I am partway through parsing a record, but I got stuck after that last comma:"
3961 "I am partway through parsing a record, but I got stuck after that last comma:"
4209− D.stack
3963+ addNoteForRecordError $
4210− [ D.reflow $
3964+ D.reflow $
4211− "Trailing commas are not allowed in records, so the fix may be to\
3965+ "Trailing commas are not allowed in records, so the fix may be to\
4212− \ delete that last comma? Or maybe you were in the middle of defining\
3966+ \ delete that last comma? Or maybe you were in the middle of defining\
4213− \ an additional field?"
3967+ \ an additional field?"
4214− , noteForRecordError
4218 RecordIndentEquals row col ->
3970 RecordIndentEquals row col ->
@@ -4227,12 +3979,10 @@ toRecordReport source context record startRow startCol =
4227 "I am partway through parsing a record. I just saw a record\
3979 "I am partway through parsing a record. I just saw a record\
4228 \ field, so I was expecting to see an equals sign next:"
3980 \ field, so I was expecting to see an equals sign next:"
4230− D.stack
3982+ addNoteForRecordIndentError $
4231− [ D.fillSep $
3983+ D.fillSep $
4232− ["Try","putting","an",D.green "=","followed","by","an","expression?"
3984+ ["Try","putting","an",D.green "=","followed","by","an","expression?"
4234− , noteForRecordIndentError
4238 RecordIndentExpr row col ->
3988 RecordIndentExpr row col ->
@@ -4246,48 +3996,52 @@ toRecordReport source context record startRow startCol =
4246 D.reflow $
3996 D.reflow $
4247 "I am partway through parsing a record, and I was expecting to run into an expression next:"
3997 "I am partway through parsing a record, and I was expecting to run into an expression next:"
4249− D.stack
3999+ addNoteForRecordIndentError $
4250− [ D.fillSep $
4000+ D.fillSep $
4251− ["Try","putting","something","like"
4001+ ["Try","putting","something","like"
4252− ,D.dullyellow "42","or",D.dullyellow"\"hello\"","for","now?"
4002+ ,D.dullyellow "42","or",D.dullyellow"\"hello\"","for","now?"
4254− , noteForRecordIndentError
4259−noteForRecordError :: D.Doc
4007+addNoteForRecordError :: D.Doc -> D.Doc
4260−noteForRecordError =
4008+addNoteForRecordError normalRecommendation =
4261 D.stack $
4009 D.stack $
4010+ normalRecommendation
4262 [ D.toSimpleNote
4012 [ D.toSimpleNote
4263 "If you are trying to define a record across multiple lines, I recommend using this format:"
4013 "If you are trying to define a record across multiple lines, I recommend using this format:"
4264 , D.indent 4 $ D.vcat $
4014 , D.indent 4 $ D.vcat $
4265− [ "{ name = " <> D.dullyellow "\"Alice\""
4015+ [ "{ name = \"Alice\""
4266− , ", age = " <> D.dullyellow "42"
4016+ , ", age = 42"
4267− , ", height = " <> D.dullyellow "1.75"
4017+ , ", height = 1.75"
4270 , D.reflow $
4020 , D.reflow $
4271− "Notice that each line starts with some indentation. Usually two or four spaces.\
4021+ "Notice that each line starts with some indentation. Usually two or four spaces. I\
4272− \ This is the stylistic convention in the Elm ecosystem."
4022+ \ know this style can be jarring for people coming from C-like syntax, but folks generally\
4023+ \ report that they are used to it (and often prefer it!) after a week or two of using Elm."
4276−noteForRecordIndentError :: D.Doc
4027+addNoteForRecordIndentError :: D.Doc -> D.Doc
4277−noteForRecordIndentError =
4028+addNoteForRecordIndentError normalRecommendation =
4278− D.stack
4029+ D.stack $
4030+ normalRecommendation
4279 [ D.toSimpleNote
4032 [ D.toSimpleNote
4280 "I may be confused by indentation. For example, if you are trying to define\
4033 "I may be confused by indentation. For example, if you are trying to define\
4281 \ a record across multiple lines, I recommend using this format:"
4034 \ a record across multiple lines, I recommend using this format:"
4282 , D.indent 4 $ D.vcat $
4035 , D.indent 4 $ D.vcat $
4283− [ "{ name = " <> D.dullyellow "\"Alice\""
4036+ [ "{ name = \"Alice\""
4284− , ", age = " <> D.dullyellow "42"
4037+ , ", age = 42"
4285− , ", height = " <> D.dullyellow "1.75"
4038+ , ", height = 1.75"
4288 , D.reflow $
4041 , D.reflow $
4289− "Notice that each line starts with some indentation. Usually two or four spaces.\
4042+ "Notice that each line starts with some indentation. Usually two or four spaces. I\
4290− \ This is the stylistic convention in the Elm ecosystem!"
4043+ \ know this style can be jarring for people coming from C-like syntax, but folks generally\
4044+ \ report that they are used to it (and often prefer it!) after a week or two of using Elm."
@@ -4476,14 +4230,15 @@ toListReport source context list startRow startCol =
4476 , D.toSimpleNote
4230 , D.toSimpleNote
4477 "I recommend using the following format for lists that span multiple lines:"
4231 "I recommend using the following format for lists that span multiple lines:"
4478 , D.indent 4 $ D.vcat $
4232 , D.indent 4 $ D.vcat $
4479− [ "[ " <> D.dullyellow "\"Alice\""
4233+ [ "[ \"Alice\""
4480− , ", " <> D.dullyellow "\"Bob\""
4234+ , ", \"Bob\""
4481− , ", " <> D.dullyellow "\"Chuck\""
4235+ , ", \"Chuck\""
4484 , D.reflow $
4238 , D.reflow $
4485− "Notice that each line starts with some indentation. Usually two or four spaces.\
4239+ "Notice that nothing comes directly after a newline. Each line starts with some spaces.\
4486− \ This is the stylistic convention in the Elm ecosystem."
4240+ \ This style can be jarring for people coming from C-like syntax, but folks generally\
4241+ \ report that they are used to it (and often prefer it!) after a week or two of using Elm."
@@ -4536,14 +4291,15 @@ toListReport source context list startRow startCol =
4536 "I may be confused by indentation. For example, if you are trying to define\
4291 "I may be confused by indentation. For example, if you are trying to define\
4537 \ a list across multiple lines, I recommend using this format:"
4292 \ a list across multiple lines, I recommend using this format:"
4538 , D.indent 4 $ D.vcat $
4293 , D.indent 4 $ D.vcat $
4539− [ "[ " <> D.dullyellow "\"Alice\""
4294+ [ "[ \"Alice\""
4540− , ", " <> D.dullyellow "\"Bob\""
4295+ , ", \"Bob\""
4541− , ", " <> D.dullyellow "\"Chuck\""
4296+ , ", \"Chuck\""
4544 , D.reflow $
4299 , D.reflow $
4545− "Notice that each line starts with some indentation. Usually two or four spaces.\
4300+ "Notice that nothing comes directly after a newline. Each line starts with some spaces.\
4546− \ This is the stylistic convention in the Elm ecosystem."
4301+ \ This style can be jarring for people coming from C-like syntax, but folks generally\
4302+ \ report that they are used to it (and often prefer it!) after a week or two of using Elm."
@@ -4567,14 +4323,15 @@ toListReport source context list startRow startCol =
4567 "I may be confused by indentation. For example, if you are trying to define\
4323 "I may be confused by indentation. For example, if you are trying to define\
4568 \ a list across multiple lines, I recommend using this format:"
4324 \ a list across multiple lines, I recommend using this format:"
4569 , D.indent 4 $ D.vcat $
4325 , D.indent 4 $ D.vcat $
4570− [ "[ " <> D.dullyellow "\"Alice\""
4326+ [ "[ \"Alice\""
4571− , ", " <> D.dullyellow "\"Bob\""
4327+ , ", \"Bob\""
4572− , ", " <> D.dullyellow "\"Chuck\""
4328+ , ", \"Chuck\""
4575 , D.reflow $
4331 , D.reflow $
4576− "Notice that each line starts with some indentation. Usually two or four spaces.\
4332+ "Notice that nothing comes directly after a newline. Each line starts with some spaces.\
4577− \ This is the stylistic convention in the Elm ecosystem."
4333+ \ This style can be jarring for people coming from C-like syntax, but folks generally\
4334+ \ report that they are used to it (and often prefer it!) after a week or two of using Elm."
@@ -4595,14 +4352,15 @@ toListReport source context list startRow startCol =
4595 , D.toSimpleNote
4352 , D.toSimpleNote
4596 "I recommend using the following format for lists that span multiple lines:"
4353 "I recommend using the following format for lists that span multiple lines:"
4597 , D.indent 4 $ D.vcat $
4354 , D.indent 4 $ D.vcat $
4598− [ "[ " <> D.dullyellow "\"Alice\""
4355+ [ "[ \"Alice\""
4599− , ", " <> D.dullyellow "\"Bob\""
4356+ , ", \"Bob\""
4600− , ", " <> D.dullyellow "\"Chuck\""
4357+ , ", \"Chuck\""
4603 , D.reflow $
4360 , D.reflow $
4604− "Notice that each line starts with some indentation. Usually two or four spaces.\
4361+ "Notice that nothing comes directly after a newline. Each line starts with some spaces.\
4605− \ This is the stylistic convention in the Elm ecosystem."
4362+ \ This style can be jarring for people coming from C-like syntax, but folks generally\
4363+ \ report that they are used to it (and often prefer it!) after a week or two of using Elm."
@@ -5475,64 +5233,22 @@ toTRecordReport source context record startRow startCol =
5475 \ that is a reserved word. Try using a different name!"
5233 \ that is a reserved word. Try using a different name!"
5478− Code.Other (Just ',') ->
5480− surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
5481− region = toRegion row col
5483− Report.Report "EXTRA COMMA" region [] $
5484− Code.toSnippet source surroundings (Just region)
5487− "I am partway through parsing a record type, but I got stuck here:"
5491− "I am seeing two commas in a row. This is the second one!"
5493− "Just delete one of the commas and you should be all set!"
5494− , noteForRecordTypeError
5498− Code.Close _ '}' ->
5500− surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
5501− region = toRegion row col
5503− Report.Report "EXTRA COMMA" region [] $
5504− Code.toSnippet source surroundings (Just region)
5507− "I am partway through parsing a record type, but I got stuck here:"
5511− "Trailing commas are not allowed in record types. Try deleting the comma that\
5512− \ appears before this closing curly brace."
5513− , noteForRecordTypeError
5519 surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
5238 surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
5520 region = toRegion row col
5239 region = toRegion row col
5522− Report.Report "PROBLEM IN RECORD TYPE" region [] $
5241+ Report.Report "UNFINISHED RECORD TYPE" region [] $
5523 Code.toSnippet source surroundings (Just region)
5242 Code.toSnippet source surroundings (Just region)
5525 D.reflow $
5244 D.reflow $
5526− "I am partway through parsing a record type, but I got stuck here:"
5245+ "I am partway through parsing a record type, but I got stuck after that last comma:"
5528− D.stack
5247+ addNoteForRecordTypeError $
5529− [ D.fillSep
5248+ D.reflow $
5530− ["I","was","expecting","to","see","another","record","field","defined","next,"
5249+ "Trailing commas are not allowed in records, so I was expecting to see another\
5531− ,"so","I","am","looking","for","a","name","like"
5250+ \ record field defined next. If you are done defining the record, the fix may\
5532− ,D.dullyellow "userName","or",D.dullyellow "plantHeight" <> "."
5251+ \ be to delete that last comma?"
5534− , noteForRecordTypeError
5538 TRecordColon row col ->
5254 TRecordColon row col ->
@@ -5546,13 +5262,11 @@ toTRecordReport source context record startRow startCol =
5546 D.reflow $
5262 D.reflow $
5547 "I am partway through parsing a record type, but I got stuck here:"
5263 "I am partway through parsing a record type, but I got stuck here:"
5549− D.stack
5265+ addNoteForRecordTypeError $
5550− [ D.fillSep $
5266+ D.fillSep $
5551− ["I","just","saw","a","field","name,","so","I","was","expecting","to","see"
5267+ ["I","just","saw","a","field","name,","so","I","was","expecting","to","see"
5552− ,"a","colon","next.","So","try","putting","an",D.green ":","sign","here?"
5268+ ,"a","colon","next.","So","try","putting","an",D.green ":","sign","here?"
5554− , noteForRecordTypeError
5558 TRecordType tipe row col ->
5272 TRecordType tipe row col ->
@@ -5572,54 +5286,29 @@ toTRecordReport source context record startRow startCol =
5572 D.reflow $
5286 D.reflow $
5573 "I just saw the opening curly brace of a record type, but then I got stuck here:"
5287 "I just saw the opening curly brace of a record type, but then I got stuck here:"
5575− D.stack
5289+ addNoteForRecordTypeIndentError $
5576− [ D.fillSep $
5290+ D.fillSep $
5577− ["I","am","expecting","a","record","like",D.dullyellow "{ name : String, age : Int }","here."
5291+ ["I","am","expecting","a","record","like",D.dullyellow "{ name : String, age : Int }","here."
5578− ,"Try","defining","some","fields","of","your","own?"
5292+ ,"Try","defining","some","fields","of","your","own?"
5580− , noteForRecordTypeIndentError
5584 TRecordIndentEnd row col ->
5296 TRecordIndentEnd row col ->
5585− case Code.nextLineStartsWithCloseCurly source row of
5586− Just (curlyRow, curlyCol) ->
5588− surroundings = A.Region (A.Position startRow startCol) (A.Position curlyRow curlyCol)
5589− region = toRegion curlyRow curlyCol
5591− Report.Report "NEED MORE INDENTATION" region [] $
5592− Code.toSnippet source surroundings (Just region)
5595− "I was partway through parsing a record type, but I got stuck here:"
5599− "I need this curly brace to be indented more. Try adding some spaces before it!"
5600− , noteForRecordTypeError
5606− surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
5298+ surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
5607− region = toRegion row col
5299+ region = toRegion row col
5609− Report.Report "UNFINISHED RECORD TYPE" region [] $
5301+ Report.Report "UNFINISHED RECORD TYPE" region [] $
5610− Code.toSnippet source surroundings (Just region)
5302+ Code.toSnippet source surroundings (Just region)
5612− D.reflow $
5304+ D.reflow $
5613− "I was partway through parsing a record type, but I got stuck here:"
5617− ["I","was","expecting","to","see","a","closing","curly","brace","next."
5305+ "I was expecting to see a closing curly brace next:"
5307+ addNoteForRecordTypeIndentError $
5618− ,"Try","putting","a",D.green "}","next","and","see","if","that","helps?"
5309+ ["Try","putting","an",D.green "}","and","see","if","that","helps?"
5620− , noteForRecordTypeIndentError
5624 TRecordIndentField row col ->
5313 TRecordIndentField row col ->
@@ -5632,13 +5321,11 @@ toTRecordReport source context record startRow startCol =
5632 D.reflow $
5321 D.reflow $
5633 "I am partway through parsing a record type, but I got stuck after that last comma:"
5322 "I am partway through parsing a record type, but I got stuck after that last comma:"
5635− D.stack
5324+ addNoteForRecordTypeIndentError $
5636− [ D.reflow $
5325+ D.reflow $
5637− "Trailing commas are not allowed in record types, so the fix may be to\
5326+ "Trailing commas are not allowed in record types, so the fix may be to\
5638− \ delete that last comma? Or maybe you were in the middle of defining\
5327+ \ delete that last comma? Or maybe you were in the middle of defining\
5639− \ an additional field?"
5328+ \ an additional field?"
5640− , noteForRecordTypeIndentError
5644 TRecordIndentColon row col ->
5331 TRecordIndentColon row col ->
@@ -5653,12 +5340,10 @@ toTRecordReport source context record startRow startCol =
5653 "I am partway through parsing a record type. I just saw a record\
5340 "I am partway through parsing a record type. I just saw a record\
5654 \ field, so I was expecting to see a colon next:"
5341 \ field, so I was expecting to see a colon next:"
5656− D.stack
5343+ addNoteForRecordTypeIndentError $
5657− [ D.fillSep $
5344+ D.fillSep $
5658− ["Try","putting","an",D.green ":","followed","by","a","type?"
5345+ ["Try","putting","an",D.green ":","followed","by","a","type?"
5660− , noteForRecordTypeIndentError
5664 TRecordIndentType row col ->
5349 TRecordIndentType row col ->
@@ -5672,19 +5357,19 @@ toTRecordReport source context record startRow startCol =
5672 D.reflow $
5357 D.reflow $
5673 "I am partway through parsing a record type, and I was expecting to run into a type next:"
5358 "I am partway through parsing a record type, and I was expecting to run into a type next:"
5675− D.stack
5360+ addNoteForRecordTypeIndentError $
5676− [ D.fillSep $
5361+ D.fillSep $
5677− ["Try","putting","something","like"
5362+ ["Try","putting","something","like"
5678− ,D.dullyellow "Int","or",D.dullyellow "String","for","now?"
5363+ ,D.dullyellow "Int","or",D.dullyellow "String","for","now?"
5680− , noteForRecordTypeIndentError
5685−noteForRecordTypeError :: D.Doc
5368+addNoteForRecordTypeError :: D.Doc -> D.Doc
5686−noteForRecordTypeError =
5369+addNoteForRecordTypeError normalRecommendation =
5687 D.stack $
5370 D.stack $
5371+ normalRecommendation
5688 [ D.toSimpleNote
5373 [ D.toSimpleNote
5689 "If you are trying to define a record type across multiple lines, I recommend using this format:"
5374 "If you are trying to define a record type across multiple lines, I recommend using this format:"
5690 , D.indent 4 $ D.vcat $
5375 , D.indent 4 $ D.vcat $
@@ -5694,14 +5379,17 @@ noteForRecordTypeError =
5696 , D.reflow $
5381 , D.reflow $
5697− "Notice that each line starts with some indentation. Usually two or four spaces.\
5382+ "Notice that each line starts with some indentation. Usually two or four spaces. I\
5698− \ This is the stylistic convention in the Elm ecosystem."
5383+ \ know this style can be jarring for people coming from C-like syntax, but folks generally\
5384+ \ report that they are used to it (and often prefer it!) after a week or two of using Elm."
5702−noteForRecordTypeIndentError :: D.Doc
5388+addNoteForRecordTypeIndentError :: D.Doc -> D.Doc
5703−noteForRecordTypeIndentError =
5389+addNoteForRecordTypeIndentError normalRecommendation =
5704 D.stack $
5390 D.stack $
5391+ normalRecommendation
5705 [ D.toSimpleNote
5393 [ D.toSimpleNote
5706 "I may be confused by indentation. For example, if you are trying to define\
5394 "I may be confused by indentation. For example, if you are trying to define\
5707 \ a record type across multiple lines, I recommend using this format:"
5395 \ a record type across multiple lines, I recommend using this format:"
@@ -5712,8 +5400,9 @@ noteForRecordTypeIndentError =
5714 , D.reflow $
5402 , D.reflow $
5715− "Notice that each line starts with some indentation. Usually two or four spaces.\
5403+ "Notice that each line starts with some indentation. Usually two or four spaces. I\
5716− \ This is the stylistic convention in the Elm ecosystem."
5404+ \ know this style can be jarring for people coming from C-like syntax, but folks generally\
5405+ \ report that they are used to it (and often prefer it!) after a week or two of using Elm."