Fix missing scopes on separators and self, differentiate ->
#224
Conversation
|
Please review and approve this! |
| @@ -60,60 +60,88 @@ | |||
| ''' | |||
| 'patterns': [ | |||
| { | |||
| 'begin': '\\bclass\\b' | |||
There was a problem hiding this comment.
Do classes need to be at the start of the line per the previous ^\\s*class\\s* regex?
There was a problem hiding this comment.
No, classes can be declared after another statement on the same line.
grammars/ruby.cson
Outdated
| } | ||
| { | ||
| 'begin': '<<' | ||
| 'captures': |
grammars/ruby.cson
Outdated
| @@ -60,60 +60,88 @@ | |||
| ''' | |||
| 'patterns': [ | |||
| { | |||
| 'begin': '\\bclass\\b' | |||
| 'captures': | |||
grammars/ruby.cson
Outdated
| 'include': '#separators' | ||
| } | ||
| { | ||
| 'begin': '<<' |
There was a problem hiding this comment.
Seems like you could redo this as (<<)\\s* and directly add a contentName here to get rid of the inner pattern.
grammars/ruby.cson
Outdated
| ] | ||
| } | ||
| { | ||
| 'begin': '<' |
| } | ||
| { | ||
| 'begin': '\\bmodule\\b' |
grammars/ruby.cson
Outdated
| } | ||
| { | ||
| 'match': ';' | ||
| 'name': 'punctuation.separator.statement.ruby' |
There was a problem hiding this comment.
Generally tokenized as punctuation.terminator.statement
grammars/ruby.cson
Outdated
| } | ||
| { | ||
| 'match': ',' | ||
| 'name': 'punctuation.separator.object.ruby' |
There was a problem hiding this comment.
Generally tokenized as punctuation.separator.delimiter. Is , only for objects in Ruby?
There was a problem hiding this comment.
There are also commas in hashes so punctuation.separator.delimiter is indeed better.
There was a problem hiding this comment.
Is it okay if I replace all instances of punctuation.separator.object by the generic punctuation.separator.delimiter? Commas in method calls are tokenized by line 2325 but commas in method definitions have their own regexes.
grammars/ruby.cson
Outdated
| 'name': 'punctuation.separator.object.ruby' | ||
| } | ||
| { | ||
| 'match': '(::)\\s*(?=[A-Z])' |
There was a problem hiding this comment.
The \\s* can be in the lookahead.
There was a problem hiding this comment.
For some reason I thought lookaheads could only have a fixed number of characters.
|
@50Wliu I have a commit pending for |
|
Yes, I think what you're saying is fine. |
|
@50Wliu Do you have any other comments on this pull request? It looks ready to merge for me. |
|
Sorry for the delay @chbk, someone from the team will take a look as soon as they can. |
|
Thanks for the contribution 🙇🏾 @chbk |
Description of the Change
Added a
separatorsentry to the repositoryRewrote the grammar for class and module declarations with begin/end patterns:
punctuation.separator.inheritance.rubytopunctuation.separator.namespace.rubyfor consistencyentity.name.type.class.ruby,entity.name.type.module.rubyandentity.other.inherited-class.module.rubyto start with an uppercase letter and to exclude separatorsThis is now scoped properly:
Scoped commas in function declarations:
Scoped
selfand separators in function declarations:Unfortunately, I wasn't able to rewrite the grammar for function declarations with begin/end patterns. I used existing regular expressions to capture separators. Since the captures are placed inside repetition patterns
()*, only the last separator will be scoped. Not perfect, but still an improvement.Changed scopes for
->:support.function.kernel.arrow.rubyAdded specs
Applicable Issues
#221 Missing scope on commas
#222 Differentiate
->from other keywords#223 Namespace separator
::not scoped in class definition