Remove source pointer in error if wide chars are used

antonmedv · antonmedv · commit e498575f8b08 · 2020-03-04T11:00:50.000+03:00
diff --git a/file/error.go b/file/error.go
@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"strings"
 	"unicode/utf8"
-
-	"golang.org/x/text/width"
 )
 
 type Error struct {
@@ -18,11 +16,6 @@ const (
 	ind = "^"
 )
 
-var (
-	wideDot = width.Widen.String(dot)
-	wideInd = width.Widen.String(ind)
-)
-
 func (e *Error) Error() string {
 	return e.Message
 }
@@ -46,17 +39,20 @@ func (e *Error) Format(source *Source) string {
 			_, sz := utf8.DecodeRune(bytes)
 			bytes = bytes[sz:]
 			if sz > 1 {
-				indLine += wideDot
+				goto noind
 			} else {
 				indLine += dot
 			}
 		}
 		if _, sz := utf8.DecodeRune(bytes); sz > 1 {
-			indLine += wideInd
+			goto noind
 		} else {
 			indLine += ind
 		}
-		result += srcLine + indLine
+		srcLine += indLine
+
+	noind:
+		result += srcLine
 	}
 	return result
 }
diff --git a/go.mod b/go.mod
@@ -7,5 +7,4 @@ require (
 	github.com/rivo/tview v0.0.0-20200219210816-cd38d7432498
 	github.com/sanity-io/litter v1.2.0
 	github.com/stretchr/testify v1.5.1
-	golang.org/x/text v0.3.2
 )
diff --git a/go.sum b/go.sum
@@ -23,6 +23,7 @@ github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRci
 github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4 h1:sfkvUWPNGwSV+8/fNqctR5lS2AqCSqYwXdrjCxp/dXo=
 golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
diff --git a/parser/lexer/lexer_test.go b/parser/lexer/lexer_test.go
@@ -152,6 +152,10 @@ id "hello
 literal not terminated (1:10)
  | id "hello
  | .........^
+
+früh ♥︎
+unrecognized character: U+2665 '♥' (1:7)
+ | früh ♥︎
 `
 
 func TestLex_error(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"strings"`
`6`	`6`	`"unicode/utf8"`
`7`		`-`
`8`		`- "golang.org/x/text/width"`
`9`	`7`	`)`
`10`	`8`
`11`	`9`	`type Error struct {`
`@@ -18,11 +16,6 @@ const (`
`18`	`16`	`ind = "^"`
`19`	`17`	`)`
`20`	`18`
`21`		`-var (`
`22`		`- wideDot = width.Widen.String(dot)`
`23`		`- wideInd = width.Widen.String(ind)`
`24`		`-)`
`25`		`-`
`26`	`19`	`func (e *Error) Error() string {`
`27`	`20`	`return e.Message`
`28`	`21`	`}`
`@@ -46,17 +39,20 @@ func (e Error) Format(source Source) string {`
`46`	`39`	`_, sz := utf8.DecodeRune(bytes)`
`47`	`40`	`bytes = bytes[sz:]`
`48`	`41`	`if sz > 1 {`
`49`		`- indLine += wideDot`
	`42`	`+ goto noind`
`50`	`43`	`} else {`
`51`	`44`	`indLine += dot`
`52`	`45`	`}`
`53`	`46`	`}`
`54`	`47`	`if _, sz := utf8.DecodeRune(bytes); sz > 1 {`
`55`		`- indLine += wideInd`
	`48`	`+ goto noind`
`56`	`49`	`} else {`
`57`	`50`	`indLine += ind`
`58`	`51`	`}`
`59`		`- result += srcLine + indLine`
	`52`	`+ srcLine += indLine`
	`53`	`+`
	`54`	`+ noind:`
	`55`	`+ result += srcLine`
`60`	`56`	`}`
`61`	`57`	`return result`
`62`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,4 @@ require (`
`7`	`7`	`github.com/rivo/tview v0.0.0-20200219210816-cd38d7432498`
`8`	`8`	`github.com/sanity-io/litter v1.2.0`
`9`	`9`	`github.com/stretchr/testify v1.5.1`
`10`		`- golang.org/x/text v0.3.2`
`11`	`10`	`)`