Better cursor display

Author: jig

err_test.go

@@ -253,7 +253,7 @@ func TestEvalAstErrorPosition(t *testing.T) {
 
 	// The cursor should point to line 4 where undefined-var is
 	// Format is typically: TestName§line…line,col…col
-	if !strings.Contains(lines[0], "§4") {
+	if !strings.Contains(lines[0], "§L4") {
 		t.Errorf("Error should reference line 4 where undefined-var is: %s", lines[0])
 	}
 

errorparsingunterminated_test.go

@@ -21,7 +21,7 @@ func TestErrorParsingUnterminatedString(t *testing.T) {
 	if err == nil {
 		t.Fatalf("must throw error but returns %q", ast)
 	}
-	if err.Error() != `§1…1,6…6: invalid token "hello` {
+	if err.Error() != `§L1,C6: invalid token "hello` {
 		t.Fatal(err)
 	}
 }
@@ -31,7 +31,7 @@ func TestErrorParsingUnterminatedHexa(t *testing.T) {
 	if err == nil {
 		t.Fatalf("must throw error but returns %q", ast)
 	}
-	if err.Error() != `§1…1,2…2: invalid token 0x` {
+	if err.Error() != `§L1,C2: invalid token 0x` {
 		t.Fatal(err)
 	}
 }

types/positiontype.go

@@ -127,11 +127,15 @@ func (cursor *Position) StringModule() string {
 func (cursor *Position) StringPosition() string {
 	if cursor == nil {
 		return ""
-	}
-	if cursor.Row < 0 {
+	} else if cursor.Row < 0 {
 		return ""
+	} else if cursor.BeginRow == cursor.Row {
+		if cursor.BeginCol == cursor.Col {
+			return fmt.Sprintf("L%d,C%d", cursor.BeginRow, cursor.BeginCol)
+		}
+		return fmt.Sprintf("L%d,C%d…C%d", cursor.BeginRow, cursor.BeginCol, cursor.Col)
 	}
-	return fmt.Sprintf("%d…%d,%d…%d", cursor.BeginRow, cursor.Row, cursor.BeginCol, cursor.Col)
+	return fmt.Sprintf("L%d…L%d,C%d…C%d", cursor.BeginRow, cursor.Row, cursor.BeginCol, cursor.Col)
 }
 
 func (cursor *Position) StringPositionRow() string {
@@ -142,9 +146,9 @@ func (cursor *Position) StringPositionRow() string {
 		return ""
 	}
 	if cursor.BeginRow != cursor.Row {
-		return fmt.Sprintf("%d…%d", cursor.BeginRow, cursor.Row)
+		return fmt.Sprintf("L%d…L%d", cursor.BeginRow, cursor.Row)
 	}
-	return fmt.Sprintf("%d", cursor.Row)
+	return fmt.Sprintf("L%d", cursor.Row)
 }
 
 func (cursor *Position) Includes(inside Position) bool {