Merge pull request #855 from rsteube/lexer-quote-workaround

lexer: quote workaround
carapace-sh · Jul 29, 2023 · 7e7513c · 7e7513c
2 parents f39db97 + 99682eb
commit 7e7513c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/internal/lexer/lexer.go b/internal/lexer/lexer.go
@@ -23,15 +23,19 @@ type Tokenset struct {
 func Split(s string, pipelines bool) (*Tokenset, error) {
 	tokenset, err := split(s, pipelines)
 	if err != nil && err.Error() == "EOF found when expecting closing quote" {
-		tokenset, err = split(s+`"`, pipelines)
+		tokenset, err = split(s+`_"`, pipelines)
 		if err == nil {
 			tokenset.State = OPEN_DOUBLE
+			last := tokenset.Tokens[len(tokenset.Tokens)-1]
+			tokenset.Tokens[len(tokenset.Tokens)-1] = last[:len(last)-1]
 		}
 	}
 	if err != nil && err.Error() == "EOF found when expecting closing quote" {
-		tokenset, err = split(s+`'`, pipelines)
+		tokenset, err = split(s+`_'`, pipelines)
 		if err == nil {
 			tokenset.State = OPEN_SINGLE
+			last := tokenset.Tokens[len(tokenset.Tokens)-1]
+			tokenset.Tokens[len(tokenset.Tokens)-1] = last[:len(last)-1]
 		}
 	}
 	return tokenset, err

diff --git a/internal/lexer/lexer_test.go b/internal/lexer/lexer_test.go
@@ -150,7 +150,6 @@ func TestSplit(t *testing.T) {
 		State:  OPEN_DOUBLE,
 	})
 
-	t.Skip("skipping test that don't work yet") // TODO these need to work
 	_test(`example "`, Tokenset{
 		Tokens: []string{"example", ""},
 		Prefix: `example `,