Skip to content

small minification and perf #675

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

Merged
merged 6 commits into from
Oct 20, 2016
Merged

small minification and perf #675

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f5db23d
small minification and perf
bounceme Oct 19, 2016
5f85f09
of course
bounceme Oct 19, 2016
2ec3723
Update javascript.vim
bounceme Oct 19, 2016
aa6b149
Update javascript.vim
bounceme Oct 20, 2016
c7e7ee3
Update javascript.vim
bounceme Oct 20, 2016
46c57ef
Update javascript.vim
bounceme Oct 20, 2016
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: 15 additions & 15 deletions indent/javascript.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
" Language: Javascript
" Maintainer: Chris Paul ( https://github.com/bounceme )
" URL: https://github.com/pangloss/vim-javascript
" Last Change: October 15, 2016
" Last Change: October 19, 2016

" Only load this indent file when no other was loaded.
if exists('b:did_indent')
Expand Down Expand Up @@ -50,7 +50,7 @@ function s:skip_func(lnum)
return !s:free
endif
let s:looksyn = line('.')
return (search('\/','nbW',line('.')) || search('[''"\\]','nW',line('.'))) && eval(s:skip_expr)
return (strridx(getline('.'),'/',col('.')-1) + 1 || search('[''"\\]','nW',s:looksyn)) && eval(s:skip_expr)
endfunction

if has('reltime')
Expand All @@ -65,10 +65,10 @@ endif

function s:Trimline(ln)
let pline = substitute(getline(a:ln),'\s*$','','')
let max = max([strridx(pline,'//'),strridx(pline,'/*'),0])
while max && synIDattr(synID(a:ln, strlen(pline), 0), 'name') =~? '\%(comment\|doc\)'
let pline = substitute(strpart(pline, 0, max),'\s*$','','')
let max = max([strridx(pline,'//'),strridx(pline,'/*'),0])
let l:max = max([strridx(pline,'//'),strridx(pline,'/*'),0])
while l:max && synIDattr(synID(a:ln, strlen(pline), 0), 'name') =~? '\%(comment\|doc\)'
let pline = substitute(strpart(pline, 0, l:max),'\s*$','','')
let l:max = max([strridx(pline,'//'),strridx(pline,'/*'),0])
endwhile
return pline
endfunction
Expand All @@ -85,8 +85,8 @@ let g:javascript_opfirst = '^' . g:javascript_opfirst
let g:javascript_continuation .= '$'

function s:OneScope(lnum,text)
return cursor(a:lnum, match(' ' . a:text, '\%(\<else\|\<do\|=>\)$')) > -1 ||
\ cursor(a:lnum, match(' ' . a:text, ')$')) > -1 &&
return cursor(a:lnum, match(' ' . a:text, '\%(\<else\|\<do\|=>\)$')) + 1 ||
\ cursor(a:lnum, match(' ' . a:text, ')$')) + 1 &&
\ s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 &&
\ search('\C\<\%(for\%(\_s\+\%(await\|each\)\)\=\|if\|let\|w\%(hile\|ith\)\)\_s*\%#','bW')
endfunction
Expand Down Expand Up @@ -121,15 +121,15 @@ endfunction
function s:IsBlock()
let l:ln = line('.')
if search('\S','bW')
let char = getline(line('.'))[col('.')-1]
let pchar = getline(line('.'))[col('.')-2]
let char = getline('.')[col('.')-1]
let pchar = getline('.')[col('.')-2]
let syn = synIDattr(synID(line('.'),col('.')-1,0),'name')
if pchar . char == '*/' && syn =~? 'comment'
if !search('\/\*','bW') || !search('\S','bW')
return 1
endif
let char = getline(line('.'))[col('.')-1]
let pchar = getline(line('.'))[col('.')-2]
let char = getline('.')[col('.')-1]
let pchar = getline('.')[col('.')-2]
let syn = synIDattr(synID(line('.'),col('.')-1,0),'name')
endif
if syn =~? '\%(xml\|jsx\)'
Expand All @@ -143,7 +143,7 @@ function s:IsBlock()
elseif char == '>'
return pchar == '=' || syn =~? '^jsflow'
elseif char == ':'
return strpart(getline(line('.')),0,col('.')) =~# s:expr_case . '$'
return strpart(getline('.'),0,col('.')) =~# s:expr_case . '$'
else
return char !~# '[-=~!<*+,/?^%|&([]'
endif
Expand Down Expand Up @@ -254,7 +254,7 @@ function GetJavascriptIndent()
let s:W = s:sw()
let pline = s:Trimline(l:lnum)
call cursor(b:js_cache[1],b:js_cache[2])
let bchar = getline(b:js_cache[1])[b:js_cache[2]-1] == '{'
let bchar = getline('.')[col('.')-1] == '{'
let switch_offset = !num || !bchar || !(search(')\_s*\%#','bW') &&
\ s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && search('\C\<switch\_s*\%#','bW')) ? 0 :
\ &cino !~ ':' || !has('float') ? s:W :
Expand All @@ -264,7 +264,7 @@ function GetJavascriptIndent()
let isOp = l:line =~# g:javascript_opfirst || pline !~# s:expr_case . '$' && pline =~# g:javascript_continuation
let bL = s:iscontOne(l:lnum,num,isOp)
let bL -= (bL && l:line =~ '^{') * s:W
if isOp && (!num || cursor(b:js_cache[1],b:js_cache[2]) || (bchar && s:IsBlock()))
if isOp && (!num || bchar && cursor(b:js_cache[1],b:js_cache[2])+1 && s:IsBlock())
return (num ? indent(num) : -s:W) + (s:W * 2) + switch_offset + bL
elseif num
return indent(num) + s:W + switch_offset + bL
Expand Down