Remove timeout from read-form, it broke for some

Olical · Aug 6, 2019 · 6cd17b7 · 6cd17b7
1 parent d4ef380
commit 6cd17b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/conjure/nvim.clj b/src/conjure/nvim.clj
@@ -72,14 +72,11 @@
          ;; Ignore matches inside comments or strings.
          ;; We only have to do this for non-root form reading.
          ;;  https://github.com/Olical/conjure/issues/34
-         skip (if root?
-                0
+         skip (when-not root?
                 "!conjure#cursor_in_code()")
-         stopline 0
-         timeout 50
 
          get-pair (fn [s e]
-                    (let [extra-args [skip stopline timeout]]
+                    (let [extra-args (remove nil? [skip])]
                       [(apply api/call-function :searchpairpos s "" e backwards extra-args)
                        (apply api/call-function :searchpairpos s "" e forwards extra-args)]))
 

diff --git a/test/conjure/nvim_test.clj b/test/conjure/nvim_test.clj
@@ -98,7 +98,7 @@
     (t/testing "a skip is provided to non-root form reads"
       ;; Non-root has skip.
       (defmethod call :nvim-call-function [{:keys [params]}]
-        (t/is (= (count (second params)) 7))
+        (t/is (= (count (second params)) 5))
         (pair-pos params
                   {"(" [2 16]
                    ")" [2 30]}))
@@ -110,7 +110,7 @@
 
       ;; Root does not.
       (defmethod call :nvim-call-function [{:keys [params]}]
-        (t/is (= (count (second params)) 7))
+        (t/is (= (count (second params)) 4))
         (pair-pos params
                   {"(" [2 16]
                    ")" [2 30]}))