Skip to content

Commit

Permalink
Kotlin GA: fix comparison operators, add modify-assign operators
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergey Mashkov committed Mar 11, 2016
1 parent 6517a1c commit 023710b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
6 changes: 5 additions & 1 deletion Kotlin.JSON-tmLanguage
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@
"name": "keyword.operator.kotlin"
},
{
"match": "(==|!=|<=|>=|<>|<|>)",
"match": "(==|!=|===|!==|<=|>=|<|>)",
"name": "keyword.operator.comparison.kotlin"
},
{
Expand All @@ -746,6 +746,10 @@
"match": "(\\-\\-|\\+\\+)",
"name": "keyword.operator.increment-decrement.kotlin"
},
{
"match": "(\\+=|\\-=|\\*=|\\/=)",
"name": "keyword.operator.arithmetic.assign.kotlin"
},
{
"match": "(\\-|\\+|\\*|\\/|%)",
"name": "keyword.operator.arithmetic.kotlin"
Expand Down
8 changes: 7 additions & 1 deletion Kotlin.tmLanguage
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@
</dict>
<dict>
<key>match</key>
<string>(==|!=|&lt;=|&gt;=|&lt;&gt;|&lt;|&gt;)</string>
<string>(==|!=|===|!==|&lt;=|&gt;=|&lt;|&gt;)</string>
<key>name</key>
<string>keyword.operator.comparison.kotlin</string>
</dict>
Expand Down Expand Up @@ -625,6 +625,12 @@
<key>name</key>
<string>keyword.operator.arithmetic.kotlin</string>
</dict>
<dict>
<key>match</key>
<string>(\+=|\-=|\*=|\/=)</string>
<key>name</key>
<string>keyword.operator.arithmetic.assign.kotlin</string>
</dict>
<dict>
<key>match</key>
<string>(!|&amp;&amp;|\|\|)</string>
Expand Down

0 comments on commit 023710b

Please sign in to comment.