Merge pull request #898 from rsteube/update-shlex

updated shlex
carapace-sh · Aug 11, 2023 · 5f2f63e · 5f2f63e
2 parents ad4983c + b5a542b
commit 5f2f63e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 27 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/rsteube/carapace
 go 1.15
 
 require (
-	github.com/rsteube/carapace-shlex v0.0.3
+	github.com/rsteube/carapace-shlex v0.0.4
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	gopkg.in/yaml.v3 v3.0.1

diff --git a/go.sum b/go.sum
@@ -1,8 +1,8 @@
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/rsteube/carapace-shlex v0.0.3 h1:QzcD31o9L4EK0ga9AxUU1QrfvfYb9TCdgOYUhpIstpQ=
-github.com/rsteube/carapace-shlex v0.0.3/go.mod h1:zPw1dOFwvLPKStUy9g2BYKanI6bsQMATzDMYQQybo3o=
+github.com/rsteube/carapace-shlex v0.0.4 h1:3GVn8PaM2RCxPTAiwVy9vDQI8Mi7DqrbdpDgf5ZzQmY=
+github.com/rsteube/carapace-shlex v0.0.4/go.mod h1:zPw1dOFwvLPKStUy9g2BYKanI6bsQMATzDMYQQybo3o=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
 github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=

diff --git a/go.work.sum b/go.work.sum
@@ -7,6 +7,6 @@ github.com/rsteube/carapace-pflag v0.1.0 h1:CPJRlj3jbyOnxuMf5pdrM76hEwdQ0STDDmkA
 github.com/rsteube/carapace-pflag v0.1.0/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/rsteube/carapace-shlex v0.0.1 h1:8uvsc+ISKw7uoITSp92nNisFUOulYMz+Uu7N5nbHTiM=
 github.com/rsteube/carapace-shlex v0.0.1/go.mod h1:zPw1dOFwvLPKStUy9g2BYKanI6bsQMATzDMYQQybo3o=
-github.com/rsteube/carapace-shlex v0.0.3 h1:QzcD31o9L4EK0ga9AxUU1QrfvfYb9TCdgOYUhpIstpQ=
-github.com/rsteube/carapace-shlex v0.0.3/go.mod h1:zPw1dOFwvLPKStUy9g2BYKanI6bsQMATzDMYQQybo3o=
+github.com/rsteube/carapace-shlex v0.0.4 h1:3GVn8PaM2RCxPTAiwVy9vDQI8Mi7DqrbdpDgf5ZzQmY=
+github.com/rsteube/carapace-shlex v0.0.4/go.mod h1:zPw1dOFwvLPKStUy9g2BYKanI6bsQMATzDMYQQybo3o=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
diff --git a/internal/shell/bash/patch.go b/internal/shell/bash/patch.go
@@ -47,7 +47,7 @@ func Patch(args []string) ([]string, error) { // TODO document and fix wordbreak
 	args = append(args[:1], tokens.CurrentPipeline().FilterRedirects().Words().Strings()...)
 
 	// TODO find a better solution to pass the wordbreakprefix to bash/action.go
-	wordbreakPrefix = getWordbreakPrefix(tokens.CurrentPipeline())
+	wordbreakPrefix = tokens.CurrentPipeline().WordbreakPrefix()
 	unsetBashCompEnv()
 
 	return args, nil
@@ -67,24 +67,3 @@ func unsetBashCompEnv() {
 		os.Unsetenv(key)
 	}
 }
-
-// TODO move to carapace-shlex
-func getWordbreakPrefix(tokens shlex.TokenSlice) string {
-	found := false
-	prefix := ""
-	for i := len(tokens) - 2; i >= 0; i-- {
-		token := tokens[i]
-		if token.Index+len(token.RawValue) != tokens[i+1].Index { // TODO use adjoins
-			break
-		}
-
-		if token.Type == shlex.WORDBREAK_TOKEN {
-			found = true
-		}
-
-		if found {
-			prefix = token.Value + prefix
-		}
-	}
-	return prefix
-}