Indent dictionary values on a new line extra

indent/python.vim

@@ -221,10 +221,14 @@ function! s:indent_like_opening_paren(lnum)
     " indent further to distinguish the continuation line
     " from the next logical line.
     if text =~# b:control_statement && res == base + s:sw()
-        return base + s:sw() * 2
-    else
-        return res
+        let res = base + s:sw() * 2
+    endif
+
+    " If a colon is the final charactar on previous line
+    if getline(a:lnum-1) =~ ':\s*$'
+        let res = res + s:sw()
     endif
+    return res
 endfunction
 
 " Match indent of first block of this type.

spec/indent/indent_spec.rb

@@ -91,6 +91,22 @@
     end
   end
 
+  describe "after a dictionary key" do
+    before { vim.feedkeys 'imydict = {"12345": ' }
+
+    it "indents to opening paren + shiftwidth" do
+      vim.feedkeys '\<CR>'
+      indent.should == 10 + shiftwidth
+    end
+    it "on a new line indents to opening paren + shiftwidth" do
+      vim.feedkeys '123,\<CR>"4567": '
+      indent.should == 10
+      vim.feedkeys '\<CR>'
+      indent.should == 10 + shiftwidth
+    end
+  end
+
+
   describe "when using gq to reindent a '(' that is" do
     before { vim.feedkeys 'itest(' }
     it "something and has a string without spaces at the end" do