diff options
author | Jakob Odersky <jakob@odersky.com> | 2018-04-29 17:59:47 -0700 |
---|---|---|
committer | Jakob Odersky <jakob@odersky.com> | 2018-04-29 17:59:47 -0700 |
commit | eef44a276ace54ef0b215c1c4b045afde40daf5b (patch) | |
tree | 83bc5aa811492ee8cb8ad6ec05258904d9a3d49d /src/main/scala/completion/Bash.scala | |
parent | 4562b1b5754f4b840016be345eb6ee92f5abf258 (diff) | |
download | commando-eef44a276ace54ef0b215c1c4b045afde40daf5b.tar.gz commando-eef44a276ace54ef0b215c1c4b045afde40daf5b.tar.bz2 commando-eef44a276ace54ef0b215c1c4b045afde40daf5b.zip |
Specify action inline with command
Diffstat (limited to 'src/main/scala/completion/Bash.scala')
-rw-r--r-- | src/main/scala/completion/Bash.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/scala/completion/Bash.scala b/src/main/scala/completion/Bash.scala index e049fe1..db7b40a 100644 --- a/src/main/scala/completion/Bash.scala +++ b/src/main/scala/completion/Bash.scala @@ -8,9 +8,9 @@ object Bash { } private def addFlags(command: Command): String = { - command.options.map { opt => + command.optionals.map { opt => val extra = if (opt.argumentRequired) "=" else "" - val short = opt.short.map(c => s"""flags+=("-${c}")""").getOrElse("") + val short = opt.short.map(c => s"""flags+=("-$c")""").getOrElse("") s"""|flags+=("--${opt.long}$extra") |$short |""".stripMargin @@ -37,7 +37,7 @@ object Bash { } } - def completion(command: Command) = { + def completion(command: Command): String = { val name = command.name s"""__${name}_contains_word() { @@ -89,7 +89,7 @@ object Bash { | local c=0 | COMPREPLY=() | - | local last_command="_${name}" + | local last_command="_$name" | local commands=() | local flags=() | @@ -100,7 +100,7 @@ object Bash { | | return 0 |} - |complete -o default -F __${name}_start ${name} + |complete -o default -F __${name}_start $name |""".stripMargin } |