]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Fix failing commented out tests
authorhas2k1 <has2k1@gmail.com>
Tue, 13 Aug 2013 03:47:02 +0000 (22:47 -0500)
committerhas2k1 <has2k1@gmail.com>
Wed, 25 Sep 2013 09:19:48 +0000 (04:19 -0500)
Related commits
---------------
- #6e60ef0

Reason
------
The indent functions, in this case
      GetPythonPEPIndent()
can modify the cursor position. There is nothing wrong with that
consequence, vim takes it into account and restores the cursor
position (see References below). For the tests vim is not doing
the calling, so the cursor is not restored.

Solution
--------
Restore the cursor position after calling the indent function.

spec/indent/indent_spec.rb

index 40269fc6543ea5c0387ebb9806e7a334b5f652ff..932a09153631d7fa5f401d1d06d4267c02ef4ffd 100644 (file)
@@ -30,22 +30,22 @@ describe "vim" do
     end
   end
 
     end
   end
 
-  describe "when after a '(' that is at the end of its line" do
-    before { vim.feedkeys 'itest(\<CR>' }
-
-    it "indents by one level" do
-      proposed_indent.should == shiftwidth
-      vim.feedkeys 'something'
-      indent.should == shiftwidth
-      vim.normal '=='
-      indent.should == shiftwidth
-    end
-
-    it "puts the closing parenthesis at the same level" do
-      vim.feedkeys ')'
-      indent.should == 0
-    end
-  end
+  describe "when after a '(' that is at the end of its line" do
+    before { vim.feedkeys 'itest(\<CR>' }
+
+    it "indents by one level" do
+      proposed_indent.should == shiftwidth
+      vim.feedkeys 'something'
+      indent.should == shiftwidth
+      vim.normal '=='
+      indent.should == shiftwidth
+    end
+
+    it "puts the closing parenthesis at the same level" do
+      vim.feedkeys ')'
+      indent.should == 0
+    end
+  end
 
   describe "when after an '(' that is followed by something" do
     before { vim.feedkeys 'itest(something,\<CR>' }
 
   describe "when after an '(' that is followed by something" do
     before { vim.feedkeys 'itest(something,\<CR>' }
@@ -101,7 +101,11 @@ describe "vim" do
     vim.echo("indent('.')").to_i
   end
   def proposed_indent
     vim.echo("indent('.')").to_i
   end
   def proposed_indent
-    vim.echo("GetPythonPEPIndent(line('.'))").to_i
+    line = vim.echo("line('.')")
+    col = vim.echo("col('.')")
+    indent_value = vim.echo("GetPythonPEPIndent(line('.'))").to_i
+    vim.command("call cursor(#{line}, #{col})")
+    return indent_value
   end
 end
 
   end
 end