Fix completion with dashes (#4)

* Fix completion with dashes

If I write something like curl --he<tab> it currently crashes on this
string match line. This should solve this by telling the string command
that it won't be any switches after this `--`-mark.

* Handle dashes in string and commandline

As the input might be using dashes we need to use double dashes to tell
the command that there won't be any more options.

Author: terlar

functions/_pisces_append.fish

@@ -1,5 +1,5 @@
 function _pisces_append -a text -d "Inserts a pair of strings (left-right) and puts the cursor between them"
 
-    commandline --insert $text
-    and _pisces_jump -(string length $text)
+    commandline --insert -- $text
+    and _pisces_jump -(string length -- $text)
 end

functions/_pisces_backspace.fish

@@ -1,7 +1,7 @@
 function _pisces_backspace -d "Overrides backspace to handle empty pairs removal"
 
     for pair in $pisces_pairs
-        _pisces_remove (string split ',' $pair)
+        _pisces_remove (string split -- ',' $pair)
         and return 0
     end
 

functions/_pisces_bind_pair.fish

@@ -11,7 +11,7 @@ function _pisces_bind_pair -a left right -d "Creates bindings for the given pair
         bind $r "_pisces_skip $right; or _pisces_append $right"
     else # if $some_special_setting
 
-        bind $l "commandline -i $left; and _pisces_append $right"
+        bind $l "commandline -i -- $left; and _pisces_append $right"
         bind $r "_pisces_skip $right"
     end
 end

functions/_pisces_complete.fish

@@ -5,7 +5,7 @@ function _pisces_complete -d "Invokes complete with modification for vars before
     else
         set token (commandline -t)
         # checking that the current token ends on a $var + '"'
-        if [ (string match -r '\$.*"$' "$token") ]
+        if [ (string match -r '\$.*"$' -- "$token") ]
             commandline -f delete-char  # which is '"'
         end
         commandline -f complete

functions/_pisces_lookup.fish

@@ -9,6 +9,6 @@ function _pisces_lookup -a pos len -d "Returns the text at the given position re
     set input (commandline -b)
 
     # NOTE: it's important to quote $input, because it may have newlines
-    string sub --start (math "$cur + $pos + 1") --length $len "$input" ^/dev/null
+    string sub --start (math "$cur + $pos + 1") --length $len -- "$input" ^/dev/null
     or echo '' # if it's out of bounds (probably better to return cut part)
 end

functions/_pisces_skip.fish

@@ -1,12 +1,12 @@
 function _pisces_skip -a text -d "Skips given text if it's already under the cursor"
 
-    set length (string length $text)
+    set length (string length -- $text)
 
     if [ (_pisces_lookup 0 $length) = $text ]
         _pisces_jump $length
         return 0
     else
-        commandline -i $text
+        commandline -i -- $text
         return 1
     end
 end

key_bindings.fish

@@ -4,7 +4,7 @@ function key_bindings
     or set -U pisces_pairs '(,)' '[,]' '{,}' '","' "','"
 
     for pair in $pisces_pairs
-        _pisces_bind_pair (string split ',' $pair)
+        _pisces_bind_pair (string split -- ',' $pair)
     end
 
     # normal backspace, also known as \010 or ^H:

uninstall.fish

@@ -1,5 +1,5 @@
 for pair in $pisces_pairs
-    for c in (string split ',' $pair)
+    for c in (string split -- ',' $pair)
         bind -e $c
     end
 end