tmp

action.go

@@ -11,7 +11,6 @@ import (
 	shlex "github.com/rsteube/carapace-shlex"
 	"github.com/rsteube/carapace/internal/cache"
 	"github.com/rsteube/carapace/internal/common"
-	"github.com/rsteube/carapace/internal/lexer"
 	pkgcache "github.com/rsteube/carapace/pkg/cache"
 	"github.com/rsteube/carapace/pkg/style"
 	pkgtraverse "github.com/rsteube/carapace/pkg/traverse"
@@ -277,11 +276,15 @@ func (a Action) SplitP() Action {
 
 func (a Action) split(pipelines bool) Action {
 	return ActionCallback(func(c Context) Action {
-		tokens, err := lexer.Split(c.Value, pipelines)
+		tokens, err := shlex.Split(c.Value)
 		if err != nil {
 			return ActionMessage(err.Error())
 		}
 
+		if pipelines {
+			tokens = tokens.CurrentPipeline()
+		}
+
 		context := NewContext(tokens.Strings()...)
 		current := tokens.CurrentToken()
 		prefix := c.Value[:current.Index]

internal/shell/nushell/patch.go

@@ -1,24 +1,30 @@
 package nushell
 
+import (
+	"strings"
+
+	"github.com/rsteube/carapace-shlex"
+)
+
 // Patch uses the lexer to parse and patch given arguments which
 // are currently passed unprocessed to the completion function.
 //
 // see https://www.nushell.sh/book/working_with_strings.html
 func Patch(args []string) []string {
 	// TODO
-	// for index, arg := range args {
-	// 	if len(arg) == 0 {
-	// 		continue
-	// 	}
+	for index, arg := range args {
+		if len(arg) == 0 {
+			continue
+		}
 
-	// switch arg[0] {
-	// case '"', "'"[0]:
-	// 	if tokenset, err := lexer.Split(arg, false); err == nil {
-	// 		args[index] = tokenset.Tokens[0]
-	// 	}
-	// case '`':
-	// 	args[index] = strings.Trim(arg, "`")
-	// }
-	// }
+		switch arg[0] {
+		case '"', "'"[0]:
+			if tokens, err := shlex.Split(arg); err == nil {
+				args[index] = (*tokens)[0].Value
+			}
+		case '`':
+			args[index] = strings.Trim(arg, "`")
+		}
+	}
 	return args
 }