Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Add operators subscopes #225

Merged
merged 18 commits into from
Nov 4, 2015
Merged

Add operators subscopes #225

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
889a1ab
:art: Cleanup operators specs
MaximSokolov Sep 23, 2015
c4f8904
:white_check_mark: Test all arithmetic operators on newlines
MaximSokolov Sep 17, 2015
26d230a
:white_check_mark: Test arithmetic operators
MaximSokolov Oct 23, 2015
3b02d17
Tokenize `--`, `++` as `keyword.operator.(in|de)crement`
MaximSokolov Sep 23, 2015
bc628b5
Tokenize `=` as `keyword.operator.assignment`
MaximSokolov Sep 23, 2015
7c9a840
Tokenize `:` as `keyword.operator.assignment`
MaximSokolov Sep 23, 2015
872e734
Tokenize compound assignment operators as 'assignment.compound`
MaximSokolov Nov 2, 2015
4351917
Tokenize bitwise assignment as `...assignment.compound.bitwise`
MaximSokolov Sep 17, 2015
ec8cfb2
Tokenize logical operators as `keyword.operator.logical`
MaximSokolov Sep 17, 2015
4c0a084
Tokenize comparison operators as `keyword.operator.comparison`
MaximSokolov Sep 17, 2015
30492d4
Tokenize bitwise operators as `keyword.operator.bitwise`
MaximSokolov Sep 17, 2015
f303833
:white_check_mark: Test conditional ternary '?', ':' operators
MaximSokolov Sep 23, 2015
1fb23b9
`keyword.operator` -> `keyword.operator.<token>`
MaximSokolov Sep 23, 2015
fc8d57f
:fire: Remove '<>' operator
MaximSokolov Sep 17, 2015
a3401e7
:art:
MaximSokolov Sep 23, 2015
19066da
:art:
MaximSokolov Nov 4, 2015
66e2d8e
:memo:
MaximSokolov Nov 4, 2015
7fb69c3
:art:
MaximSokolov Nov 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 53 additions & 16 deletions grammars/javascript.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
'2':
'name': 'support.constant.js'
'3':
'name': 'keyword.operator.js'
'name': 'keyword.operator.assignment.js'
'comment': 'match stuff like: Sound.prototype = { … } when extending an object'
'match': '([a-zA-Z_?.$][\\w?.$]*)\\.(prototype)\\s*(=)\\s*'
'name': 'meta.class.js'
Expand All @@ -282,7 +282,7 @@
'3':
'name': 'entity.name.function.js'
'4':
'name': 'keyword.operator.js'
'name': 'keyword.operator.assignment.js'
'5':
'name': 'storage.modifier.js'
'6':
Expand Down Expand Up @@ -312,7 +312,7 @@
'3':
'name': 'entity.name.function.js'
'4':
'name': 'keyword.operator.js'
'name': 'keyword.operator.assignment.js'
'comment': 'match stuff like: Sound.prototype.play = myfunc'
'match': '([a-zA-Z_?.$][\\w?.$]*)\\.(prototype)\\.([a-zA-Z_?.$][\\w?.$]*)\\s*(=)\\s*'
'name': 'meta.function.js'
Expand All @@ -325,7 +325,7 @@
'2':
'name': 'entity.name.function.js'
'3':
'name': 'keyword.operator.js'
'name': 'keyword.operator.assignment.js'
'4':
'name': 'storage.modifier.js'
'5':
Expand Down Expand Up @@ -354,7 +354,7 @@
'1':
'name': 'entity.name.function.js'
'2':
'name': 'keyword.operator.js'
'name': 'keyword.operator.assignment.js'
'3':
'name': 'storage.modifier.js'
'4':
Expand Down Expand Up @@ -408,7 +408,7 @@
'1':
'name': 'entity.name.function.js'
'2':
'name': 'keyword.operator.js'
'name': 'keyword.operator.assignment.js'
'3':
'name': 'storage.modifier.js'
'4':
Expand Down Expand Up @@ -451,7 +451,7 @@
'8':
'name': 'punctuation.definition.string.end.js'
'9':
'name': 'keyword.operator.js'
'name': 'keyword.operator.assignment.js'
'10':
'name': 'storage.modifier.js'
'11':
Expand Down Expand Up @@ -538,7 +538,7 @@
'1':
'name': 'entity.name.function.js'
'2':
'name': 'keyword.operator.js'
'name': 'keyword.operator.assignment.js'
'3':
'name': 'punctuation.definition.parameters.begin.js'
'end': '(\\))(\\s*=>)'
Expand All @@ -563,7 +563,7 @@
'2':
'name': 'entity.name.function.js'
'3':
'name': 'keyword.operator.js'
'name': 'keyword.operator.assignment.js'
'4':
'name': 'punctuation.definition.parameters.begin.js'
'end': '(\\))(\\s*=>)'
Expand Down Expand Up @@ -634,18 +634,20 @@
'beginCaptures':
'1':
'name': 'storage.modifier.js'
'end': '(=|\\bof\\b|\\bin\\b)|(;)|(?<!,)\\n'
'end': '(\\bof\\b|\\bin\\b)|(;)|(=)|(?<!,)\\n'
'endCaptures':
'1':
'name': 'keyword.operator.js'
'name': 'keyword.operator.$1.js'
'2':
'name': 'punctuation.terminator.statement.js'
'3':
'name': 'keyword.operator.assignment.js'
'patterns': [
{
'match': '([$_a-zA-Z][$_a-zA-Z0-9]*)\\s*(:)\\s*([$_a-zA-Z][$_a-zA-Z0-9]*)?'
'captures':
'2':
'name': 'keyword.operator.js'
'name': 'keyword.operator.assignment.js'
'3':
'name': 'constant.other.js'
}
Expand Down Expand Up @@ -703,7 +705,7 @@
}
{
'match': '(?<!\\.)\\b(delete|in|of|instanceof|new|typeof|void)(?!\\s*:)\\b'
'name': 'keyword.operator.js'
'name': 'keyword.operator.$1.js'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can I have your reasoning behind this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It makes possible to change highlighting for each of these operators.

}
{
'match': '(?<!\\.)\\b(true|false)(?!\\s*:)\\b|(?<=\\?)(?:\\s*)(true|false)(?=\\s*:)'
Expand Down Expand Up @@ -857,8 +859,43 @@
'operators':
'patterns': [
{
'match': '!=|!==|<=|>=|<<=|>>=|>>>=|\\*=|(?<!\\()/=|%=|\\+=|\\-=|&=|\\^=|!|%|&|\\*|/|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|<>|<|>|!|&&|\\|\\||\\?|\\:|\\^'
'comment': 'match 2-character operator first'
'match': '%=|\\+=|\\-=|\\*=|(?<!\\()/='
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Final nit: The - here doesn't need to be escaped either.

'name': 'keyword.operator.assignment.compound.js'
}
{
'match': '&=|\\^=|<<=|>>=|>>>=|\\|='
'name': 'keyword.operator.assignment.compound.bitwise.js'
}
{
'match': '!==|!=|<=|>=|===|==|<|>'
'name': 'keyword.operator.comparison.js'
}
{
'match': '&&|!|\\|\\|'
'name': 'keyword.operator.logical.js'
}
{
'match': '&|\\||\\^|~'
'name': 'keyword.operator.bitwise.js'
}
{
'match': '\\?|\\:'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

: doesn't need to be escaped

'name': 'keyword.operator.js'
}
{
'match': '\\='
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

= doesn't need to be escaped

'name': 'keyword.operator.assignment.js'
}
{
'match': '\\-\\-'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-- doesn't need to be escaped

'name': 'keyword.operator.decrement.js'
}
{
'match': '\\+\\+'
'name': 'keyword.operator.increment.js'
}
{
'match': '%|\\*|/|\\-|\\+'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

- doesn't need to be escaped

'name': 'keyword.operator.js'
}
]
Expand Down Expand Up @@ -981,7 +1018,7 @@
}
{
'match': '='
'name': 'keyword.operator.js'
'name': 'keyword.operator.assignment.js'
}
{
'include': '#comments'
Expand Down
Loading