X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/c2943343107ebccca374d2ae6d7c99dd0589faa5..5a4cf72a849deb6364f67ad1cc205e98ff7e6d7d:/spec/indent/indent_spec.rb

diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb
index d369c3e..400ec11 100644
--- a/spec/indent/indent_spec.rb
+++ b/spec/indent/indent_spec.rb
@@ -130,7 +130,7 @@ shared_examples_for "vim" do
       vim.echo('synIDattr(synID(line("."), col("."), 0), "name")'
               ).downcase.should include 'string'
       vim.feedkeys 'a\<CR>'
-      proposed_indent.should == 0
+      proposed_indent.should == -1
       indent.should == 0
     end
 
@@ -251,6 +251,11 @@ shared_examples_for "vim" do
       indent.should == 0
     end
 
+    it "handles nested expressions (Flake8's E127)" do
+      vim.feedkeys 'i[\<CR>x for x in foo\<CR>if (\<CR>'
+      indent.should == shiftwidth * 2
+    end
+
     it "still handles multiple parens correctly" do
       vim.feedkeys 'iif (111 and (222 and 333\<CR>'
       indent.should == 13
@@ -396,10 +401,22 @@ shared_examples_for "vim" do
   end
 
   describe "when an else is used inside of a nested if" do
-    before { vim.feedkeys 'iif foo:\<CR>\<TAB>if bar:\<CR>\<TAB>\<TAB>pass\<CR>' }
-    it "indents an else to the inner if" do
+    before { vim.feedkeys 'iif foo:\<CR>if bar:\<CR>pass\<CR>' }
+    it "indents the else to the inner if" do
       vim.feedkeys 'else:'
-      indent.should == shiftwidth * 2
+      indent.should == shiftwidth
+    end
+  end
+
+  describe "when an else is used outside of a nested if" do
+    before { vim.feedkeys 'iif True:\<CR>if True:\<CR>pass\<CR>\<Esc>0' }
+    it "indents the else to the outer if" do
+      indent.should == 0
+      proposed_indent.should == shiftwidth
+
+      vim.feedkeys 'ielse:'
+      indent.should == 0
+      proposed_indent.should == 0
     end
   end
 
@@ -459,7 +476,7 @@ shared_examples_for "multiline strings" do
     end
   end
 
-  describe "when after assigning an unfinished string" do
+  describe "when after assigning an indented unfinished string" do
     before { vim.feedkeys 'i    test = """' }
 
     it "it indents the next line" do
@@ -470,7 +487,7 @@ shared_examples_for "multiline strings" do
     end
   end
 
-  describe "when after assigning a finished string" do
+  describe "when after assigning an indented finished string" do
     before { vim.feedkeys 'i    test = ""' }
 
     it "it does indent the next line" do
@@ -503,12 +520,30 @@ shared_examples_for "multiline strings" do
   end
 
   describe "when breaking a string after opening parenthesis" do
-    before { vim.feedkeys 'i    foo("""bar<Left><Left><Left>' }
+    before { vim.feedkeys 'i    foo("""bar\<Left>\<Left>\<Left>' }
     it "it does indent the next line as after an opening multistring" do
       vim.feedkeys '\<CR>'
-      expected_proposed, expected_indent = multiline_indent(4, 4 + shiftwidth)
+      _, expected_indent = multiline_indent(4, 4 + shiftwidth)
       indent.should == expected_indent
-      proposed_indent.should == expected_proposed
+      proposed_indent.should == -1
+
+      # it keeps the indent after an empty line
+      vim.feedkeys '\<CR>'
+      proposed_indent, expected_indent = multiline_indent(4, 4 + shiftwidth)
+      indent.should == expected_indent
+      proposed_indent.should == proposed_indent
+
+      # it keeps the indent of nonblank above
+      vim.feedkeys '\<End>\<CR>'
+      proposed_indent, expected_indent = multiline_indent(4, 4 + shiftwidth)
+      indent.should == expected_indent
+      proposed_indent.should == proposed_indent
+
+      # it keeps the indent of nonblank above before an empty line
+      vim.feedkeys '\<CR>'
+      proposed_indent, expected_indent = multiline_indent(4, 4 + shiftwidth)
+      indent.should == expected_indent
+      proposed_indent.should == proposed_indent
     end
   end
 end