status-im/nim-confutils
2
0
Fork 0
mirror of https://github.com/status-im/nim-confutils.git synced 2025-02-04 00:04:06 +00:00
Code Issues Projects Releases Wiki Activity

More directory completion

Browse Source
This commit is contained in:
LemonBoy 2019-07-04 14:25:15 +02:00 committed by zah
parent 27e7831567
commit a34a29277d
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
confutils.nim
View File

@ -257,7 +257,7 @@ proc completeCmdArg(T: type bool, val: TaintedString): seq[string] =
proc completeCmdArg(T: type string, val: TaintedString): seq[string] =
return @[]
proc completeCmdArg*(T: type[InputFile|InputDir], val: TaintedString): seq[string] =
proc completeCmdArg*(T: type[InputFile|InputDir|OutFile|OutDir|OutPath], val: TaintedString): seq[string] =
let (dir, name, ext) = splitFile(val)
let tail = name & ext
# Expand the directory component for the directory walker routine
@ -272,22 +272,18 @@ proc completeCmdArg*(T: type[InputFile|InputDir], val: TaintedString): seq[strin
# Do not show files if asked for directories, on the other hand we must show
# directories even if a file is requested to allow the user to select a file
# inside those
if type(T) is InputDir and kind notin {pcDir, pcLinkToDir}:
if type(T) is InputDir|OutDir and kind notin {pcDir, pcLinkToDir}:
continue
# Note, no normalization is needed here
if path.startsWith(tail):
let match = if kind in {pcDir, pcLinkToDir}:
# Add a trailing slash so that completions can be chained
dir_path & DirSep & path & DirSep
else:
dir_path & DirSep & path
var match = dir_path / path
# Add a trailing slash so that completions can be chained
if kind in {pcDir, pcLinkToDir}:
match &= DirSep
result.add(shellPathEscape(match))
proc completeCmdArg*(T: type[OutFile|OutDir|OutPath], val: TaintedString): seq[string] =
return @[]
proc completeCmdArg[T](_: type seq[T], val: TaintedString): seq[string] =
return @[]