Avoid unwanted behavior with text objects that cannot be nested. Fix #19

gcmt · Apr 27, 2014 · 1f58950 · 1f58950
1 parent 34a3930
commit 1f58950
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/autoload/wildfire.vim b/autoload/wildfire.vim
@@ -32,6 +32,8 @@ endfor
 " Internal variables
 " =============================================================================
 
+let s:cannot_be_nested = {"iw" : 1, "aw" : 1, "iW" : 1, "aW": 1}
+
 let s:objects = [
     \ "(", ")", "{", "}","[", "]", "<", ">", "b", "B",
     \ "'", '"', "`", "t", "w", "W", "p", "s"]
@@ -101,6 +103,11 @@ fu! wildfire#_fuel()
 
         cal winrestview(winview)
 
+        " Some text object cannot be nested. This avoids unwanted behavior.
+        if get(s:cannot_be_nested, to.object) && to.count > 1
+            continue
+        endif
+
         " The selection failed with the candidate text object
         if to.startline == to.endline && to.startcol == to.endcol
             continue