Skip to content

Develop -> Master #653

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 45 commits into from
Oct 11, 2016
Merged

Develop -> Master #653

merged 45 commits into from
Oct 11, 2016

Conversation

bounceme
Copy link
Collaborator

@bounceme bounceme commented Oct 2, 2016

I think it's a good idea to get this out. I forget about this stuff being dev only

edit: One or two more commits I want to get in this

bounceme and others added 30 commits September 18, 2016 01:41
* multi-braceless statements

This changes:
```
if (1)
  for (;;)
  i +=
  l
```
to:
```
if (1)
  for (;;)
    i +=
      l
```
this will improve performance depending on the file. I will try and clean it a little
Give jsGlobalNodeObjects a higher priority that can therefore be
targeted if desired.
makes a huge difference when not in a 'scope'. avoids checking the whole file
* improve helper
Any issues with this? It doesn't rlly mean anything, just something to satisfy vim/dev
Fix jsFlowTypeCustom regex to allow dots
@bounceme
Copy link
Collaborator Author

I'll fix the conflict and merge later today or tomorrow

@bounceme
Copy link
Collaborator Author

Can @amadeus or @BenoitZugmeyer or @tomxtobin confirm whether i resolved the conflict correctly?

@bounceme
Copy link
Collaborator Author

I'm going to merge in an hour. Last chance syntax guys !

@BenoitZugmeyer
Copy link
Contributor

You removed the line HiLink jsForAwait Keyword I added in my PR. Was it on purpose? without this line, the await in for await expression isn't colored as a keyword.

screenshot_20161011_204759

@bounceme
Copy link
Collaborator Author

822dfe5 is the problem?

@BenoitZugmeyer
Copy link
Contributor

It seems so, yes.

@TamsynUlthara
Copy link
Contributor

I think my #660 is missing in there, as well?

This reverts commit 822dfe5, reversing
changes made to da65c0c.
@bounceme
Copy link
Collaborator Author

#660 is in master

@TamsynUlthara
Copy link
Contributor

#660 is in master

Whoops. Thanks!

@bounceme
Copy link
Collaborator Author

No conflicts now, how does this look @BenoitZugmeyer ?

@BenoitZugmeyer
Copy link
Contributor

LGTM! thank you.

@bounceme bounceme merged commit d736e95 into master Oct 11, 2016
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.

5 participants