Fix interpolated name in type constructors (#52)

JuliaEditorSupport · Apr 26, 2017 · da05d94 · da05d94
1 parent 5fae5bd
commit da05d94
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Julia.sublime-syntax b/Julia.sublime-syntax
@@ -437,7 +437,8 @@ contexts:
       set: function-parameters
 
   decl-type:
-    - match: \b(mutable struct|type|struct|immutable|abstract type|abstract|primitive type)\s+({{symb_id}}+)({{nested_curly}})?
+    # Dollar is ok because type names can be interpolated.
+    - match: \b(mutable struct|type|struct|immutable|abstract type|abstract|primitive type)\s+((?:\$|{{symb_id}})+)({{nested_curly}})?
       scope: meta.type.julia
       captures:
         1: keyword.other.julia

diff --git a/syntax_test_julia.jl b/syntax_test_julia.jl
@@ -423,7 +423,7 @@
 #           ^^^ support.type
 #               ^^^ keyword.other
   mutable struct Foo{T} end
-# ^^^^^^ keyword.other
+# ^^^^^^^ keyword.other
 #         ^^^^^^ keyword.other
 #                ^^^ entity.name.type
 #                   ^^^ support.type
@@ -441,6 +441,14 @@
 #                     ^^ constant.numeric
 #                        ^^^ keyword.other
 
+# (issue 52)
+  mutable struct $Foo{T} end
+# ^^^^^^^ keyword.other
+#         ^^^^^^ keyword.other
+#                ^^^^ entity.name.type
+#                    ^^^ support.type
+#                        ^^^ keyword.other
+
 
 ##
 ## FUNCTION DEFINITIONS