This repository was archived by the owner on Dec 15, 2022. It is now read-only.
Fix function/method calls being superseded #321
Merged
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
Builtins tests added for function calls to builtin methods of `support.function.js` and `support.function.dom.js`.
Make old function tests pass
Syntax fix
Syntax refix
Trailing whitespace
grammars/javascript.cson
Outdated
| '2': | ||
| 'name': 'support.function.js.console' | ||
| # console.log(arg1, "arg2", [...]) | ||
| 'begin': '\\bconsole' |
Contributor
There was a problem hiding this comment.
What if we have consolea.log()?
grammars/javascript.cson
Outdated
| 'name': 'support.function.dom.js' | ||
| } | ||
| { | ||
| 'match': ".+" |
Contributor
There was a problem hiding this comment.
This seems dangerous...we should make sure the function name is valid.
grammars/javascript.cson
Outdated
| 'end': '(?!\\G)' | ||
| 'patterns': [ | ||
| { | ||
| 'begin': '\\b(\\.)(assert|clear|debug|error|info|log|profile|profileEnd|time|timeEnd|warn)\\s*(?=\\()' |
Contributor
There was a problem hiding this comment.
\\s*(\\.)\\s*
Have to test for spaces here as well. I don't think we need the \\b anymore if we test for spaces.
Contributor
|
Overall looks pretty good. Left a few small comments. |
Contributor
|
Also, it would be great if we could tokenize this properly: console
.
log(); // <-- meta.function-call, no support.function.console.jsor console.
log();etc. Not just limited to something
.
hi(); |
Contributor
|
@MaximSokolov Is this ready for merge? It looks good to me. |
Contributor
Author
|
🚢 |
winstliu
pushed a commit
that referenced
this pull request
Feb 7, 2016
Fix function/method calls being superseded
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Continuation of #295
Fixes #294
Fixes #320
Replaces and closes #295