Skip to content

Develop -> Master #395

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.

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 52 commits into from
Apr 25, 2016
Merged

Develop -> Master #395

merged 52 commits into from
Apr 25, 2016

Conversation

amadeus
Copy link
Collaborator

@amadeus amadeus commented Apr 23, 2016

Given we had some pretty big issues in master with the last release, I'd like us to get this merged in ASAP.

Although I'd like to at least get #394 and #392 merged in first.

I'd still like some more time to test the #391 before merging that in, so I say we still wait. Plus I am keeping it up to date with develop as we merge things in.

bounceme and others added 28 commits March 31, 2016 21:59
fast attempt for issues with multiple declarations
line following arrow indentation
Fix lambda definitions in class definitions
#293
this will detect the start and end parentheses,allowing statements with parentheses to come after the condition parens.This regex can detect with up to 4 levels of nesting.
Adding [ and ] to jsFuncArgDestructuring
also a possible fix for the last example in #329 and #315
simplifies the parentheses handling
the previous pr is being difficult, sorry
Operator first support,including ternary,dot etc.
This is until we can figure out how to properly match all the crazy use
cases.
Temporarily disabled jsArrowFuncArgs with parens
I basically just copied what Tim Pope has done for his projects, an
example can be seen here:

https://github.com/tpope/vim-pathogen#license
Adding a license note to the README
This should work
Template string indentation
Improved Lambda Argument Handling
In progress but here are the effects so far
```

if ( a == b
    && c == d
    && e == f
    || g == h
    || i == j ) {
  a = b
    + c
    - d;
}
```
as opposed to this which would indent everything following it:
```

if ( a == b
    && c == d
    && e == f
    || g == h
    || i == j ) {
  a = b
    + c
    - d;
    }
```
spanning multiple lines detection
@amadeus
Copy link
Collaborator Author

amadeus commented Apr 23, 2016

Also I wonder if we should perhaps increment the version number, and perhaps create an official release tag with this. I think things are pretty solid once this gets merged in. Maybe we make it version 1.0?

@bounceme
Copy link
Collaborator

would be fine with me,with all the changes we have this might be a good time,also lots of old issues have been fixed.

amadeus and others added 22 commits April 24, 2016 02:14
Apparently there is no `nextgroup` match for the @file type.

Fixes #341
Move jsDocTag @file to a different jsDocTag group
* De-prioritized the not on regexes
* Added vim-plug installation instructions
* Improved header hierarchy
* Improved configuration variables documentation
* Removed some deprecated instructions
* Tweaks misc content
b:javascript_fold is no longer used anymore. Folding is done through
`set foldmethod=syntax`
Not using groups seems to help a bunch with performance
I think these matchers where for functions, and from another era of
project ownership. They added a TON of performance overhead, and I could
never replicate a scenario where they matched.
We had some special matching for Intl and certain submethods. It seems
needless to do this for the following reasons:

* The look behind added massive overhead (especially since the rule was
  not contained)
* We never do any special matching for any other global objects, so why
  these?
Shaved off some average time by removing the groups, which weren't
really needed to begin with
The optimizations it provides really doesn't seem to help much and
usually just results in weird syntax matching errors unless you run
`syntax sync fromstart`
Another match that turns up pretty high in the list of total time spent
under `syntime`
@amadeus
Copy link
Collaborator Author

amadeus commented Apr 25, 2016

Ok so all the major fixes have been merged in.

Do we want to include the performance improvements or not?

If not, I'll just add a tweak to the README to point out a new version and we can go ahead and merge this into master

@bounceme
Copy link
Collaborator

With the current performance I get I'm happy to just use the ones you already made yesterday.We can try and figure out some more using zs, vim regex is just kind of complicated. Otherwise merging sounds good

@amadeus
Copy link
Collaborator Author

amadeus commented Apr 25, 2016

Alright, I set the version number in the readme to 1.0.0

@amadeus amadeus merged commit d7f4728 into master Apr 25, 2016
@eddiezane
Copy link

Spectacular work on this release @amadeus, @bounceme, @davidchambers, and others! Thanks so much for the effort.

@amadeus
Copy link
Collaborator Author

amadeus commented Apr 25, 2016

Aww shucks, thanks! 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants