Develop -> Master #630
Merged
Develop -> Master #630
Conversation
This file contains 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
for multiline comments which were being considered operator first lines in some cases. may be getting some bug reports for this on master
Fix export default style indents
fixes #618 elegantly (hopefully)
react property expressions
mxw/vim-jsx#116 (comment) thanks to @mxw for the suggestion
adjustable indent (experimental)-maybe unstable
This wasn't working due to the fluctuating indent possible in blocks.
since the adjustment wasn't working well in blocks with blanks or comments, and there is never a continuation in !blocks this is far more simple
this will not be an issue since nobody uses labels for simple blocks, and if they do it is adjustable
the code is now much less embarassing
|
Awesome, will make sure to test over the next couple of days! |
I can improve it in the future, but it isn't that great now
Many of these are noise, but I don't consider function parenthesis to be so. Rather than creating a non-function parens group, I just created a group for each type and then linked them all to `jsParens` so that everything will behave as it currently does for users who are using `jsParens`.
Similar to the parens from the previous commit, this will allow users to customize the look of various types of braces rather than having to go all-in on non-function braces. ------------------------------------------------------------------------------ Actions: * Fix #589
`this` can be used outside of any other block and thus needs to be highlighted there. ------------------------------------------------------------------------------ Actions: * Fix #610
There were a few issues here: * Class decorators weren't being highlighted since they exist outside of any other group * Decorators which take a parameter didn't have their parameters property highlighted * Decorators which decorated a function within an object weren't being highlighted -------------------------------------------------------------------------------- Actions: * Fixes #590 * Fixes #572
This makes quite a bit more sense to me since decorators are a type of annotation to the function below.
It's right there in the name: "Keyword" and should be highlighted as such.
This is what I was initially intending to do. this version works mostly the same
Fix Various Syntax Highlighting Issues
|
I think this is good to go, @bounceme not sure if you want to add anything else indent-wise. |
|
that'd be fine with me! |
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.
Some indentation code oddities removed, performance improvements, small bugfixes and changes relating to operators and continuations.
I feel more testing is needed but just wanted to open the p.r. @amadeus