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

Develop -> Master #604

Merged
merged 52 commits into from
Aug 21, 2016
Merged

Develop -> Master #604

Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
924a645
misc fixes (#578)
bounceme Jul 29, 2016
ee3183e
fix ftplugin var and clean indent (#580)
bounceme Jul 30, 2016
5923f80
comment on performance, angle brackets
bounceme Jul 30, 2016
e8bb2ba
remove line comment appended to code (#581)
bounceme Jul 31, 2016
bc6422b
had a problem with some of the changes
bounceme Jul 31, 2016
60eaba7
Update javascript.vim
bounceme Jul 31, 2016
6706a24
few remaining touches
bounceme Jul 31, 2016
a328e81
add label support (#582)
bounceme Jul 31, 2016
5ba6eab
case-sensitivity (#583)
bounceme Jul 31, 2016
8641372
Don't join strings in multiple lines
bounceme Jul 31, 2016
c003d8b
join lines
bounceme Jul 31, 2016
58095d8
regex char classes
bounceme Aug 1, 2016
bd4c527
limit regex lookbehind
bounceme Aug 1, 2016
4278caa
unicode identifiers
bounceme Aug 2, 2016
6de8f62
more regex
bounceme Aug 2, 2016
27a37b4
for 585 (#586)
bounceme Aug 3, 2016
b65cd14
update comments
bounceme Aug 3, 2016
97e5fca
last commit extended to blocks
bounceme Aug 3, 2016
23b4639
accuracy and speed increase for line_term regex
bounceme Aug 3, 2016
73c85a3
awful off-by-one bug
bounceme Aug 3, 2016
b8762e8
remove buggy linehasopeningbracket trick
bounceme Aug 3, 2016
6a3fac4
cleaning
bounceme Aug 3, 2016
336d435
more cleaning
bounceme Aug 5, 2016
fc43554
case-sensitivity
bounceme Aug 5, 2016
5632438
simplify regex
bounceme Aug 5, 2016
2a85b3c
ind updates (#593)
bounceme Aug 6, 2016
4a126ee
negatives are truthy in vimscript
bounceme Aug 6, 2016
29519c6
case sensitive
bounceme Aug 7, 2016
0a7432f
remove transparent syntax check
bounceme Aug 7, 2016
a7e60bb
remove repeated syn checking
bounceme Aug 7, 2016
b59dfbc
Update javascript.vim
bounceme Aug 7, 2016
9703a61
cleaning, minor performance improvements
bounceme Aug 9, 2016
6f31d72
fix regex
bounceme Aug 12, 2016
898a536
disambiguate vars
bounceme Aug 12, 2016
debb9bf
Readme Updates (#599)
bounceme Aug 14, 2016
0cab456
regex improvements
bounceme Aug 14, 2016
28b5a87
block statement (#596)
bounceme Aug 16, 2016
3a20412
cleaning (#601)
bounceme Aug 17, 2016
cef306f
settings (#603)
bounceme Aug 17, 2016
aadf36b
cache can be invalid for he current line
bounceme Aug 18, 2016
f16fe69
Change function names
bounceme Aug 18, 2016
ba6dce3
Rename function
bounceme Aug 18, 2016
67f2990
regex improvements (#607)
bounceme Aug 19, 2016
d0a4aa4
more regex (#608)
bounceme Aug 19, 2016
0a955ee
function removed,cleaning
bounceme Aug 19, 2016
8eea632
fix foreach method calls
bounceme Aug 20, 2016
efab7db
date
bounceme Aug 20, 2016
055ce0c
switch stuff
bounceme Aug 20, 2016
9516192
case statements update
bounceme Aug 20, 2016
34a070c
minor style changes
bounceme Aug 20, 2016
6787729
remove ugly function call
bounceme Aug 21, 2016
5900fce
last commit revert
bounceme Aug 21, 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
Prev Previous commit
Next Next commit
last commit extended to blocks
  • Loading branch information
@bounceme
bounceme authored Aug 3, 2016
commit 97e5fcab6693fa006d6552ece9b72c60e7f04373
4 changes: 2 additions & 2 deletions indent/javascript.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ function GetJavascriptIndent()
endif

let pline = s:StripLine(getline(lnum))
let inb = num == 0 ? 1 : s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) ||
\ (num < lnum && (line !~ s:line_pre . ',' && pline !~ ',' . s:line_term))
let inb = num == 0 ? 1 : (s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) ||
\ (line !~ s:line_pre . ',' && pline !~ ',' . s:line_term)) && num < lnum
let switch_offset = (!inb || num == 0) || expand("<cword>") !=# 'switch' ? 0 : &cino !~ ':' || !has('float') ? s:sw() :
\ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (match(&cino,'.*:\zs[^,]*s') ? s:sw() : 1))

Expand Down