Parse unqualified type imports with 'type Typename' (#73)

gleam-lang · Oct 29, 2023 · e566689 · e566689
1 parent f1fa70c
commit e566689
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/grammar.js b/grammar.js
@@ -92,6 +92,7 @@ module.exports = grammar({
           optional(seq("as", field("alias", $.identifier)))
         ),
         seq(
+          optional("type"),
           field("name", $.type_identifier),
           optional(seq("as", field("alias", $.type_identifier)))
         )

diff --git a/queries/highlights.scm b/queries/highlights.scm
@@ -21,6 +21,8 @@
 
 ; Functions
 (unqualified_import (identifier) @function)
+(unqualified_import "type" (type_identifier) @type)
+(unqualified_import (type_identifier) @constructor)
 (function
   name: (identifier) @function)
 (external_function

diff --git a/test/corpus/imports.txt b/test/corpus/imports.txt
@@ -86,3 +86,25 @@ import animal.{}
   (import
     module: (module)
     imports: (unqualified_imports)))
+
+================================================================================
+Type imports
+================================================================================
+
+import a/b.{type C}
+import animal.{type Cat as Kitty}
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (import
+    module: (module)
+    imports: (unqualified_imports
+      (unqualified_import
+        name: (type_identifier))))
+  (import
+    module: (module)
+    imports: (unqualified_imports
+      (unqualified_import
+        name: (type_identifier)
+        alias: (type_identifier)))))
diff --git a/test/highlight/modules.gleam b/test/highlight/modules.gleam
@@ -6,6 +6,11 @@ import animal/cat as kitty
 //      ^ module
 //                    ^ module
 
+import animal/cat.{Cat, type Cat}
+//                  ^ constructor
+//                        ^ keyword
+//                            ^ type
+
 pub fn main() {
   io.println("hello world")
   // <- module