test(eval): change up diagnostics printing

src/eval/snapshots/monkey_language_server__eval__test__array_syntax_err.snap

@@ -14,5 +14,5 @@ Environment {
 ========================
 
 [
-    Error(ExpectedTokenNotFound("]"), (0,12)->(0,24)),
+    "SyntaxError: Expected ']' not found. (0,12)->(0,24)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__array_unknown_ident.snap

@@ -21,5 +21,5 @@ Environment {
 ========================
 
 [
-    Error(UnknownIdentifier("foo"), (0,12)->(0,15)),
+    "NameError: 'foo' is not defined. (0,12)->(0,15)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__bad_minus_prefix_1.snap

@@ -14,6 +14,6 @@ Environment {
 ========================
 
 [
-    Warning(UnusedExpression, (0,0)->(0,1)),
-    Error(BadPrefixType("bool"), (0,1)->(0,5)),
+    "Expression value is unused (0,0)->(0,1)",
+    "TypeError: bad operand type for unary +: 'bool'. (0,1)->(0,5)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__bad_minus_prefix_2.snap

@@ -21,5 +21,5 @@ Environment {
 ========================
 
 [
-    Error(BadPrefixType("str"), (0,9)->(0,14)),
+    "TypeError: bad operand type for unary +: 'str'. (0,9)->(0,14)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__bad_mix_infix.snap

@@ -0,0 +1,29 @@
+---
+source: src/eval/test.rs
+description: "\nlet x = \"foo\" + 1;\nlet x = true + 1;\nlet x = \"foo\" + true;\n"
+expression: "format!(\"{:#?}\\n\\n========================\\n\\n{:#?}\", env, diags)"
+---
+Environment {
+    store: [
+        (
+            "x",
+            Spanned(Unknown, (3,4)->(3,5)),
+        ),
+    ],
+    refs: [
+        Spanned("x", "(1,4)->(1,5)"),
+        Spanned("x", "(2,4)->(2,5)"),
+        Spanned("x", "(3,4)->(3,5)"),
+    ],
+    scope_range: "(0,0)->(3,21)",
+    parent_range: None,
+    children: [],
+}
+
+========================
+
+[
+    "TypeError: <str> + <int> (1,14)->(1,15)",
+    "TypeError: <bool> + <int> (2,13)->(2,14)",
+    "TypeError: <str> + <bool> (3,14)->(3,15)",
+]

src/eval/snapshots/monkey_language_server__eval__test__bad_token.snap

@@ -14,5 +14,5 @@ Environment {
 ========================
 
 [
-    Error(UnexpectedToken("@"), (0,0)->(0,1)),
+    "SyntaxError: Unexpected '@'. (0,0)->(0,1)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__bad_type_index.snap

@@ -21,5 +21,5 @@ Environment {
 ========================
 
 [
-    Error(BadIndex("int"), (0,8)->(0,9)),
+    "TypeError: 'int' object is not subscriptable. (0,8)->(0,9)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__bool_add.snap

@@ -21,5 +21,5 @@ Environment {
 ========================
 
 [
-    Error(UnknownOperator("bool", "bool", "+"), (0,13)->(0,14)),
+    "TypeError: <bool> + <bool> (0,13)->(0,14)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__bool_bang.snap

@@ -14,5 +14,5 @@ Environment {
 ========================
 
 [
-    Error(ExpectedTokenNotFound(";"), (0,13)->(0,14)),
+    "SyntaxError: Expected ';' not found. (0,13)->(0,14)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__bool_div.snap

@@ -21,5 +21,5 @@ Environment {
 ========================
 
 [
-    Error(UnknownOperator("bool", "bool", "/"), (0,13)->(0,14)),
+    "TypeError: <bool> / <bool> (0,13)->(0,14)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__bool_gt.snap

@@ -21,5 +21,5 @@ Environment {
 ========================
 
 [
-    Error(UnknownOperator("bool", "bool", ">"), (0,13)->(0,14)),
+    "TypeError: <bool> > <bool> (0,13)->(0,14)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__bool_lt.snap

@@ -21,5 +21,5 @@ Environment {
 ========================
 
 [
-    Error(UnknownOperator("bool", "bool", "<"), (0,13)->(0,14)),
+    "TypeError: <bool> < <bool> (0,13)->(0,14)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__bool_minus.snap

@@ -21,5 +21,5 @@ Environment {
 ========================
 
 [
-    Error(UnknownOperator("bool", "bool", "-"), (0,13)->(0,14)),
+    "TypeError: <bool> - <bool> (0,13)->(0,14)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__bool_mult.snap

@@ -21,5 +21,5 @@ Environment {
 ========================
 
 [
-    Error(UnknownOperator("bool", "bool", "*"), (0,13)->(0,14)),
+    "TypeError: <bool> * <bool> (0,13)->(0,14)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__builtin_first_bad_arg.snap

@@ -22,5 +22,5 @@ Environment {
 ========================
 
 [
-    Error(GenericTypeError("unable to get the first of 'int'"), (0,13)->(0,14)),
+    "TypeError: unable to get the first of 'int' (0,13)->(0,14)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__builtin_first_bad_arg_count_0.snap

@@ -22,5 +22,5 @@ Environment {
 ========================
 
 [
-    Error(MismatchArgs(1, 0), (0,13)->(0,14)),
+    "TypeError: mismatched arg and param count. Expected 1, got 0. (0,13)->(0,14)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__builtin_first_bad_arg_count_2.snap

@@ -22,5 +22,5 @@ Environment {
 ========================
 
 [
-    Error(MismatchArgs(1, 2), (0,13)->(0,14)),
+    "TypeError: mismatched arg and param count. Expected 1, got 2. (0,13)->(0,14)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__builtin_last_bad_arg.snap

@@ -22,5 +22,5 @@ Environment {
 ========================
 
 [
-    Error(GenericTypeError("unable to get the last of 'int'"), (0,12)->(0,13)),
+    "TypeError: unable to get the last of 'int' (0,12)->(0,13)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__builtin_last_bad_arg_count_0.snap

@@ -22,5 +22,5 @@ Environment {
 ========================
 
 [
-    Error(MismatchArgs(1, 0), (0,12)->(0,13)),
+    "TypeError: mismatched arg and param count. Expected 1, got 0. (0,12)->(0,13)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__builtin_last_bad_arg_count_2.snap

@@ -22,5 +22,5 @@ Environment {
 ========================
 
 [
-    Error(MismatchArgs(1, 2), (0,12)->(0,13)),
+    "TypeError: mismatched arg and param count. Expected 1, got 2. (0,12)->(0,13)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__builtin_len_bad_arg.snap

@@ -22,5 +22,5 @@ Environment {
 ========================
 
 [
-    Error(GenericTypeError("unable to get the len of 'int'"), (0,11)->(0,12)),
+    "TypeError: unable to get the len of 'int' (0,11)->(0,12)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__builtin_len_bad_arg_count_0.snap

@@ -22,5 +22,5 @@ Environment {
 ========================
 
 [
-    Error(MismatchArgs(1, 0), (0,11)->(0,12)),
+    "TypeError: mismatched arg and param count. Expected 1, got 0. (0,11)->(0,12)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__builtin_len_bad_arg_count_2.snap

@@ -22,5 +22,5 @@ Environment {
 ========================
 
 [
-    Error(MismatchArgs(1, 2), (0,11)->(0,12)),
+    "TypeError: mismatched arg and param count. Expected 1, got 2. (0,11)->(0,12)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__builtin_push_bad_arg.snap

@@ -22,5 +22,5 @@ Environment {
 ========================
 
 [
-    Error(GenericTypeError("unable to push value into 'str'"), (0,12)->(0,13)),
+    "TypeError: unable to push value into 'str' (0,12)->(0,13)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__builtin_push_bad_arg_count.snap

@@ -22,5 +22,5 @@ Environment {
 ========================
 
 [
-    Error(MismatchArgs(2, 1), (0,12)->(0,13)),
+    "TypeError: mismatched arg and param count. Expected 2, got 1. (0,12)->(0,13)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__builtin_rest_bad_arg.snap

@@ -22,5 +22,5 @@ Environment {
 ========================
 
 [
-    Error(GenericTypeError("unable to get the rest of 'int'"), (0,12)->(0,13)),
+    "TypeError: unable to get the rest of 'int' (0,12)->(0,13)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__builtin_rest_bad_arg_count_0.snap

@@ -22,5 +22,5 @@ Environment {
 ========================
 
 [
-    Error(MismatchArgs(1, 0), (0,12)->(0,13)),
+    "TypeError: mismatched arg and param count. Expected 1, got 0. (0,12)->(0,13)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__builtin_rest_bad_arg_count_2.snap

@@ -22,5 +22,5 @@ Environment {
 ========================
 
 [
-    Error(MismatchArgs(1, 2), (0,12)->(0,13)),
+    "TypeError: mismatched arg and param count. Expected 1, got 2. (0,12)->(0,13)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__curious_minus_prefix.snap

@@ -5,10 +5,17 @@ expression: "format!(\"{:#?}\\n\\n========================\\n\\n{:#?}\", env, di
 ---
 Environment {
     store: [
-        Spanned(x, (0,4)->(0,5)),
+        (
+            "x",
+            Spanned(Int, (0,4)->(0,5)),
+        ),
     ],
-    outer: None,
-    inner: [],
+    refs: [
+        Spanned("x", "(0,4)->(0,5)"),
+    ],
+    scope_range: "(0,0)->(0,22)",
+    parent_range: None,
+    children: [],
 }
 
 ========================

src/eval/snapshots/monkey_language_server__eval__test__errors.snap

@@ -19,7 +19,7 @@ let a = b;
 let add = fn(x,y) {
     return x + y;
     let a = "foo";
-    ^ [Warning] Code is unreachable
+    ^--^ [Warning] Code is unreachable
 };
 
 let ret = add(2);

src/eval/snapshots/monkey_language_server__eval__test__expr_after_func_return.snap

@@ -43,5 +43,5 @@ Environment {
 ========================
 
 [
-    Warning(UnreachableCode, (3,4)->(3,7)),
+    "Code is unreachable (3,4)->(3,7)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__good_bang_prefix_4.snap

@@ -0,0 +1,23 @@
+---
+source: src/eval/test.rs
+description: "let x = ![];"
+expression: "format!(\"{:#?}\\n\\n========================\\n\\n{:#?}\", env, diags)"
+---
+Environment {
+    store: [
+        (
+            "x",
+            Spanned(Bool, (0,4)->(0,5)),
+        ),
+    ],
+    refs: [
+        Spanned("x", "(0,4)->(0,5)"),
+    ],
+    scope_range: "(0,0)->(0,12)",
+    parent_range: None,
+    children: [],
+}
+
+========================
+
+[]

src/eval/snapshots/monkey_language_server__eval__test__good_bang_prefix_5.snap

@@ -0,0 +1,23 @@
+---
+source: src/eval/test.rs
+description: "let x = !{};"
+expression: "format!(\"{:#?}\\n\\n========================\\n\\n{:#?}\", env, diags)"
+---
+Environment {
+    store: [
+        (
+            "x",
+            Spanned(Bool, (0,4)->(0,5)),
+        ),
+    ],
+    refs: [
+        Spanned("x", "(0,4)->(0,5)"),
+    ],
+    scope_range: "(0,0)->(0,12)",
+    parent_range: None,
+    children: [],
+}
+
+========================
+
+[]

src/eval/snapshots/monkey_language_server__eval__test__hash_syntax_err.snap

@@ -14,5 +14,5 @@ Environment {
 ========================
 
 [
-    Error(ExpectedTokenNotFound("}"), (0,20)->(0,26)),
+    "SyntaxError: Expected '}' not found. (0,20)->(0,26)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__hash_unknown_ident.snap

@@ -21,6 +21,6 @@ Environment {
 ========================
 
 [
-    Error(UnknownIdentifier("a"), (0,9)->(0,10)),
-    Error(UnknownIdentifier("b"), (0,24)->(0,25)),
+    "NameError: 'a' is not defined. (0,9)->(0,10)",
+    "NameError: 'b' is not defined. (0,24)->(0,25)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__if_bad_condition.snap

@@ -40,5 +40,5 @@ Environment {
 ========================
 
 [
-    Error(UnexpectedToken("@"), (0,12)->(0,13)),
+    "SyntaxError: Unexpected '@'. (0,12)->(0,13)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__if_bad_consq_expr.snap

@@ -14,6 +14,6 @@ Environment {
 ========================
 
 [
-    Warning(UnusedExpression, (0,0)->(0,2)),
-    Error(UnexpectedToken("@"), (0,12)->(0,13)),
+    "Expression value is unused (0,0)->(0,2)",
+    "SyntaxError: Unexpected '@'. (0,12)->(0,13)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__if_unknown_idents.snap

@@ -40,7 +40,7 @@ Environment {
 ========================
 
 [
-    Error(UnknownIdentifier("a"), (0,12)->(0,13)),
-    Error(UnknownIdentifier("b"), (0,17)->(0,18)),
-    Error(UnknownIdentifier("c"), (0,28)->(0,29)),
+    "NameError: 'a' is not defined. (0,12)->(0,13)",
+    "NameError: 'b' is not defined. (0,17)->(0,18)",
+    "NameError: 'c' is not defined. (0,28)->(0,29)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__inner_scope_references.snap

@@ -59,6 +59,6 @@ Environment {
 ========================
 
 [
-    Error(UnknownIdentifier("b"), (4,12)->(4,13)),
-    Error(UnknownIdentifier("b"), (6,8)->(6,9)),
+    "NameError: 'b' is not defined. (4,12)->(4,13)",
+    "NameError: 'b' is not defined. (6,8)->(6,9)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__int_bang.snap

@@ -14,5 +14,5 @@ Environment {
 ========================
 
 [
-    Error(ExpectedTokenNotFound(";"), (0,10)->(0,11)),
+    "SyntaxError: Expected ';' not found. (0,10)->(0,11)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__let_stmt_unhappy_1.snap

@@ -14,5 +14,5 @@ Environment {
 ========================
 
 [
-    Error(UnexpectedToken(";"), (0,8)->(0,9)),
+    "SyntaxError: Unexpected ';'. (0,8)->(0,9)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__lone_array_index.snap

@@ -14,5 +14,5 @@ Environment {
 ========================
 
 [
-    Warning(UnusedExpression, (0,7)->(0,8)),
+    "Expression value is unused (0,7)->(0,8)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__lone_bool.snap

@@ -14,5 +14,5 @@ Environment {
 ========================
 
 [
-    Warning(UnusedExpression, (0,0)->(0,4)),
+    "Expression value is unused (0,0)->(0,4)",
 ]

src/eval/snapshots/monkey_language_server__eval__test__lone_ident.snap

@@ -14,6 +14,6 @@ Environment {
 ========================
 
 [
-    Warning(UnusedExpression, (0,0)->(0,1)),
-    Error(UnknownIdentifier("a"), (0,0)->(0,1)),
+    "Expression value is unused (0,0)->(0,1)",
+    "NameError: 'a' is not defined. (0,0)->(0,1)",
 ]