Completing .. behaves more like Bash (closes #277).

mridgers · Feb 16, 2015 · d5eff6d · d5eff6d
1 parent 7df7a20
commit d5eff6d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/clink/dll/dir.lua b/clink/dll/dir.lua
@@ -29,14 +29,19 @@ function dir_match_generator_impl(text)
         prefix = text:sub(1, i)
     end
 
+    local include_dots = text:find("%.+$") ~= nil
+
     local matches = {}
     local mask = text.."*"
 
     -- Find matches.
     for _, dir in ipairs(clink.find_dirs(mask, true)) do
         local file = prefix..dir
-        if clink.is_match(text, file) then
-            table.insert(matches, prefix..dir)
+
+        if include_dots or (dir ~= "." and dir ~= "..") then
+            if clink.is_match(text, file) then
+                table.insert(matches, prefix..dir)
+            end
         end
     end
 

diff --git a/readline/compat/dirent.c b/readline/compat/dirent.c
@@ -205,14 +205,6 @@ struct dirent *readdir(DIR *dir)
                 continue;
             }
 
-            // Skip . and ..
-            if (wcscmp(dir->info.name, L".") == 0 ||
-                wcscmp(dir->info.name, L"..") == 0)
-            {
-                dir->result.d_name = "";
-                continue;
-            }
-
             WideCharToMultiByte(
                 CP_UTF8,
                 0,