Skip to content

Update Master#167

Merged
amadeus merged 26 commits intomasterfrom
develop
Mar 17, 2014
Merged

Update Master#167
amadeus merged 26 commits intomasterfrom
develop

Conversation

@amadeus
Copy link
Copy Markdown
Collaborator

@amadeus amadeus commented Mar 11, 2014

It's been a while since the develop branch has been merged into master. Setting up this PR now for people to identify any bugs or issues with develop before we merge it into master.

I was thinking we can merge this in sometime this weekend, giving ample time to find any potential glaring issues.

I've been running the develop branch for a while now with no real issues, so it's really these few PRs that got merged in today that need to be tested.

goatslacker and others added 26 commits November 11, 2013 15:28
Adds es6 support for arrow function syntax
feature(conceal): add prototype to the list of conceals
The latest documentation for JSDoc3 use lowercase tags (http://usejsdoc.org/),
but the oldest versions may use camel case (see https://code.google.com/p/jsdoc-toolkit/wiki/TagReference).
The current syntax supports both of them.
Each of the following character classes contains an escaped "]":

    /[\]]/
    /[\]x]/
    /[\\\]]/

The following character class does *not* contain an escaped "]":

    /[\\]/
string: spell-check string literals
Adds es6 support for rest parameters in function signatures
Most significantly, this causes shorthand character classes within
groups to be highlighted. For example:

    /(\d)/
regexp: add jsSpecial to jsRegexpSpecial cluster
The intention of this commit is to perhaps improve performance, but also
clean up a bit of the how a couple regexes are used.

By adding `contained` to `jsObjectKey`, I think we might get a nice
performance boost, especially on larger files since it won't attemp that
lookbehind everywhere.

Adding `contained` to the newer regex for string templating stuff
in ES6 seems more 'accurate' or proper.
For some reason a whole group of regexes where indented 2 space.  Not
sure why, perhaps a holdover from some other era of whitespace
organization.  Anyays, pulling it back for now.  This is a purely
aesthetic/cleanup commit, nothing major.
Fixing odd indentation levels in syntax file
@amadeus
Copy link
Copy Markdown
Collaborator Author

amadeus commented Mar 17, 2014

I am a bit behind in getting this merged in, but I'd like to merge this tonight. Any potential objections from any other collaborators? Last call.

@davidchambers
Copy link
Copy Markdown
Collaborator

No objections here.

amadeus added a commit that referenced this pull request Mar 17, 2014
@amadeus amadeus merged commit a1165dc into master Mar 17, 2014
@davidchambers
Copy link
Copy Markdown
Collaborator

🎉

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.

6 participants