Adds recognition of char literals (Fixes #36) (#37)

nishtahir · Feb 7, 2021 · e2b7595 · e2b7595
1 parent 66f983e
commit e2b7595
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 1 deletion.
diff --git a/dist/Kotlin.JSON-tmLanguage b/dist/Kotlin.JSON-tmLanguage
@@ -749,6 +749,26 @@
                   "include": "#string-content"
                 }
               ]
+            },
+            {
+              "begin": "'",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.begin.kotlin"
+                }
+              },
+              "end": "'",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.end.kotlin"
+                }
+              },
+              "name": "string.quoted.single.kotlin",
+              "patterns": [
+                {
+                  "include": "#string-content"
+                }
+              ]
             }
           ],
           "repository": {

diff --git a/dist/Kotlin.YAML-tmLanguage b/dist/Kotlin.YAML-tmLanguage
@@ -298,6 +298,7 @@ repository:
                 patterns:
                     - {begin: '"""', beginCaptures: {'0': {name: punctuation.definition.string.begin.kotlin}}, end: '"""(?!")', endCaptures: {'0': {name: punctuation.definition.string.end.kotlin}}, name: string.quoted.triple.kotlin, patterns: [{include: '#string-content'}]}
                     - {begin: '(?!'')"(?!'')', beginCaptures: {'0': {name: punctuation.definition.string.begin.kotlin}}, end: '"', endCaptures: {'0': {name: punctuation.definition.string.end.kotlin}}, name: string.quoted.double.kotlin, patterns: [{include: '#string-content'}]}
+                    - {begin: '''', beginCaptures: {'0': {name: punctuation.definition.string.begin.kotlin}}, end: '''', endCaptures: {'0': {name: punctuation.definition.string.end.kotlin}}, name: string.quoted.single.kotlin, patterns: [{include: '#string-content'}]}
                 repository:
                     string-content: {patterns: [{match: '\\[0\\tnr"'']', name: constant.character.escape.kotlin}, {match: '\\(x[\da-fA-F]{2}|u[\da-fA-F]{4}|.)', name: constant.character.escape.unicode.kotlin}, {begin: '\$(\{)', beginCaptures: {'1': {name: punctuation.section.block.begin.kotlin}}, end: '\}', endCaptures: {'0': {name: punctuation.section.block.end.kotlin}}, name: entity.string.template.element.kotlin}, {match: '\$[a-zA-Z_]\w*', name: entity.string.template.element.kotlin}]}
             'null':

diff --git a/dist/Kotlin.tmLanguage b/dist/Kotlin.tmLanguage
@@ -1133,6 +1133,37 @@
                   </dict>
                 </array>
               </dict>
+              <dict>
+                <key>begin</key>
+                <string>'</string>
+                <key>beginCaptures</key>
+                <dict>
+                  <key>0</key>
+                  <dict>
+                    <key>name</key>
+                    <string>punctuation.definition.string.begin.kotlin</string>
+                  </dict>
+                </dict>
+                <key>end</key>
+                <string>'</string>
+                <key>endCaptures</key>
+                <dict>
+                  <key>0</key>
+                  <dict>
+                    <key>name</key>
+                    <string>punctuation.definition.string.end.kotlin</string>
+                  </dict>
+                </dict>
+                <key>name</key>
+                <string>string.quoted.single.kotlin</string>
+                <key>patterns</key>
+                <array>
+                  <dict>
+                    <key>include</key>
+                    <string>#string-content</string>
+                  </dict>
+                </array>
+              </dict>
             </array>
             <key>repository</key>
             <dict>

diff --git a/src/literals.YAML-tmLanguage b/src/literals.YAML-tmLanguage
@@ -57,6 +57,19 @@ repository:
                         patterns:
                             -
                                 include: '#string-content'
+                    -
+                        begin: ''''
+                        beginCaptures:
+                            '0':
+                                name: punctuation.definition.string.begin.kotlin
+                        end: ''''
+                        endCaptures:
+                            '0':
+                                name: punctuation.definition.string.end.kotlin
+                        name: string.quoted.single.kotlin
+                        patterns:
+                            -
+                                include: '#string-content'
                 repository:
                     string-content:
                         patterns:

diff --git a/test/literals.test.kt b/test/literals.test.kt
@@ -172,9 +172,19 @@
   foo('"')
 //^^^ source.kotlin
 //   ^ source.kotlin meta.group.kotlin punctuation.section.group.begin.kotlin
-//    ^^^ source.kotlin meta.group.kotlin
+//    ^ source.kotlin meta.group.kotlin string.quoted.single.kotlin punctuation.definition.string.begin.kotlin
+//     ^ source.kotlin meta.group.kotlin string.quoted.single.kotlin
+//      ^ source.kotlin meta.group.kotlin string.quoted.single.kotlin punctuation.definition.string.end.kotlin
 //       ^ source.kotlin meta.group.kotlin punctuation.section.group.end.kotlin
 
+  foo('\'')
+//^^^ source.kotlin
+//   ^ source.kotlin meta.group.kotlin punctuation.section.group.begin.kotlin
+//    ^ source.kotlin meta.group.kotlin string.quoted.single.kotlin punctuation.definition.string.begin.kotlin
+//     ^^ source.kotlin meta.group.kotlin string.quoted.single.kotlin constant.character.escape.kotlin
+//       ^ source.kotlin meta.group.kotlin string.quoted.single.kotlin punctuation.definition.string.end.kotlin
+//        ^ source.kotlin meta.group.kotlin punctuation.section.group.end.kotlin
+
   foo(""""."""")
 //^^^ source.kotlin
 //   ^ source.kotlin meta.group.kotlin punctuation.section.group.begin.kotlin