Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle case with colon at the end of the line of a comment #1

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Handle case with colon at the end of the line of a comment #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b10da9
Handle case with colon at the end of the line of a comment, but also
David-Hegland Jul 31, 2020
0b7fc38
Fix indentation issue with colon and no comments
David-Hegland Jul 31, 2020
735af45
Fix indentation with colons
raven42 Aug 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions indent/python.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Python indent file
" Language: Python
" Maintainer: Eric Mc Sween <[email protected]>
" Original Author: David Bustos <[email protected]>
" Original Author: David Bustos <[email protected]>
" Last Change: 2004 Jun 07

" Only load this indent file when no other was loaded.
Expand All @@ -22,7 +22,7 @@ let s:maxoff = 50
function! s:SearchParensPair()
let line = line('.')
let col = col('.')

" Skip strings and comments and don't look too far
let skip = "line('.') < " . (line - s:maxoff) . " ? dummy :" .
\ 'synIDattr(synID(line("."), col("."), 0), "name") =~? ' .
Expand Down Expand Up @@ -51,7 +51,7 @@ function! s:SearchParensPair()
if par3lnum > parlnum || (par3lnum == parlnum && par3col > parcol)
let parlnum = par3lnum
let parcol = par3col
endif
endif

" Put the cursor on the match
if parlnum > 0
Expand Down Expand Up @@ -87,7 +87,7 @@ function! s:BlockStarter(lnum, block_start_re)
if indent(lnum) < maxindent
if getline(lnum) =~ a:block_start_re
return lnum
else
else
let maxindent = indent(lnum)
" It's not worth going further if we reached the top level
if maxindent == 0
Expand All @@ -98,14 +98,14 @@ function! s:BlockStarter(lnum, block_start_re)
endwhile
return -1
endfunction

function! GetPythonIndent(lnum)

" First line has indent 0
if a:lnum == 1
return 0
endif

" If we can find an open parenthesis/bracket/brace, line up with it.
call cursor(a:lnum, 1)
let parlnum = s:SearchParensPair()
Expand All @@ -126,7 +126,7 @@ function! GetPythonIndent(lnum)
endif
endif
endif

" Examine this line
let thisline = getline(a:lnum)
let thisindent = indent(a:lnum)
Expand All @@ -140,7 +140,7 @@ function! GetPythonIndent(lnum)
return -1
endif
endif

" If the line starts with 'except' or 'finally', line up with 'try'
" or 'except'
if thisline =~ '^\s*\(except\|finally\)\>'
Expand All @@ -151,19 +151,19 @@ function! GetPythonIndent(lnum)
return -1
endif
endif

" Examine previous line
let plnum = a:lnum - 1
let pline = getline(plnum)
let sslnum = s:StatementStart(plnum)

" If the previous line is blank, keep the same indentation
if pline =~ '^\s*$'
return -1
endif

" If this line is explicitly joined, try to find an indentation that looks
" good.
" good.
if pline =~ '\\$'
let compound_statement = '^\s*\(if\|while\|for\s.*\sin\|except\)\s*'
let maybe_indent = matchend(getline(sslnum), compound_statement)
Expand All @@ -173,13 +173,18 @@ function! GetPythonIndent(lnum)
return indent(sslnum) + &sw * 2
endif
endif

" If the previous line ended with a colon, indent relative to
" statement start.
if pline =~ ':\s*$'
" statement start. Unless the colon was after the start of a
" comment.
if pline =~ ':\s*$' && pline !~ '#.*:\s*$'
return indent(sslnum) + &sw
endif

if pline =~ ':\s*#'
return indent(sslnum) + &sw
endif

" If the previous line was a stop-execution statement or a pass
if getline(sslnum) =~ '^\s*\(break\|continue\|raise\|return\|pass\)\>'
" See if the user has already dedented
Expand Down