feat: support using directive for scala-cli

related to: VirtusLab/scala-cli#1059
scala · Jul 22, 2022 · 31ac9b0 · 31ac9b0
1 parent fbd1508
commit 31ac9b0
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 7 deletions.
diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts
@@ -226,6 +226,9 @@ export const scalaTmLanguage: TmLanguage = {
     },
     code: {
       patterns: [
+        {
+          include: '#using-directive'
+        },
         {
           include: '#script-header'
         },
@@ -960,6 +963,35 @@ export const scalaTmLanguage: TmLanguage = {
       comment: 'For themes: Matching view bounds',
       name: 'meta.bounds.scala'
     },
+    'using-directive': {
+      end: '\\n',
+      begin: '^\\s*(//>)\\s*(using)[^\\S\\n]+',
+      beginCaptures: {
+        '1': {
+          name: 'punctuation.definition.comment.scala'
+        },
+        '2': {
+          name: 'keyword.other.import.scala'
+        }
+      },
+      patterns: [
+        {
+          match: `${idUpper}|${backQuotedId}|${plainid}`,
+          name: 'entity.name.import.scala'
+        },
+        {
+          match: '\\.',
+          name: 'punctuation.definition.import'
+        },
+        {
+          include: '#strings'
+        },
+        {
+          include: '#constants'
+        },
+      ],
+      name: 'comment.line.shebang.scala'
+    },
     comments: {
       patterns: [
         {

diff --git a/syntaxes/Scala.tmLanguage.json b/syntaxes/Scala.tmLanguage.json
diff --git a/tests/snap/comments.test.scala b/tests/snap/comments.test.scala
@@ -1,7 +1,13 @@
 /// SYNTAX TEST "source.scala"
 #!/usr/bin/env scala
 
-// single line comments
+//> using packaging.version "1.0.0"
+//> using scala 2.13
+// > using this.is comment
+// //> using comment "out"
+
+//> using
+object X
 
 /*  /**/ /** */ /* comments within comments */ */
 
@@ -138,4 +144,4 @@ object Markup {
   *   1. Third item
   */
   def lists = ()
-}
+}
diff --git a/tests/snap/comments.test.scala.snap b/tests/snap/comments.test.scala.snap
@@ -5,9 +5,40 @@
 #^^ source.scala comment.block.shebang.scala
 #  ^^^^^^^^^^^^^^^^^^ source.scala comment.block.shebang.scala string.unquoted.shebang.scala
 >
->// single line comments
+>//> using packaging.version "1.0.0"
+#^^^ source.scala comment.line.shebang.scala punctuation.definition.comment.scala
+#   ^ source.scala comment.line.shebang.scala
+#    ^^^^^ source.scala comment.line.shebang.scala keyword.other.import.scala
+#         ^ source.scala comment.line.shebang.scala
+#          ^^^^^^^^^ source.scala comment.line.shebang.scala entity.name.import.scala
+#                   ^ source.scala comment.line.shebang.scala punctuation.definition.import
+#                    ^^^^^^^ source.scala comment.line.shebang.scala entity.name.import.scala
+#                           ^ source.scala comment.line.shebang.scala
+#                            ^ source.scala comment.line.shebang.scala string.quoted.double.scala punctuation.definition.string.begin.scala
+#                             ^^^^^ source.scala comment.line.shebang.scala string.quoted.double.scala
+#                                  ^ source.scala comment.line.shebang.scala string.quoted.double.scala punctuation.definition.string.end.scala
+>//> using scala 2.13
+#^^^ source.scala comment.line.shebang.scala punctuation.definition.comment.scala
+#   ^ source.scala comment.line.shebang.scala
+#    ^^^^^ source.scala comment.line.shebang.scala keyword.other.import.scala
+#         ^ source.scala comment.line.shebang.scala
+#          ^^^^^ source.scala comment.line.shebang.scala entity.name.import.scala
+#               ^ source.scala comment.line.shebang.scala
+#                ^^^^ source.scala comment.line.shebang.scala constant.numeric.scala
+>// > using this.is comment
 #^^ source.scala comment.line.double-slash.scala punctuation.definition.comment.scala
-#  ^^^^^^^^^^^^^^^^^^^^^ source.scala comment.line.double-slash.scala
+#  ^^^^^^^^^^^^^^^^^^^^^^^^ source.scala comment.line.double-slash.scala
+>// //> using comment "out"
+#^^ source.scala comment.line.double-slash.scala punctuation.definition.comment.scala
+#  ^^^^^^^^^^^^^^^^^^^^^^^^ source.scala comment.line.double-slash.scala
+>
+>//> using
+#^^ source.scala comment.line.double-slash.scala punctuation.definition.comment.scala
+#  ^^^^^^^ source.scala comment.line.double-slash.scala
+>object X
+#^^^^^^ source.scala keyword.declaration.scala
+#      ^ source.scala
+#       ^ source.scala entity.name.class.declaration
 >
 >/*  /**/ /** */ /* comments within comments */ */
 #^^ source.scala comment.block.scala punctuation.definition.comment.scala
@@ -521,4 +552,5 @@
 #             ^ source.scala
 #              ^^ source.scala meta.parentheses.scala meta.bracket.scala
 >}
-#^ source.scala punctuation.section.block.end.scala
+#^ source.scala punctuation.section.block.end.scala
+>
diff --git a/tests/snap/end.test.scala.snap b/tests/snap/end.test.scala.snap
@@ -250,4 +250,4 @@
 #^^^ source.scala keyword.declaration.end.scala
 #   ^ source.scala
 #    ^^ source.scala entity.name.declaration
->
+>