Develop -> Master #442

amadeus · 2016-05-25T16:49:54Z

Just another base release. I kinda want to get this out soon though, so we stop getting those bug reports regarding the lookbehind limiters.

also now that I know about cindent i'm curious if there are other places like this to remove code and increase performance

Switch mechanics, indent

Fixes #401

Fix class definitions with no name

This ES6 version of jsFuncName requires some special handling to not, by default, overwrite jsObjectKey and also not overwrite jsFuncCall.

Custom jsFuncName for object definitions

misc fixes

I am commenting this out since I am working through a better implementation.

Fix Issue 406

* Update javascript.vim * Update javascript.vim

oh my

proper asi for control statements

Will need to better fix this soon, just getting this hotfix out asap

Temporary fix for older versions of vim

an example here : jason0x43/vim-js-indent#4 (comment)

#423

* c style opening curly braces #68 * Update javascript.vim

Prevent limited lookbehinds in older vers of vim

this doesn't change any behavior it is just for clarity

* Update javascript.vim * Update javascript.vim

should be considered last non whitespace non comment

also I'm removing all the template string indentation, will leave it as a comment if someone can justify actually changing a string

should have said more bugs #432

this should be working now

also added a modeline to fold away the gq code

* random fixes and improvements this also removes the parentheses alignment, we can leave it in I suppose, but I'd like to revisit that later. if anyone objects please let me know.this needs to be cleaned up a bit before merging * Update javascript.vim * Update javascript.vim * Update javascript.vim

This class regex will match if the text class is contained within a larger variable name, and therefore is broken.

Forcing `class` text to be a keyword

regexes have been cleaned and no longer have ruby specifics. all of the regex matching has been either refactored to use the s:match function if it is needed to look at the syntax of the characters, or changed to be a simple match to save performance.the current file has none of the bugs i talked about that were caused by the last commit

another tiny commit, this is just fix which for a small bug that slipped past me

* wrapping comments improved this improves most regexes and the prevnonblanknonstring function

davidchambers · 2016-05-25T17:08:34Z

Let's do it. :)

this is just a more correct, thorough check, for multiline comments

bounceme · 2016-05-25T19:48:29Z

the indent script is ready for a merge

amadeus · 2016-05-25T19:49:29Z

i added a small issue I noticed in #443, is that an easy fix? If so, I'd like to get that in first, otherwise we can hold off and fix later.

bounceme · 2016-05-25T19:55:21Z

hmm, I'm at work. I'll try and fix it soon

bounceme · 2016-05-25T20:02:50Z

actually, since we use cindent for multiline comments, this is probably customizable. maybe in the cinoptions section of the vim help you can find it

bounceme · 2016-05-25T20:14:55Z

cN    Indent comment lines after the comment opener, when there is no
          other text with which to align, N characters from the comment
          opener.  (default 3).  See also |format-comments|.

        cino=             cino=c5
          /*                /*
             text.           text.
           */                */

amadeus · 2016-05-25T23:10:06Z

Ok cool, then I think we can just go ahead and merge this, and I'll worry about that later.

this fixes some serious issues with the way a continuation is detected and also removes the specific code for comma first style,which was very breakable

a comma should be considered an operator

* change the regex engine according to warning the readme won't tell the user to change the regexpengine now that the correct one is set

Shebang doesn't have to contain env

amadeus · 2016-05-27T17:52:20Z

Alright, I think this may be good to go?

bounceme and others added 30 commits April 25, 2016 19:53

Switch mechanics, indent

105a4aa

also now that I know about cindent i'm curious if there are other places like this to remove code and increase performance

Merge pull request #400 from pangloss/switch

0e7983d

Switch mechanics, indent

Fix class definitions with no name

dde16a0

Fixes #401

Merge pull request #402 from amadeus/fix-401

e8657a8

Fix class definitions with no name

Custom jsFuncName for object definitions

c4ccee6

This ES6 version of jsFuncName requires some special handling to not, by default, overwrite jsObjectKey and also not overwrite jsFuncCall.

Update javascript.vim

b4e2fae

Merge pull request #403 from amadeus/fix-261

187594a

Custom jsFuncName for object definitions

Merge pull request #404 from pangloss/misc.fixes

e60e4eb

misc fixes

Fix Issue 406

50c433e

I am commenting this out since I am working through a better implementation.

Merge pull request #409 from amadeus/fix-406

304e2ac

Fix Issue 406

multiline comment (#408)

d2fa176

* Update javascript.vim * Update javascript.vim

Update javascript.vim

617ccb5

oh my

parentheses regex is thankfully gone (#412)

8fb5fa8

proper asi for control statements

Temporary fix for older versions of vim

0fecb92

Will need to better fix this soon, just getting this hotfix out asap

Merge pull request #414 from amadeus/fix-lookbehinds

10b6c64

Temporary fix for older versions of vim

indent following line ending in comma with arrow (#420)

8f16491

an example here : jason0x43/vim-js-indent#4 (comment)

template fixes (#422)

c9eda1f

for better switch handling (#424)

aa9a46a

#423

c style opening curly braces (#426)

b3ebfa5

* c style opening curly braces #68 * Update javascript.vim

Prevent limited lookbehinds in older vers of vim

7137e7e

Merge pull request #417 from amadeus/fix-lookbehind-limiting

bf45f9c

Prevent limited lookbehinds in older vers of vim

specify template as a string

61b8984

this doesn't change any behavior it is just for clarity

minor changes (#429)

a6e90ba

* Update javascript.vim * Update javascript.vim

literal indentation in a multiline string (#430)

206b85c

last actual column (#431)

dc11766

should be considered last non whitespace non comment

more fixes (#432)

fd98935

also I'm removing all the template string indentation, will leave it as a comment if someone can justify actually changing a string

must actually return a number

75fcd09

my mistake

7c7add5

should have said more bugs #432

slight changes continuing from before

3ebaef3

this should be working now

removing some clutter (#434)

04e412b

also added a modeline to fold away the gq code

bounceme and others added 6 commits May 17, 2016 17:11

Forcing class text to be a keyword

bf34e60

This class regex will match if the text class is contained within a larger variable name, and therefore is broken.

Merge pull request #436 from amadeus/fix-class-definitions

2767155

Forcing `class` text to be a keyword

little bug affecting previous few commits

c180b0c

another tiny commit, this is just fix which for a small bug that slipped past me

wrapping comments improved (#440)

c5fba22

* wrapping comments improved this improves most regexes and the prevnonblanknonstring function

another edge side effect (#443)

fe096c0

this is just a more correct, thorough check, for multiline comments

bounceme and others added 6 commits May 26, 2016 00:20

a comma should be considered an operator

d54b138

this fixes some serious issues with the way a continuation is detected and also removes the specific code for comma first style,which was very breakable

Update javascript.vim

b5de6ec

Merge pull request #445 from pangloss/bounceme-patch-1

8c56957

a comma should be considered an operator

Shebang doesn't have to contain env

fcec8b7

change the regex engine according to warning (#449)

5b143bd

* change the regex engine according to warning the readme won't tell the user to change the regexpengine now that the correct one is set

Merge pull request #448 from dNItro/patch-1

f39eb1f

Shebang doesn't have to contain env

amadeus merged commit 0f0e4a7 into master May 27, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Develop -> Master #442

Develop -> Master #442

Uh oh!

amadeus commented May 25, 2016 •

edited

Loading

Uh oh!

davidchambers commented May 25, 2016

Uh oh!

bounceme commented May 25, 2016

Uh oh!

amadeus commented May 25, 2016

Uh oh!

bounceme commented May 25, 2016

Uh oh!

bounceme commented May 25, 2016

Uh oh!

bounceme commented May 25, 2016

Uh oh!

amadeus commented May 25, 2016

Uh oh!

amadeus commented May 27, 2016

Uh oh!

Uh oh!

Develop -> Master #442

Develop -> Master #442

Uh oh!

Conversation

amadeus commented May 25, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

davidchambers commented May 25, 2016

Uh oh!

bounceme commented May 25, 2016

Uh oh!

amadeus commented May 25, 2016

Uh oh!

bounceme commented May 25, 2016

Uh oh!

bounceme commented May 25, 2016

Uh oh!

bounceme commented May 25, 2016

Uh oh!

amadeus commented May 25, 2016

Uh oh!

amadeus commented May 27, 2016

Uh oh!

Uh oh!

amadeus commented May 25, 2016 •

edited

Loading