Fix outer "elif" with inner "if" (#136)

[etc/vim.git] / spec / indent / indent_spec.rb

diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb
index aa796df2316a02fd34cd6c412086e6bda2bd784d..745e939d65894c48d01da9341c298c076cb17fe8 100644 (file)
--- a/spec/indent/indent_spec.rb
+++ b/spec/indent/indent_spec.rb
@@ -203,16 +203,31 @@ shared_examples_for "vim" do
   end
 
   describe "when using a function definition" do
   end
 
   describe "when using a function definition" do

-      it "indents shiftwidth spaces" do
+      it "handles indent with closing parenthesis on same line" do

           vim.feedkeys 'idef long_function_name(\<CR>arg'
           vim.feedkeys 'idef long_function_name(\<CR>arg'

+          indent.should == shiftwidth
+          vim.feedkeys '):'

           indent.should == shiftwidth * 2
       end
           indent.should == shiftwidth * 2
       end

+
+      it "handles indent with closing parenthesis on new line" do
+          vim.feedkeys 'idef long_function_name(\<CR>arg'
+          indent.should == shiftwidth
+          vim.feedkeys '\<CR>'
+          indent.should == shiftwidth
+          vim.feedkeys ')'
+          indent.should == (hang_closing ? shiftwidth * 2 : 0)
+          vim.feedkeys ':'
+          indent.should == (hang_closing ? shiftwidth * 2 : 0)
+          vim.feedkeys '\<Esc>k'
+          indent.should == shiftwidth
+      end

   end
 
   describe "when using a class definition" do
       it "indents shiftwidth spaces" do
           vim.feedkeys 'iclass Foo(\<CR>'
   end
 
   describe "when using a class definition" do
       it "indents shiftwidth spaces" do
           vim.feedkeys 'iclass Foo(\<CR>'

-          indent.should == shiftwidth * 2
+          indent.should == shiftwidth

       end
   end
 
       end
   end
 


@@ -430,7 +445,7 @@ shared_examples_for "vim" do
 
     it "ignores the call signature after a function" do
       vim.feedkeys 'idef f(  JEDI_CALL_SIGNATURE\<CR>'
 
     it "ignores the call signature after a function" do
       vim.feedkeys 'idef f(  JEDI_CALL_SIGNATURE\<CR>'

-      indent.should == shiftwidth * 2
+      indent.should == shiftwidth

     end
   end
 end
     end
   end
 end


@@ -502,12 +517,27 @@ shared_examples_for "multiline strings" do
   end
 
   describe "when after a docstring" do
   end
 
   describe "when after a docstring" do

-    before { vim.feedkeys 'i    """' }

     it "it does indent the next line to the docstring" do
     it "it does indent the next line to the docstring" do

-      vim.feedkeys '\<CR>'
+      vim.feedkeys 'i    """\<CR>'

       indent.should == 4
       proposed_indent.should == 4
     end
       indent.should == 4
       proposed_indent.should == 4
     end

+
+    it "indents the closing docstring quotes" do
+      vim.feedkeys 'i    """\<CR>\<CR>"""'
+      indent.should == 4
+      proposed_indent.should == 4
+      vim.echo('getline(3)').should == '    """'
+    end
+
+    it "indents non-matching docstring quotes" do
+      vim.feedkeys 'i    """\<CR>\<Esc>'
+      vim.feedkeys "0C'''"
+      vim.echo('line(".")').should == "4"
+      vim.echo('getline(".")').should == "'''"
+      indent.should == 0
+      proposed_indent.should == -1
+    end

   end
 
   describe "when after a docstring with contents" do
   end
 
   describe "when after a docstring with contents" do


@@ -687,7 +717,10 @@ describe "Compact multiline dict" do
 end
 
 describe "Using O" do
 end
 
 describe "Using O" do

-  before { vim.feedkeys 'iif foo:\<CR>' }
+  before {
+    vim.feedkeys '\<ESC>ggdG'
+    vim.feedkeys 'iif foo:\<CR>'
+  }

 
   it "respects autoindent" do
     vim.feedkeys '1\<CR>\<CR>'
 
   it "respects autoindent" do
     vim.feedkeys '1\<CR>\<CR>'


@@ -704,3 +737,60 @@ describe "Using O" do
     indent.should == 0
   end
 end
     indent.should == 0
   end
 end

+
+describe "searchpairpos" do
+  before { vim.feedkeys '\<ESC>ggdG' }
+  it "handles nested parenthesis" do
+    vim.feedkeys 'iif foo.startswith("("):\<CR>'
+    indent.should == shiftwidth
+  end
+end
+
+describe "o within TODO" do
+  before {
+    vim.feedkeys '\<ESC>ggdG'
+    vim.feedkeys 'iif 1:  # TODO\<Esc>'
+    # Assertion that we have a pythonTodo here.
+    vim.echo('synIDattr(synID(line("."), col("."), 0), "name")').should match 'pythonTodo'
+  }
+
+  it "respects autoindent" do
+    vim.feedkeys 'o'
+    indent.should == shiftwidth
+  end
+end
+
+describe "elif after else" do
+  before {
+    vim.feedkeys '\<ESC>ggdG'
+  }
+
+  it "is indented to the outer if" do
+    vim.feedkeys 'iif 1:\<CR>if 2:\<CR>pass\<CR>else:\<CR>pass\<CR>elif 3:\<Esc>'
+    indent.should == 0
+
+    vim.feedkeys '\<ESC>ggdG'
+    vim.feedkeys 'i    if 1:\<CR>if 2:\<CR>pass\<CR>else:\<CR>pass\<CR>elif 3:\<Esc>'
+    indent.should == 4
+  end
+end
+
+describe "elif after two ifs" do
+  before {
+    vim.feedkeys '\<ESC>ggdG'
+  }
+
+  it "keeps its indent to the outer if" do
+    vim.feedkeys 'iif 1:\<CR>if 2:\<CR>pass\<CR>elif 3:\<CR>pass\<CR>'
+    indent.should == 4
+    vim.feedkeys '\<Esc>'
+    indent.should == 0
+    proposed_indent.should == shiftwidth
+    vim.feedkeys 'ielif 4:'
+    indent.should == 0
+    proposed_indent.should == 0
+    vim.feedkeys '\<CR>'
+    indent.should == 4
+    proposed_indent.should == 4
+  end
+end