Skip to content

Right tab size if mixed spacing and using more often used spacing #29

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

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

Right tab size if mixed spacing and using more often used spacing #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18427a6
Getting right tab size if mixed spacing
igrmk Jan 26, 2017
92cc799
Choose spaces or tabs depending of what is more often used
igrmk Jan 26, 2017
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
30 changes: 18 additions & 12 deletions plugin/detectindent.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ fun! s:GetValue(option)
endfun

fun! <SID>DetectIndent()
let l:has_leading_tabs = 0
let l:has_leading_spaces = 0
let l:leading_tabs_number = 0
let l:leading_spaces_number = 0
let l:shortest_leading_spaces_run = 0
let l:shortest_leading_spaces_idx = 0
let l:longest_leading_spaces_run = 0
Expand Down Expand Up @@ -105,13 +105,13 @@ fun! <SID>DetectIndent()
let l:leading_char = strpart(l:line, 0, 1)

if l:leading_char == "\t"
let l:has_leading_tabs = 1
let l:leading_tabs_number += 1

elseif l:leading_char == " "
" only interested if we don't have a run of spaces followed by a
" tab.
if -1 == match(l:line, '^ \+\t')
let l:has_leading_spaces = 1
let l:leading_spaces_number += 1
let l:spaces = strlen(matchstr(l:line, '^ \+'))
if l:shortest_leading_spaces_run == 0 ||
\ l:spaces < l:shortest_leading_spaces_run
Expand All @@ -135,7 +135,7 @@ fun! <SID>DetectIndent()

endwhile

if l:has_leading_tabs && ! l:has_leading_spaces
if l:leading_tabs_number && ! l:leading_spaces_number
" tabs only, no spaces
let l:verbose_msg = "Detected tabs only and no spaces"
setl noexpandtab
Expand All @@ -144,23 +144,29 @@ fun! <SID>DetectIndent()
let &l:tabstop = g:detectindent_preferred_indent
endif

elseif l:has_leading_spaces && ! l:has_leading_tabs
elseif l:leading_spaces_number && ! l:leading_tabs_number
" spaces only, no tabs
let l:verbose_msg = "Detected spaces only and no tabs"
setl expandtab
let &l:shiftwidth = l:shortest_leading_spaces_run
let &l:softtabstop = l:shortest_leading_spaces_run

elseif l:has_leading_spaces && l:has_leading_tabs && ! s:GetValue("detectindent_preferred_when_mixed")
elseif l:leading_spaces_number && l:leading_tabs_number && ! s:GetValue("detectindent_preferred_when_mixed")
" spaces and tabs
let l:verbose_msg = "Detected spaces and tabs"
setl noexpandtab

if l:leading_spaces_number < l:leading_tabs_number
setl noexpandtab
else
setl expandtab
endif

let &l:shiftwidth = l:shortest_leading_spaces_run

" mmmm, time to guess how big tabs are
if l:longest_leading_spaces_run <= 2
if l:shortest_leading_spaces_run <= 2
let &l:tabstop = 2
elseif l:longest_leading_spaces_run <= 4
elseif l:shortest_leading_spaces_run <= 4
let &l:tabstop = 4
else
let &l:tabstop = 8
Expand Down Expand Up @@ -188,8 +194,8 @@ fun! <SID>DetectIndent()

if &verbose >= g:detectindent_verbosity
echo l:verbose_msg
\ ."; has_leading_tabs:" l:has_leading_tabs
\ .", has_leading_spaces:" l:has_leading_spaces
\ ."; leading_tabs_number:" l:leading_tabs_number
\ .", leading_spaces_number:" l:leading_spaces_number
\ .", shortest_leading_spaces_run:" l:shortest_leading_spaces_run
\ .", shortest_leading_spaces_idx:" l:shortest_leading_spaces_idx
\ .", longest_leading_spaces_run:" l:longest_leading_spaces_run
Expand Down