Fix context completion for workspaces that are not git.

Fixes #98

Author: ericdallo

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Improve anthropic extraPayload requirement when adding models.
 - Add message to when config failed to be parsed.
+- Fix context completion for workspaces that are not git. #98
 
 ## 0.40.0
 

src/eca/features/index.clj

@@ -12,11 +12,10 @@
 
 (defn ^:private git-ls-files* [root-path]
   (try
-    (some-> (shell/sh "git" "ls-files" "--others" "--exclude-standard" "--cached"
-                      :dir root-path)
-            :out
-            (string/split #"\n"))
-
+    (let [{:keys [out exit]} (shell/sh "git" "ls-files" "--others" "--exclude-standard" "--cached"
+                                       :dir root-path)]
+      (when (= 0 exit)
+        (string/split out #"\n")))
     (catch Exception _ nil)))
 
 (def ^:private git-ls-files (memoize/ttl git-ls-files* :ttl/threshold ttl-git-ls-files-ms))
@@ -25,14 +24,16 @@
   (reduce
    (fn [files {:keys [type]}]
      (case type
-       :gitignore (let [git-files (some->> (git-ls-files root-filename)
-                                           (mapv (comp str fs/canonicalize #(fs/file root-filename %)))
-                                           set)]
-                    (if (seq git-files)
-                      (filter (fn [file]
-                                (contains? git-files (str file)))
-                              files)
-                      files))
+       :gitignore (if-let [git-files (git-ls-files root-filename)]
+                    (let [git-paths (some->> git-files
+                                             (mapv (comp str fs/canonicalize #(fs/file root-filename %)))
+                                             set)]
+                      (if (seq git-paths)
+                        (filter (fn [file]
+                                  (contains? git-paths (str file)))
+                                files)
+                        files))
+                    files)
        files))
    file-paths
    (get-in config [:index :ignoreFiles])))

test/eca/features/index_test.clj

@@ -18,18 +18,20 @@
           file1 (fs/path root "ignored.txt")
           file2 (fs/path root "not-ignored.txt")]
       (testing "returns filtered files when `git ls-files` works"
-        (with-redefs [shell/sh (fn [& _args] {:exit 0 :out "not-ignored.txt"})
+        (with-redefs [f.index/git-ls-files #'f.index/git-ls-files*
+                      shell/sh (constantly {:exit 0 :out "not-ignored.txt"})
                       fs/canonicalize #(fs/path root %)]
           (is
            (match?
             [file2]
             (f.index/filter-allowed [file1 file2] root gitignore-config)))))
 
       (testing "returns all files when `git ls-files` exits non-zero"
-        (with-redefs [shell/sh (fn [& _args] {:exit 1})]
+        (with-redefs [f.index/git-ls-files #'f.index/git-ls-files*
+                      shell/sh (constantly {:exit 1})]
           (is
            (match?
-            [file2]
+            [file1 file2]
             (f.index/filter-allowed [file1 file2] root gitignore-config))))))))
 
 (deftest repo-map-test
@@ -50,7 +52,7 @@
                         "  baz.clj"
                         " foo.clj"
                         "")
-             (eca.features.index/repo-map {:workspace-folders [{:uri (h/file-uri "file:///fake/repo")}]} 
+             (eca.features.index/repo-map {:workspace-folders [{:uri (h/file-uri "file:///fake/repo")}]}
                                           {:index {:repoMap {:maxEntriesPerDir 50 :maxTotalEntries 800}}}
                                           {:as-string? true}))))))
 
@@ -65,9 +67,9 @@
                                                     "src/f.clj"
                                                     "src/g.clj"
                                                     "src/h.clj"])]
-      (let [out (eca.features.index/repo-map {:workspace-folders [{:uri (h/file-uri "file:///fake/repo")}]} 
+      (let [out (eca.features.index/repo-map {:workspace-folders [{:uri (h/file-uri "file:///fake/repo")}]}
                                              {:index {:repoMap {:maxTotalEntries 800
-                                                                 :maxEntriesPerDir 3}}}
+                                                                :maxEntriesPerDir 3}}}
                                              {:as-string? true})]
         (is (string/includes? out (str (h/file-path "/fake/repo") "\n")))
         ;; Under src, only first 3 children (sorted) and a per-dir truncated line should appear
@@ -84,9 +86,9 @@
                                                     "LICENSE"
                                                     "src/a.clj"
                                                     "src/b.clj"])]
-      (let [out (eca.features.index/repo-map {:workspace-folders [{:uri (h/file-uri "file:///fake/repo")}]} 
+      (let [out (eca.features.index/repo-map {:workspace-folders [{:uri (h/file-uri "file:///fake/repo")}]}
                                              {:index {:repoMap {:maxTotalEntries 3
-                                                                 :maxEntriesPerDir 800}}}
+                                                                :maxEntriesPerDir 800}}}
                                              {:as-string? true})]
         ;; Contains a global truncated line
         (is (string/includes? out "\n... truncated output ("))))))