Merge pull request oh-my-fish#7 from jeizsm/master

simnalamburt · simnalamburt · commit 2c1569cd5523 · 2016-03-15T06:13:31.000+09:00
add description and completions
diff --git a/completions/a.fish b/completions/a.fish
@@ -0,0 +1 @@
+complete -c a -a "(__fasd_print_completions -a)" -f -A
diff --git a/completions/d.fish b/completions/d.fish
@@ -0,0 +1 @@
+complete -c d -a "(__fasd_print_completions -d)" -f -A
diff --git a/completions/f.fish b/completions/f.fish
@@ -0,0 +1 @@
+complete -c f -a "(__fasd_print_completions -f)" -f -A
diff --git a/completions/fasd.fish b/completions/fasd.fish
@@ -0,0 +1 @@
+complete -c fasd -a "(__fasd_print_completions)" -f -A
diff --git a/completions/fasd_cd.fish b/completions/fasd_cd.fish
@@ -0,0 +1 @@
+complete -c fasd_cd -a "(__fasd_print_completions -d)" -f -A
diff --git a/completions/s.fish b/completions/s.fish
@@ -0,0 +1 @@
+complete -c s -a "(__fasd_print_completions)" -f -A
diff --git a/completions/sd.fish b/completions/sd.fish
@@ -0,0 +1 @@
+complete -c sd -a "(__fasd_print_completions -d)" -f -A
diff --git a/completions/sf.fish b/completions/sf.fish
@@ -0,0 +1 @@
+complete -c sf -a "(__fasd_print_completions -f)" -f -A
diff --git a/completions/z.fish b/completions/z.fish
@@ -0,0 +1 @@
+complete -c z -a "(__fasd_print_completions -d)" -f -A
diff --git a/completions/zz.fish b/completions/zz.fish
@@ -0,0 +1 @@
+complete -c zz -a "(__fasd_print_completions -d)" -f -A
diff --git a/functions/__fasd_print_completions.fish b/functions/__fasd_print_completions.fish
@@ -0,0 +1,4 @@
+function __fasd_print_completions
+  set cmd (commandline -po)
+  fasd $argv $cmd[2..-1] -l
+end
diff --git a/functions/a.fish b/functions/a.fish
@@ -1,3 +1,3 @@
-function a
+function a -d "any"
   command fasd -a $argv
-end
+end
diff --git a/functions/d.fish b/functions/d.fish
@@ -1,3 +1,3 @@
-function d
+function d -d "directory"
   command fasd -d $argv
-end
+end
diff --git a/functions/f.fish b/functions/f.fish
@@ -1,3 +1,3 @@
-function f
+function f -d "file"
   command fasd -f $argv
-end
+end
diff --git a/functions/s.fish b/functions/s.fish
@@ -1,3 +1,3 @@
-function s
+function s -d "show / search / select"
   command fasd -si $argv
-end
+end
diff --git a/functions/sd.fish b/functions/sd.fish
@@ -1,3 +1,3 @@
-function sd
+function sd -d "interactive directory selection"
   command fasd -sid $argv
-end
+end
diff --git a/functions/sf.fish b/functions/sf.fish
@@ -1,3 +1,3 @@
-function sf
+function sf -d "interactive file selection"
   command fasd -sif $argv
-end
+end
diff --git a/functions/z.fish b/functions/z.fish
@@ -1,3 +1,3 @@
-function z
+function z -d "cd, same functionality as j in autojump"
   fasd_cd -d $argv
-end
+end
diff --git a/functions/zz.fish b/functions/zz.fish
@@ -1,3 +1,3 @@
-function zz
+function zz -d "cd with interactive selection"
   fasd_cd -di $argv
-end
+end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+complete -c a -a "(__fasd_print_completions -a)" -f -A`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+complete -c d -a "(__fasd_print_completions -d)" -f -A`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+complete -c f -a "(__fasd_print_completions -f)" -f -A`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+complete -c fasd -a "(__fasd_print_completions)" -f -A`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+complete -c fasd_cd -a "(__fasd_print_completions -d)" -f -A`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+complete -c s -a "(__fasd_print_completions)" -f -A`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+complete -c sd -a "(__fasd_print_completions -d)" -f -A`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+complete -c sf -a "(__fasd_print_completions -f)" -f -A`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+complete -c z -a "(__fasd_print_completions -d)" -f -A`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+complete -c zz -a "(__fasd_print_completions -d)" -f -A`