Skip to content

Commit

Permalink
Enhance string and character highlighting.
Browse files Browse the repository at this point in the history 
Recognize escape sequences in character literals. Including octal and unicode.
Recognize escape sequences in double quoted strings. Including octal and unicode.
Recognize unicode escape sequences in triple quoted strings.
Use a `punctuation` scope for quote characters so that the string content
  is more easily distinguishable from the surrounding quotes.
Illegal escape sequences are given an `invalid.illegal...` scope so that they
  are easy to spot.
  • Loading branch information
@sellmerfud
sellmerfud committed May 19, 2012
1 parent 143886f commit 67da758
Showing 1 changed file with 97 additions and 17 deletions.
114 changes: 97 additions & 17 deletions Syntaxes/Scala.tmLanguage
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@
</dict>
<dict>
<key>include</key>
<string>#char-literal</string>
<string>#scala-symbol</string>
</dict>
<dict>
<key>include</key>
<string>#scala-symbol</string>
<string>#char-literal</string>
</dict>
<dict>
<key>include</key>
Expand Down Expand Up @@ -122,10 +122,55 @@
</dict>
<key>char-literal</key>
<dict>
<key>match</key>
<string>'\\?.'</string>
<key>begin</key>
<string>'</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.definition.character.begin.scala</string>
</dict>
</dict>
<key>end</key>
<string>'</string>
<key>endCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.definition.character.end.scala</string>
</dict>
</dict>
<key>name</key>
<string>constant.character.literal.scala</string>
<key>patterns</key>
<array>
<dict>
<key>match</key>
<string>\\(?:[btnfr\\"']|[0-7]{1,3}|u[0-9A-Fa-f]{4})</string>
<key>name</key>
<string>constant.character.escape.scala</string>
</dict>
<dict>
<key>match</key>
<string>\\.</string>
<key>name</key>
<string>invalid.illegal.unrecognized-character-escape.scala</string>
</dict>
<dict>
<key>match</key>
<string>[^']{2,}</string>
<key>name</key>
<string>invalid.illegal.character-literal-too-long</string>
</dict>
<dict>
<key>match</key>
<string>(?&lt;!')[^']</string>
<key>name</key>
<string>invalid.illegal.character-literal-too-long</string>
</dict>
</array>
</dict>
<key>comments</key>
<dict>
Expand Down Expand Up @@ -645,16 +690,10 @@
</dict>
<key>scala-symbol</key>
<dict>
<key>captures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>entity.name.symbol</string>
</dict>
</dict>
<key>match</key>
<string>('\w+)</string>
<string>'\w+(?=[^'\w])</string>
<key>name</key>
<string>entity.name.symbol</string>
</dict>
<key>storage-modifiers</key>
<dict>
Expand All @@ -681,31 +720,72 @@
<dict>
<key>begin</key>
<string>"""</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.definition.string.begin.scala</string>
</dict>
</dict>
<key>end</key>
<string>"""(?!")</string>
<key>endCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.definition.string.end.scala</string>
</dict>
</dict>
<key>name</key>
<string>string.quoted.triple.scala</string>
<key>patterns</key>
<array>
<dict>
<key>match</key>
<string>\\\\|\\u[0-9A-Fa-f]{4}</string>
<key>name</key>
<string>constant.character.escape.scala</string>
</dict>
</array>
</dict>
<dict>
<key>begin</key>
<string>(?&lt;!\\)"</string>
<string>"</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.definition.string.begin.scala</string>
</dict>
</dict>
<key>end</key>
<string>"</string>
<key>endCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.definition.string.end.scala</string>
</dict>
</dict>
<key>name</key>
<string>string.quoted.double.scala</string>
<key>patterns</key>
<array>
<dict>
<key>match</key>
<string>\n</string>
<string>\\(?:[btnfr\\"']|[0-7]{1,3}|u[0-9A-Fa-f]{4})</string>
<key>name</key>
<string>invalid.string.newline</string>
<string>constant.character.escape.scala</string>
</dict>
<dict>
<key>match</key>
<string>\\.</string>
<key>name</key>
<string>constant.character.escape.scala</string>
<string>invalid.illegal.unrecognized-string-escape.scala</string>
</dict>
</array>
</dict>
Expand Down

0 comments on commit 67da758

Please sign in to comment.