i/prompting: fix formatting

Signed-off-by: Oliver Calder <[email protected]>
canonical · Jun 13, 2024 · 0c8702c · 0c8702c
1 parent 8bf4273
commit 0c8702c
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 38 deletions.
diff --git a/interfaces/prompting/patterns/parse.go b/interfaces/prompting/patterns/parse.go
@@ -75,7 +75,8 @@ func parseAlt(tr *tokenReader) (RenderNode, error) {
 	var alt Alt
 
 	if t := tr.Token(); t.Type != tokBraceOpen {
-		return nil, errors.New("expected { in parseAlt")
+		// Should not occur, caller should call parseAlt on peeking '{'
+		return nil, fmt.Errorf("expected '{' at start of alt, but got %v", t)
 	}
 
 	tr.depth++

diff --git a/interfaces/prompting/patterns/scan.go b/interfaces/prompting/patterns/scan.go
@@ -109,7 +109,7 @@ loop:
 
 	if len(runes) > 0 {
 		tokens = append(tokens, Token{Text: string(runes), Type: tokText})
-		runes = nil
+		// runes = nil
 	}
 
 	return tokens, nil

diff --git a/interfaces/prompting/patterns/scan_test.go b/interfaces/prompting/patterns/scan_test.go
@@ -33,40 +33,40 @@ func (s *scanSuite) TestScanHappy(c *C) {
 	pattern := "/{,usr/}lib{,32,64,x32}/{,@{multiarch}/{,atomics/}}ld{-*,64}.so*"
 
 	expectedTokens := []patterns.Token{
-		patterns.Token{Type: patterns.TokText, Text: "/"},
-		patterns.Token{Type: patterns.TokBraceOpen, Text: "{"},
-		patterns.Token{Type: patterns.TokComma, Text: ","},
-		patterns.Token{Type: patterns.TokText, Text: "usr/"},
-		patterns.Token{Type: patterns.TokBraceClose, Text: "}"},
-		patterns.Token{Type: patterns.TokText, Text: "lib"},
-		patterns.Token{Type: patterns.TokBraceOpen, Text: "{"},
-		patterns.Token{Type: patterns.TokComma, Text: ","},
-		patterns.Token{Type: patterns.TokText, Text: "32"},
-		patterns.Token{Type: patterns.TokComma, Text: ","},
-		patterns.Token{Type: patterns.TokText, Text: "64"},
-		patterns.Token{Type: patterns.TokComma, Text: ","},
-		patterns.Token{Type: patterns.TokText, Text: "x32"},
-		patterns.Token{Type: patterns.TokBraceClose, Text: "}"},
-		patterns.Token{Type: patterns.TokText, Text: "/"},
-		patterns.Token{Type: patterns.TokBraceOpen, Text: "{"},
-		patterns.Token{Type: patterns.TokComma, Text: ","},
-		patterns.Token{Type: patterns.TokText, Text: "@"},
-		patterns.Token{Type: patterns.TokBraceOpen, Text: "{"},
-		patterns.Token{Type: patterns.TokText, Text: "multiarch"},
-		patterns.Token{Type: patterns.TokBraceClose, Text: "}"},
-		patterns.Token{Type: patterns.TokText, Text: "/"},
-		patterns.Token{Type: patterns.TokBraceOpen, Text: "{"},
-		patterns.Token{Type: patterns.TokComma, Text: ","},
-		patterns.Token{Type: patterns.TokText, Text: "atomics/"},
-		patterns.Token{Type: patterns.TokBraceClose, Text: "}"},
-		patterns.Token{Type: patterns.TokBraceClose, Text: "}"},
-		patterns.Token{Type: patterns.TokText, Text: "ld"},
-		patterns.Token{Type: patterns.TokBraceOpen, Text: "{"},
-		patterns.Token{Type: patterns.TokText, Text: "-*"},
-		patterns.Token{Type: patterns.TokComma, Text: ","},
-		patterns.Token{Type: patterns.TokText, Text: "64"},
-		patterns.Token{Type: patterns.TokBraceClose, Text: "}"},
-		patterns.Token{Type: patterns.TokText, Text: ".so*"},
+		{Type: patterns.TokText, Text: "/"},
+		{Type: patterns.TokBraceOpen, Text: "{"},
+		{Type: patterns.TokComma, Text: ","},
+		{Type: patterns.TokText, Text: "usr/"},
+		{Type: patterns.TokBraceClose, Text: "}"},
+		{Type: patterns.TokText, Text: "lib"},
+		{Type: patterns.TokBraceOpen, Text: "{"},
+		{Type: patterns.TokComma, Text: ","},
+		{Type: patterns.TokText, Text: "32"},
+		{Type: patterns.TokComma, Text: ","},
+		{Type: patterns.TokText, Text: "64"},
+		{Type: patterns.TokComma, Text: ","},
+		{Type: patterns.TokText, Text: "x32"},
+		{Type: patterns.TokBraceClose, Text: "}"},
+		{Type: patterns.TokText, Text: "/"},
+		{Type: patterns.TokBraceOpen, Text: "{"},
+		{Type: patterns.TokComma, Text: ","},
+		{Type: patterns.TokText, Text: "@"},
+		{Type: patterns.TokBraceOpen, Text: "{"},
+		{Type: patterns.TokText, Text: "multiarch"},
+		{Type: patterns.TokBraceClose, Text: "}"},
+		{Type: patterns.TokText, Text: "/"},
+		{Type: patterns.TokBraceOpen, Text: "{"},
+		{Type: patterns.TokComma, Text: ","},
+		{Type: patterns.TokText, Text: "atomics/"},
+		{Type: patterns.TokBraceClose, Text: "}"},
+		{Type: patterns.TokBraceClose, Text: "}"},
+		{Type: patterns.TokText, Text: "ld"},
+		{Type: patterns.TokBraceOpen, Text: "{"},
+		{Type: patterns.TokText, Text: "-*"},
+		{Type: patterns.TokComma, Text: ","},
+		{Type: patterns.TokText, Text: "64"},
+		{Type: patterns.TokBraceClose, Text: "}"},
+		{Type: patterns.TokText, Text: ".so*"},
 	}
 
 	tokens, err := patterns.Scan(pattern)
@@ -75,7 +75,7 @@ func (s *scanSuite) TestScanHappy(c *C) {
 
 	patternWithEscapedMetachars := `/foo\{a\,b\,c\}\[bar\]\\`
 	expectedTokens = []patterns.Token{
-		patterns.Token{Type: patterns.TokText, Text: patternWithEscapedMetachars},
+		{Type: patterns.TokText, Text: patternWithEscapedMetachars},
 	}
 	tokens, err = patterns.Scan(patternWithEscapedMetachars)
 	c.Check(err, IsNil)

diff --git a/interfaces/prompting/prompting_test.go b/interfaces/prompting/prompting_test.go
@@ -32,7 +32,7 @@ import (
 
 func Test(t *testing.T) { TestingT(t) }
 
-type promptingSuite struct {}
+type promptingSuite struct{}
 
 var _ = Suite(&promptingSuite{})