Added location to results

Author: RealA10N

core/result.go

@@ -1,6 +1,9 @@
 package core
 
 import (
+	"fmt"
+	"sort"
+
 	"alon.kr/x/list"
 	"github.com/fatih/color"
 )
@@ -27,23 +30,59 @@ type ResultDetails struct {
 type ResultList = list.List[Result]
 
 type ResultStringer struct {
-	titles map[ResultType]string
+	Titles     map[ResultType]string
+	Filepath   string
+	LineStarts []UsmUint
+}
+
+func newTitleStrings() map[ResultType]string {
+	return map[ResultType]string{
+		InternalErrorResult: color.New(color.Bold, color.BgRed, color.FgWhite).Sprint("panic:"),
+		ErrorResult:         color.New(color.Bold, color.FgRed).Sprint("error:"),
+		WarningResult:       color.New(color.Bold, color.FgYellow).Sprint("warning:"),
+		HintResult:          color.New(color.Bold, color.FgCyan).Sprint("note:"),
+	}
 }
 
-func NewResultStringer() ResultStringer {
+func calculateLineStartsFromSource(ctx SourceContext) []UsmUint {
+	starts := []UsmUint{0}
+	for i, c := range ctx {
+		if c == '\n' {
+			starts = append(starts, UsmUint(i+1))
+		}
+	}
+	return starts
+}
+
+func NewResultStringer(ctx SourceContext, Filepath string) ResultStringer {
 	return ResultStringer{
-		titles: map[ResultType]string{
-			InternalErrorResult: color.New(color.Bold, color.BgRed, color.FgWhite).Sprint("panic:"),
-			ErrorResult:         color.New(color.Bold, color.FgRed).Sprint("error:"),
-			WarningResult:       color.New(color.Bold, color.FgYellow).Sprint("warning:"),
-			HintResult:          color.New(color.Bold, color.FgCyan).Sprint("note:"),
-		},
+		Titles:     newTitleStrings(),
+		LineStarts: calculateLineStartsFromSource(ctx),
+		Filepath:   Filepath,
 	}
 }
 
+func (w *ResultStringer) viewToLocation(
+	view UnmanagedSourceView,
+) (line UsmUint, col UsmUint) {
+	start := view.Start
+	row := sort.Search(len(w.LineStarts), func(i int) bool {
+		return start < w.LineStarts[i]
+	}) - 1
+	col = start - w.LineStarts[row]
+	return UsmUint(row), UsmUint(col)
+}
+
 func (w *ResultStringer) StringResultDetails(details ResultDetails) string {
-	title := w.titles[details.Type]
-	return title + " " + details.Message
+	location := w.Filepath
+	if details.Location != nil {
+		row, col := w.viewToLocation(*details.Location)
+		location += fmt.Sprintf(":%d:%d", row+1, col+1)
+	}
+
+	title := w.Titles[details.Type]
+	message := details.Message
+	return location + ": " + title + " " + message
 }
 
 func (w *ResultStringer) StringResult(result Result) string {

usm.go

@@ -3,16 +3,20 @@ package main
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 
 	"alon.kr/x/usm/core"
 	"alon.kr/x/usm/lex"
 	"alon.kr/x/usm/parse"
 	"github.com/spf13/cobra"
 )
 
+var inputFilepath string = ""
+
 func setInputSource(cmd *cobra.Command, args []string) error {
 	if len(args) > 0 {
-		file, err := os.Open(args[0])
+		inputFilepath = filepath.Clean(args[0])
+		file, err := os.Open(inputFilepath)
 		if err != nil {
 			return fmt.Errorf("error opening file: %v", err)
 		}
@@ -61,7 +65,7 @@ func fmtCommand(cmd *cobra.Command, args []string) {
 		strCtx := parse.StringContext{SourceContext: view.Ctx()}
 		fmt.Print(file.String(&strCtx))
 	} else {
-		stringer := core.NewResultStringer()
+		stringer := core.NewResultStringer(view.Ctx(), inputFilepath)
 		fmt.Print(stringer.StringResult(result))
 	}
 }