Store and report file name with issues (#407)

asmaloney · Jan 22, 2024 · 4f6791d · 4f6791d
1 parent 497f506
commit 4f6791d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/amod/amod.go b/amod/amod.go
@@ -120,6 +120,7 @@ func modelReader(r io.Reader) (model *actr.Model, iLog *issues.Log, err error) {
 		pErr, ok := err.(participle.Error)
 		if ok {
 			location := issues.Location{
+				SourceFile:  pErr.Position().Filename,
 				Line:        pErr.Position().Line,
 				ColumnStart: pErr.Position().Column,
 				ColumnEnd:   pErr.Position().Column,

diff --git a/util/issues/issues.go b/util/issues/issues.go
@@ -4,6 +4,7 @@ package issues
 import (
 	"fmt"
 	"io"
+	"path/filepath"
 	"strings"
 )
 
@@ -16,9 +17,10 @@ const (
 )
 
 type Location struct {
-	Line        int `json:"line"`
-	ColumnStart int `json:"columnStart"`
-	ColumnEnd   int `json:"columnEnd"`
+	SourceFile  string `json:"sourceFile"`
+	Line        int    `json:"line"`
+	ColumnStart int    `json:"columnStart"`
+	ColumnEnd   int    `json:"columnEnd"`
 }
 
 type Issue struct {
@@ -114,7 +116,12 @@ func (l Log) Write(w io.Writer) error {
 		str += entry.Text
 
 		if entry.Location != nil {
-			str += fmt.Sprintf(" (line %d, col %d)", entry.Line, entry.ColumnStart)
+			if entry.SourceFile == "" {
+				str += fmt.Sprintf(" (line %d, col %d)", entry.Line, entry.ColumnStart)
+			} else {
+				file := filepath.Base(entry.SourceFile)
+				str += fmt.Sprintf(" (%s, line %d, col %d)", file, entry.Line, entry.ColumnStart)
+			}
 		}
 
 		str += "\n"