From ce76155e09282192213f14e52300e67e79b5a708 Mon Sep 17 00:00:00 2001 From: Yiannis <77271770+isarrigiannis@users.noreply.github.com> Date: Wed, 19 May 2021 13:57:47 +0200 Subject: [PATCH] Fix strip definition Co-authored-by: Tom Fenech --- linter/internal/types/stdlib.go | 6 +++--- testdata/stdlib_smoke_test.golden | 3 +++ testdata/stdlib_smoke_test.jsonnet | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/linter/internal/types/stdlib.go b/linter/internal/types/stdlib.go index 13b5a74..c7b86c5 100644 --- a/linter/internal/types/stdlib.go +++ b/linter/internal/types/stdlib.go @@ -78,9 +78,9 @@ func prepareStdlib(g *typeGraph) { "findSubstr": g.newSimpleFuncType(arrayOfNumber, "pat", "str"), "startsWith": g.newSimpleFuncType(boolType, "a", "b"), "endsWith": g.newSimpleFuncType(boolType, "a", "b"), - "stripChars": g.newSimpleFuncType(stringType, "chars"), - "lstripChars": g.newSimpleFuncType(stringType, "chars"), - "rstripChars": g.newSimpleFuncType(stringType, "chars"), + "stripChars": g.newSimpleFuncType(stringType, "str", "chars"), + "lstripChars": g.newSimpleFuncType(stringType, "str", "chars"), + "rstripChars": g.newSimpleFuncType(stringType, "str", "chars"), "split": g.newSimpleFuncType(arrayOfString, "str", "c"), "splitLimit": g.newSimpleFuncType(arrayOfString, "str", "c", "maxsplits"), "strReplace": g.newSimpleFuncType(stringType, "str", "from", "to"), diff --git a/testdata/stdlib_smoke_test.golden b/testdata/stdlib_smoke_test.golden index 8afed25..49c7d51 100644 --- a/testdata/stdlib_smoke_test.golden +++ b/testdata/stdlib_smoke_test.golden @@ -96,6 +96,7 @@ "length": 0, "lines": "a\nb\nc\n", "log": 1.6094379124341003, + "lstripChars": "bbbbcccc", "makeArray": [ 0, 1, @@ -155,6 +156,7 @@ 5 ], "repeat": "foofoofoo", + "rstripChars": "aaabbbb", "set": [ [ 1, @@ -238,6 +240,7 @@ "a", "h" ], + "stripChars": "bbbb", "substr": "s", "tan": -3.3805150062465854, "thisFile": "testdata/stdlib_smoke_test", diff --git a/testdata/stdlib_smoke_test.jsonnet b/testdata/stdlib_smoke_test.jsonnet index f568c75..c2a722c 100644 --- a/testdata/stdlib_smoke_test.jsonnet +++ b/testdata/stdlib_smoke_test.jsonnet @@ -61,6 +61,9 @@ findSubstr: std.findSubstr(pat="test", str="test test"), startsWith: std.startsWith(a="jsonnet", b="json"), endsWith: std.endsWith(a="jsonnet", b="sonnet"), + stripChars: std.stripChars(str="aaabbbbcccc", chars="ac"), + lstripChars: std.lstripChars(str="aaabbbbcccc", chars="a"), + rstripChars: std.rstripChars(str="aaabbbbcccc", chars="c"), split: std.split(str="a,b,c", c=","), splitLimit: std.splitLimit(str="a,b,c", c=",", maxsplits=1), strReplace: std.strReplace(str="aaa", from="aa", to="bb"),