feat: capture generic function declarations (#58)

templ-go · May 30, 2024 · 4f85ade · 4f85ade
1 parent 913c9b8
commit 4f85ade
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 83 deletions.
diff --git a/syntaxes/templ.tmLanguage.json b/syntaxes/templ.tmLanguage.json
@@ -170,7 +170,7 @@
       ]
     },
     "html-template": {
-      "begin": "^(templ) ((?:\\([A-z_][A-z_0-9]* \\*?[A-z_][A-z_0-9]*\\) )?[A-z_][A-z_0-9]*\\()",
+      "begin": "^(templ) ((?:\\([A-z_][A-z_0-9]* \\*?[A-z_][A-z_0-9]*\\) )?[A-z_][A-z_0-9]*(\\(|\\[))",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.go"
@@ -200,6 +200,21 @@
             }
           ]
         },
+        {
+          "name": "type-params.html-template.templ",
+          "begin": "(?<=\\[)",
+          "end": "(\\])",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.end.bracket.square.go"
+            }
+          },
+          "patterns": [
+            {
+              "include": "source.go"
+            }
+          ]
+        },
         {
           "name": "block.html-template.templ",
           "begin": "(?<=\\)) ({)$",
@@ -1093,4 +1108,4 @@
       ]
     }
   }
-}
+}
diff --git a/tests/snap/complex_syntax.templ b/tests/snap/complex_syntax.templ
@@ -10,20 +10,20 @@ templ (d Data) Method(greeting string) {
 }
 
 templ test(comp templ.Component) {
-    <div>
-        @comp {
-            <div>Children</div>
-        }
-    </div>
+	<div>
+		@comp {
+			<div>Children</div>
+		}
+	</div>
 }
 
-templ Hello() {
+templ Hello[T ~string]() {
 	@Data{
-	    message: "You can implement methods on a type.",
+		message: "You can implement methods on a type.",
 	}.Method("hello") {
-	    @test(Data{ message: "You can implement methods on a type." }.Method("hello"))
-        <div>
-            { children... }
-        </div>
+		@test(Data{message: "You can implement methods on a type."}.Method("hello"))
+		<div>
+			{ children... }
+		</div>
 	}
 }
diff --git a/tests/snap/complex_syntax.templ.snap b/tests/snap/complex_syntax.templ.snap
@@ -66,92 +66,95 @@
 #                               ^ source.templ html-template.templ params.html-template.templ punctuation.definition.end.bracket.round.go
 #                                ^ source.templ html-template.templ block.html-template.templ
 #                                 ^ source.templ html-template.templ block.html-template.templ punctuation.definition.begin.bracket.curly.go
->    <div>
-#^^^^ source.templ html-template.templ block.html-template.templ
-#    ^ source.templ html-template.templ block.html-template.templ meta.tag.block.any.html punctuation.definition.tag.begin.html
-#     ^^^ source.templ html-template.templ block.html-template.templ meta.tag.block.any.html entity.name.tag.block.any.html
-#        ^ source.templ html-template.templ block.html-template.templ meta.tag.block.any.html punctuation.definition.tag.end.html
->        @comp {
-#^^^^^^^^^^^^^^ source.templ html-template.templ block.html-template.templ
-#              ^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ start.string-expression.templ
->            <div>Children</div>
-#^^^^^^^^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
-#            ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.comparison.go
-#             ^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
+>	<div>
+#^ source.templ html-template.templ block.html-template.templ
+# ^ source.templ html-template.templ block.html-template.templ meta.tag.block.any.html punctuation.definition.tag.begin.html
+#  ^^^ source.templ html-template.templ block.html-template.templ meta.tag.block.any.html entity.name.tag.block.any.html
+#     ^ source.templ html-template.templ block.html-template.templ meta.tag.block.any.html punctuation.definition.tag.end.html
+>		@comp {
+#^^^^^^^^ source.templ html-template.templ block.html-template.templ
+#        ^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ start.string-expression.templ
+>			<div>Children</div>
+#^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
+#   ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.comparison.go
+#    ^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
+#       ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.comparison.go
+#        ^^^^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
 #                ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.comparison.go
-#                 ^^^^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
-#                         ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.comparison.go
-#                          ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.arithmetic.go
-#                           ^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
-#                              ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.comparison.go
->        }
-#^^^^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
-#        ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ end.string-expression.templ
->    </div>
-#^^^^ source.templ html-template.templ block.html-template.templ
-#    ^^ source.templ html-template.templ block.html-template.templ meta.tag.block.any.html punctuation.definition.tag.begin.html
-#      ^^^ source.templ html-template.templ block.html-template.templ meta.tag.block.any.html entity.name.tag.block.any.html
-#         ^ source.templ html-template.templ block.html-template.templ meta.tag.block.any.html punctuation.definition.tag.end.html
+#                 ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.arithmetic.go
+#                  ^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
+#                     ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.comparison.go
+>		}
+#^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
+#  ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ end.string-expression.templ
+>	</div>
+#^ source.templ html-template.templ block.html-template.templ
+# ^^ source.templ html-template.templ block.html-template.templ meta.tag.block.any.html punctuation.definition.tag.begin.html
+#   ^^^ source.templ html-template.templ block.html-template.templ meta.tag.block.any.html entity.name.tag.block.any.html
+#      ^ source.templ html-template.templ block.html-template.templ meta.tag.block.any.html punctuation.definition.tag.end.html
 >}
 #^ source.templ html-template.templ block.html-template.templ punctuation.definition.end.bracket.curly.go
 >
->templ Hello() {
+>templ Hello[T ~string]() {
 #^^^^^ source.templ html-template.templ keyword.control.go
 #     ^ source.templ html-template.templ
 #      ^^^^^ source.templ html-template.templ
-#           ^ source.templ html-template.templ punctuation.definition.begin.bracket.round.go
-#            ^ source.templ html-template.templ params.html-template.templ punctuation.definition.end.bracket.round.go
-#             ^ source.templ html-template.templ block.html-template.templ
-#              ^ source.templ html-template.templ block.html-template.templ punctuation.definition.begin.bracket.curly.go
+#           ^ source.templ html-template.templ punctuation.definition.bracket.square.go
+#            ^^^ source.templ html-template.templ type-params.html-template.templ
+#               ^^^^^^ source.templ html-template.templ type-params.html-template.templ storage.type.string.go
+#                     ^ source.templ html-template.templ type-params.html-template.templ punctuation.definition.end.bracket.square.go
+#                      ^ source.templ html-template.templ
+#                       ^ source.templ html-template.templ params.html-template.templ punctuation.definition.end.bracket.round.go
+#                        ^ source.templ html-template.templ block.html-template.templ
+#                         ^ source.templ html-template.templ block.html-template.templ punctuation.definition.begin.bracket.curly.go
 >	@Data{
 #^ source.templ html-template.templ block.html-template.templ
 # ^ source.templ html-template.templ block.html-template.templ import-expression.templ keyword.control.go
 #  ^^^^ source.templ html-template.templ block.html-template.templ import-expression.templ
 #      ^ source.templ html-template.templ block.html-template.templ import-expression.templ punctuation.definition.begin.bracket.curly.go
->	    message: "You can implement methods on a type.",
-#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.templ html-template.templ block.html-template.templ
+>		message: "You can implement methods on a type.",
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.templ html-template.templ block.html-template.templ
 >	}.Method("hello") {
 #^^^^^^^^^^^^^^^^^^^ source.templ html-template.templ block.html-template.templ
 #                   ^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ start.string-expression.templ
->	    @test(Data{ message: "You can implement methods on a type." }.Method("hello"))
-#^^^^^^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
-#          ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.definition.begin.bracket.round.go
-#           ^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
-#               ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.definition.begin.bracket.curly.go
-#                ^^^^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
-#                        ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.other.colon.go
-#                         ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
-#                          ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ string.quoted.double.go punctuation.definition.string.begin.go
-#                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ string.quoted.double.go
-#                                                               ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ string.quoted.double.go punctuation.definition.string.end.go
-#                                                                ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
-#                                                                 ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.definition.end.bracket.curly.go
-#                                                                  ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.other.period.go
-#                                                                   ^^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
-#                                                                         ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.definition.begin.bracket.round.go
-#                                                                          ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ string.quoted.double.go punctuation.definition.string.begin.go
-#                                                                           ^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ string.quoted.double.go
-#                                                                                ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ string.quoted.double.go punctuation.definition.string.end.go
-#                                                                                 ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.definition.end.bracket.round.go
-#                                                                                  ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.definition.end.bracket.round.go
->        <div>
-#^^^^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
-#        ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.comparison.go
-#         ^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
-#            ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.comparison.go
->            { children... }
-#^^^^^^^^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
+>		@test(Data{message: "You can implement methods on a type."}.Method("hello"))
+#^^^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
+#       ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.definition.begin.bracket.round.go
+#        ^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
 #            ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.definition.begin.bracket.curly.go
-#             ^^^^^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
-#                      ^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.ellipsis.go
-#                         ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
-#                          ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.definition.end.bracket.curly.go
->        </div>
-#^^^^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
-#        ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.comparison.go
-#         ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.arithmetic.go
-#          ^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
-#             ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.comparison.go
+#             ^^^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
+#                    ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.other.colon.go
+#                     ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
+#                      ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ string.quoted.double.go punctuation.definition.string.begin.go
+#                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ string.quoted.double.go
+#                                                           ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ string.quoted.double.go punctuation.definition.string.end.go
+#                                                            ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.definition.end.bracket.curly.go
+#                                                             ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.other.period.go
+#                                                              ^^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
+#                                                                    ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.definition.begin.bracket.round.go
+#                                                                     ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ string.quoted.double.go punctuation.definition.string.begin.go
+#                                                                      ^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ string.quoted.double.go
+#                                                                           ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ string.quoted.double.go punctuation.definition.string.end.go
+#                                                                            ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.definition.end.bracket.round.go
+#                                                                             ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.definition.end.bracket.round.go
+>		<div>
+#^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
+#  ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.comparison.go
+#   ^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
+#      ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.comparison.go
+>			{ children... }
+#^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
+#   ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.definition.begin.bracket.curly.go
+#    ^^^^^^^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
+#             ^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.ellipsis.go
+#                ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
+#                 ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ punctuation.definition.end.bracket.curly.go
+>		</div>
+#^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
+#  ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.comparison.go
+#   ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.arithmetic.go
+#    ^^^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
+#       ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ keyword.operator.comparison.go
 >	}
 #^ source.templ html-template.templ block.html-template.templ expression.html-template.templ
 # ^ source.templ html-template.templ block.html-template.templ expression.html-template.templ end.string-expression.templ