feat: lint all files in folder before panicking

gnolang · May 30, 2024 · 5109ce6 · 5109ce6
1 parent 9c60a23
commit 5109ce6
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 17 deletions.
diff --git a/gnovm/cmd/gno/lint.go b/gnovm/cmd/gno/lint.go
@@ -170,27 +170,36 @@ func catchRuntimeError(pkgPath string, stderr io.WriteCloser, action func()) (ha
 			return
 		}
 		hasError = true
-		switch verr := r.(type) {
-		case *gno.PreprocessError:
-			err := verr.Unwrap()
-			fmt.Fprint(stderr, issueFromError(pkgPath, err).String()+"\n")
-		case scanner.ErrorList:
-			for _, err := range verr {
-				fmt.Fprint(stderr, issueFromError(pkgPath, err).String()+"\n")
-			}
-		case error:
-			fmt.Fprint(stderr, issueFromError(pkgPath, verr).String()+"\n")
-		case string:
-			fmt.Fprint(stderr, issueFromError(pkgPath, errors.New(verr)).String()+"\n")
-		default:
-			panic(r)
-		}
+		printRuntimeError(r, pkgPath, stderr)
 	}()
 
 	action()
 	return
 }
 
+func printRuntimeError(r interface{}, pkgPath string, stderr io.WriteCloser) {
+	switch verr := r.(type) {
+	case *gno.PreprocessError:
+		err := verr.Unwrap()
+		fmt.Fprint(stderr, issueFromError(pkgPath, err).String()+"\n")
+	case scanner.ErrorList:
+		for _, err := range verr {
+			fmt.Fprint(stderr, issueFromError(pkgPath, err).String()+"\n")
+		}
+	case error:
+		fmt.Fprint(stderr, issueFromError(pkgPath, verr).String()+"\n")
+	case []error:
+		for _, err := range verr {
+			// recursive call to handle specifically each error type ex: scanner.ErrorList
+			printRuntimeError(err, pkgPath, stderr)
+		}
+	case string:
+		fmt.Fprint(stderr, issueFromError(pkgPath, errors.New(verr)).String()+"\n")
+	default:
+		panic(r)
+	}
+}
+
 type lintCode int
 
 const (

diff --git a/gnovm/cmd/gno/lint_test.go b/gnovm/cmd/gno/lint_test.go
@@ -23,6 +23,10 @@ func TestLintApp(t *testing.T) {
 			args:                []string{"lint", "../../tests/integ/several-lint-errors/main.gno"},
 			stderrShouldContain: "../../tests/integ/several-lint-errors/main.gno:5: expected ';', found example (code=2).\n../../tests/integ/several-lint-errors/main.gno:6",
 			errShouldBe:         "exit code: 1",
+		}, {
+			args:                []string{"lint", "../../tests/integ/several-files-multiple-errors/main.gno"},
+			stderrShouldContain: "../../tests/integ/several-files-multiple-errors/file2.gno:3: expected 'IDENT', found '{' (code=2).\n../../tests/integ/several-files-multiple-errors/file2.gno:5: expected type, found '}' (code=2).\n../../tests/integ/several-files-multiple-errors/main.gno:5: expected ';', found example (code=2).\n../../tests/integ/several-files-multiple-errors/main.gno:6: expected '}', found 'EOF' (code=2).\n",
+			errShouldBe:         "exit code: 1",
 		}, {
 			args:                []string{"lint", "../../tests/integ/run_main/"},
 			stderrShouldContain: "./../../tests/integ/run_main: missing 'gno.mod' file (code=1).",

diff --git a/gnovm/cmd/gno/test.go b/gnovm/cmd/gno/test.go
@@ -578,6 +578,7 @@ func loadTestFuncs(pkgName string, t *testFuncs, tfiles *gno.FileSet) *testFuncs
 func parseMemPackageTests(memPkg *std.MemPackage) (tset, itset *gno.FileSet) {
 	tset = &gno.FileSet{}
 	itset = &gno.FileSet{}
+	errors := []error{}
 	for _, mfile := range memPkg.Files {
 		if !strings.HasSuffix(mfile.Name, ".gno") {
 			continue // skip this file.
@@ -587,7 +588,8 @@ func parseMemPackageTests(memPkg *std.MemPackage) (tset, itset *gno.FileSet) {
 		}
 		n, err := gno.ParseFile(mfile.Name, mfile.Body)
 		if err != nil {
-			panic(err)
+			errors = append(errors, err)
+			continue
 		}
 		if n == nil {
 			panic("should not happen")
@@ -607,6 +609,9 @@ func parseMemPackageTests(memPkg *std.MemPackage) (tset, itset *gno.FileSet) {
 				memPkg.Name, memPkg.Name, n.PkgName, mfile))
 		}
 	}
+	if len(errors) > 0 {
+		panic(errors)
+	}
 	return tset, itset
 }
 

diff --git a/gnovm/pkg/gnolang/nodes.go b/gnovm/pkg/gnolang/nodes.go
@@ -1172,14 +1172,16 @@ func ReadMemPackageFromList(list []string, pkgPath string) *std.MemPackage {
 // or [ParseFile] returns an error, ParseMemPackage panics.
 func ParseMemPackage(memPkg *std.MemPackage) (fset *FileSet) {
 	fset = &FileSet{}
+	errors := []error{}
 	for _, mfile := range memPkg.Files {
 		if !strings.HasSuffix(mfile.Name, ".gno") ||
 			endsWith(mfile.Name, []string{"_test.gno", "_filetest.gno"}) {
 			continue // skip spurious or test file.
 		}
 		n, err := ParseFile(mfile.Name, mfile.Body)
 		if err != nil {
-			panic(err)
+			errors = append(errors, err)
+			continue
 		}
 		if memPkg.Name != string(n.PkgName) {
 			panic(fmt.Sprintf(
@@ -1189,6 +1191,9 @@ func ParseMemPackage(memPkg *std.MemPackage) (fset *FileSet) {
 		// add package file.
 		fset.AddFiles(n)
 	}
+	if len(errors) > 0 {
+		panic(errors)
+	}
 	return fset
 }
 

diff --git a/gnovm/tests/integ/several-files-multiple-errors/file2.gno b/gnovm/tests/integ/several-files-multiple-errors/file2.gno
@@ -0,0 +1,5 @@
+package main
+
+type{
+
+}
diff --git a/gnovm/tests/integ/several-files-multiple-errors/gno.mod b/gnovm/tests/integ/several-files-multiple-errors/gno.mod
@@ -0,0 +1 @@
+module gno.land/tests/severalerrors
diff --git a/gnovm/tests/integ/several-files-multiple-errors/main.gno b/gnovm/tests/integ/several-files-multiple-errors/main.gno
@@ -0,0 +1,6 @@
+package main
+
+func main() {
+	for {
+		_ example
+}