diff options
author | Frederic Riss <friss@apple.com> | 2018-08-31 23:03:28 +0000 |
---|---|---|
committer | Frederic Riss <friss@apple.com> | 2018-08-31 23:03:28 +0000 |
commit | 78a10a7a9bb2d56a10dabae58ebd488055b1d828 (patch) | |
tree | 7149568a565e38a44e046c84c983c8e2788fdabc /lldb/source/Commands/CommandCompletions.cpp | |
parent | a69696dca625cf9aed22988bd1c0d56a752221f6 (diff) | |
download | bcm5719-llvm-78a10a7a9bb2d56a10dabae58ebd488055b1d828.tar.gz bcm5719-llvm-78a10a7a9bb2d56a10dabae58ebd488055b1d828.zip |
File completion bugfix
If you tried to complete somwthing like ~/., lldb would come up with a lot
of non-existent filenames by concatenating every exisitng file in the directory
with an initial '.'.
This was due to a workaround for an llvm::fs::path::filename behavior that
was not applied selectively enough.
llvm-svn: 341268
Diffstat (limited to 'lldb/source/Commands/CommandCompletions.cpp')
-rw-r--r-- | lldb/source/Commands/CommandCompletions.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lldb/source/Commands/CommandCompletions.cpp b/lldb/source/Commands/CommandCompletions.cpp index 7b351c50dc6..fc3e8d0662d 100644 --- a/lldb/source/Commands/CommandCompletions.cpp +++ b/lldb/source/Commands/CommandCompletions.cpp @@ -166,7 +166,11 @@ static int DiskFilesOrDirectories(const llvm::Twine &partial_name, size_t FullPrefixLen = CompletionBuffer.size(); PartialItem = path::filename(CompletionBuffer); - if (PartialItem == ".") + + // path::filename() will return "." when the passed path ends with a + // directory separator. We have to filter those out, but only when the + // "." doesn't come from the completion request itself. + if (PartialItem == "." && path::is_separator(CompletionBuffer.back())) PartialItem = llvm::StringRef(); if (SearchDir.empty()) { |