From: Daniel Hahler <github@thequod.de>
Date: Sat, 17 Nov 2018 18:10:46 +0000 (+0100)
Subject: Keep/handle (auto)indent with O (#119)
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/8d64e05e37bc3c9a01bd7c5d6e2948470551c351?ds=inline;hp=-c;pf=etc

Keep/handle (auto)indent with O (#119)
---

8d64e05e37bc3c9a01bd7c5d6e2948470551c351
diff --git a/indent/python.vim b/indent/python.vim
index 55b2b1b..6f84637 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -313,7 +313,7 @@ function! s:indent_like_previous_line(lnum)
         return -1
     endif
 
-    if !empty && s:is_dedented_already(current, base)
+    if (current || !empty) && s:is_dedented_already(current, base)
         return -1
     endif
 
diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb
index 400ec11..aa796df 100644
--- a/spec/indent/indent_spec.rb
+++ b/spec/indent/indent_spec.rb
@@ -685,3 +685,22 @@ describe "Compact multiline dict" do
     proposed_indent.should == 0
   end
 end
+
+describe "Using O" do
+  before { vim.feedkeys 'iif foo:\<CR>' }
+
+  it "respects autoindent" do
+    vim.feedkeys '1\<CR>\<CR>'
+    indent.should == shiftwidth
+    vim.feedkeys '\<Esc>ko'
+    indent.should == shiftwidth
+    vim.feedkeys '\<Esc>kO'
+    indent.should == shiftwidth
+    # Uses/keeps indent from line above
+    vim.feedkeys '\<Esc>i2\<Esc>O'
+    indent.should == shiftwidth
+    # Uses/keeps indent from line above
+    vim.feedkeys '\<Esc>j\<Esc>O'
+    indent.should == 0
+  end
+end