Develop -> Master #544
Merged
Develop -> Master #544
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
More flow fixes
They really should be linked, because jsClassDefinition is really just a function
Linking jsClassDefinition to jsFuncName
Adding do expression support
It screws up highlighting of the operators when they are used as method names: . This doesn't happen if you're inside a normal object: 
Remove jsOperator from jsClassBlock
* Functions * Classes * Conditionals * Repeat statements
Adding support for oddly placed comments
- Add highlighting for binary and octal number syntax - Highlight unary minus as operator regardless of 'iskeyword' option - Remove L from integer literals
It's better not to touch 'iskeyword' option from a syntax file if possible.
- Add header - Replace 're' with 'regexpengine' - Simplify patch check
It's better when effect of indent script can be undone.
Update filetype plugin
Make use of syntax specific iskeyword setting
simplistic, accurate, possibly slow refactor switch case, code reduction & removing needless if's make search pair result local to buffer https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/for_each...in do while fix case sensitivity
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/try...catch these need block statements
Adding some common NodeJS globals
Tweak highlighting of numeric literals
|
i have to work on the switch block indentation before a merge, hope to finish soon |
|
No worries, I want to re-look into some JS Flow stuff this weekend before we merge into |
reusing of logic
* remove switch syn check #177 (comment)
|
indent script is ready! how is the jsx/flow work going @amadeus ? |
the folding is enough for separating content
vimscript is strange
the file is no longer long enough to require automatic folding!
* adding more operators I think adding `<>` could mess with xml type things so i've not included them
* Improved OR operator * Various fixes for arguments
|
Alright, I think this is ready to go. @bounceme any last things you might want to do? |
|
Not really, this is ready |
|
@bounceme what about the PR you just opened? Should we wait for that? |
|
No ,its just a weird edge case and continuations within 'c-style' ,which I haven't fixed yet |
|
Maybe I could just merge it now though? only the first example is fixed, but having it tested by users be good |
|
@bounceme yeah that's good with me, go for it! |
``` if () a=b ```
|
you do the honors @amadeus ! |
not supposed to be there
|
actually I have a possible fix for the 'c-style' issue And it worked, now I'm ready |
* fix c-style continuation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Still some more work to be done, and I have some JSX improvements I'd like to get in here soon, but getting the PR started to kick us into gear to get these changes into
master