]> 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 issue #5 (Correct indent after end of block)
authorhas2k1 <has2k1@gmail.com>
Thu, 31 Oct 2013 10:17:16 +0000 (05:17 -0500)
committerhas2k1 <has2k1@gmail.com>
Thu, 31 Oct 2013 10:17:16 +0000 (05:17 -0500)
Problem
-------
Given two adjacent blocks where the 2nd block has
an equal or smaller indentation level compared to the 1st
block. If the blocks are not separated by an empty line,
the 2nd block will be placed (indented) inside the 1st
block.

This changes the meaning of code that already adheres to the
pep8 standard.

Solution
--------
Do not inherit indentation of the previous line if the current line
has less indentation but is valid.

indent/python.vim
spec/indent/indent_spec.rb

index 2c305471e766e9acceb98549845cec4c71fc31a8..c632c7bebf7eeb8d1925b51c7d03835b82c99d76 100644 (file)
@@ -191,6 +191,13 @@ function! GetPythonPEPIndent(lnum)
         return -1
     endif
 
         return -1
     endif
 
+    " If this line is dedented and the number of indent spaces is valid
+    " (multiple of the indentation size), trust the user
+    let dedent_size = thisindent - indent(plnum)
+    if dedent_size < 0 && thisindent % &sw == 0
+        return -1
+    endif
+
     " In all other cases, line up with the start of the previous statement.
     return indent(sslnum)
 endfunction
     " In all other cases, line up with the start of the previous statement.
     return indent(sslnum)
 endfunction
index 932a09153631d7fa5f401d1d06d4267c02ef4ffd..38ce1920b8271b5036419a3c503210cd4ab0509b 100644 (file)
@@ -91,6 +91,24 @@ describe "vim" do
     end
   end
 
     end
   end
 
+  describe "when current line is dedented compared to previous line" do
+     before { vim.feedkeys 'i\<TAB>\<TAB>if x:\<CR>return True\<CR>\<ESC>' }
+     it "and current line has a valid indentation (Part 1)" do
+        vim.feedkeys '0i\<TAB>if y:'
+        proposed_indent.should == -1
+     end
+
+     it "and current line has a valid indentation (Part 2)" do
+        vim.feedkeys '0i\<TAB>\<TAB>if y:'
+        proposed_indent.should == -1
+     end
+
+     it "and current line has an invalid indentation" do
+        vim.feedkeys 'i    while True:\<CR>'
+        indent.should == previous_indent + shiftwidth
+     end
+  end
+
   def shiftwidth
     @shiftwidth ||= vim.echo("exists('*shiftwidth') ? shiftwidth() : &sw").to_i
   end
   def shiftwidth
     @shiftwidth ||= vim.echo("exists('*shiftwidth') ? shiftwidth() : &sw").to_i
   end
@@ -100,6 +118,10 @@ describe "vim" do
   def indent
     vim.echo("indent('.')").to_i
   end
   def indent
     vim.echo("indent('.')").to_i
   end
+  def previous_indent
+    pline = vim.echo("line('.')").to_i - 1
+    vim.echo("indent('#{pline}')").to_i
+  end
   def proposed_indent
     line = vim.echo("line('.')")
     col = vim.echo("col('.')")
   def proposed_indent
     line = vim.echo("line('.')")
     col = vim.echo("col('.')")