Fix detection of imports with trailing comments

nishtahir · Apr 30, 2024 · 4886027 · 4886027
1 parent 559bd2f
commit 4886027
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/dist/Kotlin.JSON-tmLanguage b/dist/Kotlin.JSON-tmLanguage
@@ -453,7 +453,7 @@
     "imports": {
       "patterns": [
         {
-          "match": "^\\s*(import)\\s+((?:[`][^$`]+[`]|[^` $.]+)(?:\\.(?:[`][^$`]+[`]|[^` $.]+))*)(?:\\s+(as)\\s+([`][^$`]+[`]|[^` $.]+))?$",
+          "match": "^\\s*(import)\\s+((?:[`][^$`]+[`]|[^` $.]+)(?:\\.(?:[`][^$`]+[`]|[^` $.]+))*)(?:\\s+(as)\\s+([`][^$`]+[`]|[^` $.]+))?",
           "captures": {
             "1": {
               "name": "keyword.other.import.kotlin"

diff --git a/dist/Kotlin.YAML-tmLanguage b/dist/Kotlin.YAML-tmLanguage
@@ -125,7 +125,7 @@ repository:
     imports:
         patterns:
             -
-                match: '^\s*(import)\s+((?:[`][^$`]+[`]|[^` $.]+)(?:\.(?:[`][^$`]+[`]|[^` $.]+))*)(?:\s+(as)\s+([`][^$`]+[`]|[^` $.]+))?$'
+                match: '^\s*(import)\s+((?:[`][^$`]+[`]|[^` $.]+)(?:\.(?:[`][^$`]+[`]|[^` $.]+))*)(?:\s+(as)\s+([`][^$`]+[`]|[^` $.]+))?'
                 captures:
                     '1': {name: keyword.other.import.kotlin}
                     '2': {name: storage.modifier.import.kotlin}

diff --git a/dist/Kotlin.tmLanguage b/dist/Kotlin.tmLanguage
@@ -686,7 +686,7 @@
         <array>
           <dict>
             <key>match</key>
-            <string>^\s*(import)\s+((?:[`][^$`]+[`]|[^` $.]+)(?:\.(?:[`][^$`]+[`]|[^` $.]+))*)(?:\s+(as)\s+([`][^$`]+[`]|[^` $.]+))?$</string>
+            <string>^\s*(import)\s+((?:[`][^$`]+[`]|[^` $.]+)(?:\.(?:[`][^$`]+[`]|[^` $.]+))*)(?:\s+(as)\s+([`][^$`]+[`]|[^` $.]+))?</string>
             <key>captures</key>
             <dict>
               <key>1</key>

diff --git a/src/imports.YAML-tmLanguage b/src/imports.YAML-tmLanguage
@@ -2,7 +2,7 @@ repository:
     imports:
         patterns:
             -
-                match: '^\s*(import)\s+((?:[`][^$`]+[`]|[^` $.]+)(?:\.(?:[`][^$`]+[`]|[^` $.]+))*)(?:\s+(as)\s+([`][^$`]+[`]|[^` $.]+))?$'
+                match: '^\s*(import)\s+((?:[`][^$`]+[`]|[^` $.]+)(?:\.(?:[`][^$`]+[`]|[^` $.]+))*)(?:\s+(as)\s+([`][^$`]+[`]|[^` $.]+))?'
                 captures:
                     '1':
                         name: keyword.other.import.kotlin

diff --git a/src/literals.YAML-tmLanguage b/src/literals.YAML-tmLanguage
@@ -71,8 +71,6 @@ repository:
                             -
                                 include: '#string-content'
                 repository:
-                    # https://kotlinlang.org/docs/strings.html#raw-strings
-                    # Raw strings do not contain escape sequences.
                     raw-string-content:
                         patterns:
                             -

diff --git a/test/Imports.test.kt b/test/Imports.test.kt
@@ -31,4 +31,21 @@
 //                                         ^ source.kotlin meta.import.kotlin
 //                                          ^^ source.kotlin meta.import.kotlin keyword.other.kotlin
 //                                            ^ source.kotlin meta.import.kotlin
-//                                             ^^^^ source.kotlin meta.import.kotlin entity.name.type
+//                                             ^^^^ source.kotlin meta.import.kotlin entity.name.type
+
+  import com.google.test.CommentedClass // comment
+//^^^^^^ source.kotlin meta.import.kotlin keyword.other.import.kotlin
+//      ^ source.kotlin meta.import.kotlin
+//       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.kotlin meta.import.kotlin storage.modifier.import.kotlin
+//                                      ^^ source.kotlin punctuation.definition.comment.kotlin comment.line.double-slash.kotlin
+
+  import com.google.test.CommentedClass /*comment*/ as Another
+//^^^^^^ source.kotlin meta.import.kotlin keyword.other.import.kotlin
+//      ^ source.kotlin meta.import.kotlin
+//       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.kotlin meta.import.kotlin storage.modifier.import.kotlin
+//                                      ^^ source.kotlin comment.block.kotlin punctuation.definition.comment.begin.kotlin
+//                                               ^^ source.kotlin comment.block.kotlin punctuation.definition.comment.end.kotlin
+//                                                 ^ source.kotlin
+//                                                  ^^ source.kotlin keyword.operator.kotlin
+//                                                    ^ source.kotlin
+//                                                     ^^^^^^^ source.kotlin entity.name.type.class.kotlin