Fix error message for too many arguments whith at least one named arg

databricks · Nov 6, 2020 · a92d8ed · a92d8ed
1 parent 5ccdb4c
commit a92d8ed
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ output/
 .DS_STORE
 .idea_modules
 .idea
+.metals
 out/
diff --git a/sjsonnet/src/sjsonnet/Val.scala b/sjsonnet/src/sjsonnet/Val.scala
@@ -287,7 +287,7 @@ object Val{
       Error.failIfNonEmpty(
         repeats,
         outerOffset,
-        (plural, names) => s"Function parameter$plural $names passed more than once"
+        (plural, names) => s"binding parameter a second time: $names"
       )
 
       Error.failIfNonEmpty(

diff --git a/sjsonnet/test/resources/imports/error.too_many_arg_with_named_arg.jsonnet b/sjsonnet/test/resources/imports/error.too_many_arg_with_named_arg.jsonnet
@@ -0,0 +1,2 @@
+local foo (x) = x;
+foo(1, x = "bar")
diff --git a/sjsonnet/test/src-jvm/sjsonnet/ErrorTests.scala b/sjsonnet/test/src-jvm/sjsonnet/ErrorTests.scala
@@ -139,20 +139,14 @@ object ErrorTests extends TestSuite{
     )
 
     test("function_duplicate_arg") - check(
-      """sjsonnet.Error: Function parameter x passed more than once
+      """sjsonnet.Error: binding parameter a second time: x
         |    at .(sjsonnet/test/resources/test_suite/error.function_duplicate_arg.jsonnet:17:21)
         |    at .(sjsonnet/test/resources/test_suite/error.function_duplicate_arg.jsonnet:17:21)
         |""".stripMargin
     )
     test("function_duplicate_param") - check(
       """Parse error: Expected no duplicate parameter: x:17:14, found ") x\n"""".stripMargin
     )
-//    test("function_infinite_default") - check(
-//      """sjsonnet.Error: Parameter passed more than once: x
-//        |    at .(sjsonnet/test/resources/test_suite/error.function_duplicate_arg.jsonnet:17:2)
-//        |    at .(sjsonnet/test/resources/test_suite/error.function_duplicate_arg.jsonnet:17:21)
-//        |""".stripMargin
-//    )
     test("function_too_many_args") - check(
       """sjsonnet.Error: Too many args, function has 2 parameter(s)
         |    at .(sjsonnet/test/resources/test_suite/error.function_too_many_args.jsonnet:19:4)
@@ -288,20 +282,12 @@ object ErrorTests extends TestSuite{
          |    at .(sjsonnet/test/resources/imports/error.too_many_arg.jsonnet:3:6)
          |""".stripMargin
     )
-    //    test("overflow") - check(
-//      """sjsonnet.Error: my error message
-//        |    at .(sjsonnet/test/resources/test_suite/error.invariant.simple3.jsonnet:18:10)
-//        |""".stripMargin
-//    )
-//    test("overflow2") - check(
-//      """sjsonnet.Error: my error message
-//        |    at .(sjsonnet/test/resources/test_suite/error.invariant.simple3.jsonnet:18:10)
-//        |""".stripMargin
-//    )
-//    test("overflow3") - check(
-//      """sjsonnet.Error: my error message
-//        |    at .(sjsonnet/test/resources/test_suite/error.invariant.simple3.jsonnet:18:10)
-//        |""".stripMargin
-//    )
+
+    test("too_many_arg_with_named_arg") - checkImports(
+      """|sjsonnet.Error: binding parameter a second time: x
+         |    at .(sjsonnet/test/resources/imports/error.too_many_arg_with_named_arg.jsonnet:2:4)
+         |    at .(sjsonnet/test/resources/imports/error.too_many_arg_with_named_arg.jsonnet:2:4)
+         |""".stripMargin
+    )
   }
 }
diff --git a/sjsonnet/test/src/sjsonnet/EvaluatorTests.scala b/sjsonnet/test/src/sjsonnet/EvaluatorTests.scala
@@ -225,12 +225,17 @@ object EvaluatorTests extends TestSuite{
             |  welcome: 'Hello ' + name + '!',
             |};
             |{
-            |  person2: Person('Bob', hello=123),
+            |  person2: Person(hello=123),
             |}
         """.stripMargin
         )
       }
 
+      /* 
+       * Wrong number of params error takes precedence on invalid param
+       * For that reason, to assert for invalid param we need to pass the 
+       * right number of params in the first place.
+       */
       assert(ex.getMessage.contains("Function has no parameter hello"))
     }