Improve indent for comment

Author: hattya

indent/python.vim

@@ -44,13 +44,17 @@ function! GetPEP8PythonIndent() abort
   endif
 
   " keep current indent
-  let colon = getline(v:lnum)[col('.') - 2] ==# ':'
+  let l = getline(v:lnum)
+  let colon = l[col('.') - 2] ==# ':'
   if s:synmatch(v:lnum, 1, s:syn_str) != -1 && s:synmatch(v:lnum - 1, 1, s:syn_str) != -1
     " inside string
     return -1
   elseif colon && col('.') < col('$')
     " : is not at EOL
     return -1
+  elseif l =~# '^\s*#'
+    " comment
+    return -1
   endif
 
   " indent for bracket

test/indent.vimspec

@@ -95,6 +95,21 @@ Describe filetype indent
     End
   End
 
+  Describe comment
+    It keeps the current indent
+      let in  = "def spam():\<CR>if True:\<CR>pass\<CR>"
+      let in .= "0\<C-D>def eggs():\<CR>\pass\<Esc>\<C-V>0kI# \<Esc>gg=G"
+      let out = [
+      \  'def spam():',
+      \  '    if True:',
+      \  '        pass',
+      \  '# def eggs():',
+      \  '#     pass',
+      \]
+      Assert Equals(Insert(in), Buffer(out))
+    End
+  End
+
   Describe line continuation
     It increases the indent level
       let in = "i = 1 + \\\<CR>2 + \\\<CR>3"