Add operators subscopes #225

MaximSokolov · 2015-09-17T20:36:06Z

Closes #188
Supersedes and closes #222

~~It's not correct for some cases:~~ Has been reverted

// ':' isn't `keyword.operator.conditional.ternary`
var obj = { a: "b"}

// e.g. '+' operator can be used for concatenation
// it's `keyword.operator.arithmetic`
"str1" + "str2"
var1 + var2

winstliu · 2015-09-23T00:12:25Z

grammars/javascript.cson

@@ -461,7 +463,7 @@
  }
  {
    'match': '(?<!\\.)\\b(delete|in|of|instanceof|new|typeof|void)(?!\\s*:)\\b'
-    'name': 'keyword.operator.js'
+    'name': 'keyword.operator.$1.js'


Can I have your reasoning behind this change?

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

MaximSokolov · 2015-09-23T18:05:17Z

Changed:

Revert ?, : to keyword.operator
keyword.operator.assignment for : (when it is assignment of course)

augmented sounds really weird to me :/
Anyone have suggestions for a different name?

Python, Ruby use assignment.augmented I guess it means assignment augmented by another operator.

MaximSokolov · 2015-10-23T09:27:16Z

Should I revert 'keyword.operator.arithmetic' -> 'keyword.operator' for *, /, -, %, + operators?

Victorystick · 2015-10-23T10:28:57Z

@MaximSokolov That sounds like a good idea. We can't be sure that a + is used for arithmetic or concatenation. :)

winstliu · 2015-11-01T19:36:36Z

@MaximSokolov I'd suggest to change it as well.

MaximSokolov · 2015-11-01T20:46:59Z

Is keyword.operator.assignment.compound ok for %=, +=, -=, *= ... ?
(instead of ...assignment.augmented)

winstliu · 2015-11-01T21:37:47Z

Sounds better to me 😆.
/cc @atom/feedback

mehcode · 2015-11-01T21:51:05Z

As a (self proclaimed) language designer, compound is more correct (as you are joining two distinct operators into a new operator, now composed of two parts). People started calling it augmented with scripting languages (C, Java, etc. always called it compound).

winstliu · 2015-11-04T12:45:57Z

grammars/javascript.cson

+        'name': 'keyword.operator.bitwise.js'
+      }
+      {
+        'match': '\\?|\\:'


: doesn't need to be escaped

winstliu · 2015-11-04T12:46:26Z

grammars/javascript.cson

+        'name': 'keyword.operator.assignment.js'
+      }
+      {
+        'match': '\\-\\-'


-- doesn't need to be escaped

winstliu · 2015-11-04T13:04:43Z

grammars/javascript.cson

@@ -857,8 +859,43 @@
  'operators':
    'patterns': [
      {
-        'match': '!=|!==|<=|>=|<<=|>>=|>>>=|\\*=|(?<!\\()/=|%=|\\+=|\\-=|&=|\\^=|!|%|&|\\*|/|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|<>|<|>|!|&&|\\|\\||\\?|\\:|\\^'
-        'comment': 'match 2-character operator first'
+        'match': '%=|\\+=|\\-=|\\*=|(?<!\\()/='


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

Add operators subscopes

winstliu · 2015-11-04T13:43:20Z

Woo!

smaili · 2015-11-04T16:55:37Z

👍

winstliu added needs-review requires-changes labels Sep 17, 2015

winstliu reviewed Sep 23, 2015
View reviewed changes

winstliu mentioned this pull request Oct 7, 2015

Distinguish comparison operators #222

Closed

winstliu mentioned this pull request Nov 1, 2015

Ligatures for strict inequality operator (!==) broken atom/atom#9372

Closed

MaximSokolov added 15 commits November 2, 2015 15:54

🎨 Cleanup operators specs

889a1ab

✅ Test all arithmetic operators on newlines

c4f8904

✅ Test arithmetic operators

26d230a

Tokenize --, ++ as keyword.operator.(in|de)crement

3b02d17

Tokenize = as keyword.operator.assignment

bc628b5

Tokenize : as keyword.operator.assignment

7c9a840

Tokenize compound assignment operators as 'assignment.compound`

872e734

Tokenize bitwise assignment as ...assignment.compound.bitwise

4351917

Tokenize logical operators as keyword.operator.logical

ec8cfb2

Tokenize comparison operators as keyword.operator.comparison

4c0a084

Tokenize bitwise operators as keyword.operator.bitwise

30492d4

✅ Test conditional ternary '?', ':' operators

f303833

keyword.operator -> keyword.operator.<token>

1fb23b9

🔥 Remove '<>' operator

fc8d57f

🎨

a3401e7

winstliu reviewed Nov 4, 2015
View reviewed changes

grammars/javascript.cson

'name': 'keyword.operator.bitwise.js'

}

{

'match': '\\?|\\:'

Copy link

Contributor

winstliu Nov 4, 2015

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

winstliu reviewed Nov 4, 2015
View reviewed changes

grammars/javascript.cson

'name': 'keyword.operator.assignment.js'

}

{

'match': '\\-\\-'

Copy link

Contributor

winstliu Nov 4, 2015

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

🎨

19066da

winstliu added under-review and removed needs-review requires-changes labels Nov 4, 2015

winstliu reviewed Nov 4, 2015
View reviewed changes

MaximSokolov added 2 commits November 4, 2015 16:12

📝

66e2d8e

🎨

7fb69c3

winstliu pushed a commit that referenced this pull request Nov 4, 2015

Merge pull request #225 from MaximSokolov/add-operators-subscopes

8ffbb11

Add operators subscopes

winstliu merged commit 8ffbb11 into atom:master Nov 4, 2015

MaximSokolov deleted the add-operators-subscopes branch November 4, 2015 13:46

This was referenced Nov 7, 2015

Provide means to separate non-alpha-numeric keywords from the rest #162

Closed

Fix not equal as one operator !== is not != and = #252

Closed

MaximSokolov mentioned this pull request Nov 18, 2015

Operators are sometimes split into two keyword elements #259

Closed

arrowrowe mentioned this pull request Dec 22, 2015

Weekly for 2015/12/23 dyweb/web-stuff#26

Closed

7 tasks

MaxMood96 mentioned this pull request Sep 16, 2023

[Snyk] Upgrade tree-sitter-javascript from 0.19.0 to 0.20.1 MaxMood96/language-javascript#7

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add operators subscopes #225

Add operators subscopes #225

MaximSokolov commented Sep 17, 2015

winstliu Sep 23, 2015

MaximSokolov Sep 23, 2015

MaximSokolov commented Sep 23, 2015

MaximSokolov commented Oct 23, 2015

Victorystick commented Oct 23, 2015

winstliu commented Nov 1, 2015

MaximSokolov commented Nov 1, 2015

winstliu commented Nov 1, 2015

mehcode commented Nov 1, 2015

winstliu Nov 4, 2015

winstliu Nov 4, 2015

winstliu Nov 4, 2015

winstliu commented Nov 4, 2015

smaili commented Nov 4, 2015

Add operators subscopes #225

Add operators subscopes #225

Conversation

MaximSokolov commented Sep 17, 2015

winstliu Sep 23, 2015

Choose a reason for hiding this comment

MaximSokolov Sep 23, 2015

Choose a reason for hiding this comment

MaximSokolov commented Sep 23, 2015

MaximSokolov commented Oct 23, 2015

Victorystick commented Oct 23, 2015

winstliu commented Nov 1, 2015

MaximSokolov commented Nov 1, 2015

winstliu commented Nov 1, 2015

mehcode commented Nov 1, 2015

winstliu Nov 4, 2015

Choose a reason for hiding this comment

winstliu Nov 4, 2015

Choose a reason for hiding this comment

winstliu Nov 4, 2015

Choose a reason for hiding this comment

winstliu commented Nov 4, 2015

smaili commented Nov 4, 2015