Do not match inline template grammars inside a template itself

Closes #839

Author: ayazhafiz

syntaxes/inline-template.json

@@ -1,6 +1,6 @@
 {
   "scopeName": "inline-template.ng",
-  "injectionSelector": "L:meta.decorator.ts -comment",
+  "injectionSelector": "L:meta.decorator.ts -comment -text.html",
   "patterns": [
     {
       "include": "#inlineTemplate"

syntaxes/src/inline-template.ts

@@ -10,7 +10,7 @@ import {GrammarDefinition} from './types';
 
 export const InlineTemplate: GrammarDefinition = {
   scopeName: 'inline-template.ng',
-  injectionSelector: 'L:meta.decorator.ts -comment',
+  injectionSelector: 'L:meta.decorator.ts -comment -text.html',
   patterns: [{include: '#inlineTemplate'}],
   repository: {
     inlineTemplate: {

syntaxes/test/cases.json

@@ -2,7 +2,7 @@
   {
     "name": "inline template",
     "scopeName": "inline-template.ng",
-    "grammarFiles": ["syntaxes/inline-template.json", "syntaxes/template.json"],
+    "grammarFiles": ["syntaxes/inline-template.json", "syntaxes/template.json", "syntaxes/expression.json"],
     "testFile": "syntaxes/test/data/inline-template.ts"
   },
   {

syntaxes/test/data/inline-template.ts

@@ -30,3 +30,10 @@ export class TMComponent{}
   template: '{{property}}',
 })
 export class TMComponent{}
+
+@Component({
+  template: `
+    <ng-container *ngFor="let el of [1,2,3,4]; template: myTpl"></ng-template>
+  `,
+})
+export class TMComponent{}

syntaxes/test/data/inline-template.ts.snap

@@ -108,11 +108,57 @@
 #          ^ inline-template.ng meta.object-literal.key.ts punctuation.separator.key-value.ts
 #           ^ inline-template.ng
 #            ^ inline-template.ng string
-#             ^^^^^^^^^^^^ inline-template.ng text.html
+#             ^^ inline-template.ng text.html punctuation.definition.block.ts
+#               ^^^^^^^^ inline-template.ng text.html expression.ng variable.other.readwrite.ts
+#                       ^^ inline-template.ng text.html punctuation.definition.block.ts
 #                         ^ inline-template.ng string
 #                          ^^ inline-template.ng
 >})
 #^^^ inline-template.ng
 >export class TMComponent{}
 #^^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-template.ng
+>
+>@Component({
+#^^^^^^^^^^^^^ inline-template.ng
+>  template: `
+#^^ inline-template.ng
+#  ^^^^^^^^ inline-template.ng meta.object-literal.key.ts
+#          ^ inline-template.ng meta.object-literal.key.ts punctuation.separator.key-value.ts
+#           ^ inline-template.ng
+#            ^ inline-template.ng string
+>    <ng-container *ngFor="let el of [1,2,3,4]; template: myTpl"></ng-template>
+#^^^^^^^^^^^^^^^^^^ inline-template.ng text.html
+#                  ^ inline-template.ng text.html meta.ng-binding.template.html entity.other.attribute-name.html entity.other.ng-binding-name.template.html punctuation.definition.ng-binding-name.begin.html
+#                   ^^^^^ inline-template.ng text.html meta.ng-binding.template.html entity.other.attribute-name.html entity.other.ng-binding-name.template.html entity.other.ng-binding-name.ngFor.html
+#                        ^ inline-template.ng text.html meta.ng-binding.template.html punctuation.separator.key-value.html
+#                         ^ inline-template.ng text.html meta.ng-binding.template.html string.quoted.html punctuation.definition.string.begin.html
+#                          ^^^ inline-template.ng text.html meta.ng-binding.template.html expression.ng storage.type.ts
+#                             ^ inline-template.ng text.html meta.ng-binding.template.html expression.ng
+#                              ^^ inline-template.ng text.html meta.ng-binding.template.html expression.ng variable.other.readwrite.ts
+#                                ^ inline-template.ng text.html meta.ng-binding.template.html expression.ng
+#                                 ^^ inline-template.ng text.html meta.ng-binding.template.html expression.ng keyword.operator.expression.of.ts
+#                                   ^ inline-template.ng text.html meta.ng-binding.template.html expression.ng
+#                                    ^ inline-template.ng text.html meta.ng-binding.template.html expression.ng meta.array.literal.ts meta.brace.square.ts
+#                                     ^ inline-template.ng text.html meta.ng-binding.template.html expression.ng meta.array.literal.ts constant.numeric.decimal.ts
+#                                      ^ inline-template.ng text.html meta.ng-binding.template.html expression.ng meta.array.literal.ts punctuation.separator.comma.ts
+#                                       ^ inline-template.ng text.html meta.ng-binding.template.html expression.ng meta.array.literal.ts constant.numeric.decimal.ts
+#                                        ^ inline-template.ng text.html meta.ng-binding.template.html expression.ng meta.array.literal.ts punctuation.separator.comma.ts
+#                                         ^ inline-template.ng text.html meta.ng-binding.template.html expression.ng meta.array.literal.ts constant.numeric.decimal.ts
+#                                          ^ inline-template.ng text.html meta.ng-binding.template.html expression.ng meta.array.literal.ts punctuation.separator.comma.ts
+#                                           ^ inline-template.ng text.html meta.ng-binding.template.html expression.ng meta.array.literal.ts constant.numeric.decimal.ts
+#                                            ^ inline-template.ng text.html meta.ng-binding.template.html expression.ng meta.array.literal.ts meta.brace.square.ts
+#                                             ^^ inline-template.ng text.html meta.ng-binding.template.html expression.ng
+#                                               ^^^^^^^^ inline-template.ng text.html meta.ng-binding.template.html expression.ng variable.other.readwrite.ts
+#                                                       ^^ inline-template.ng text.html meta.ng-binding.template.html expression.ng
+#                                                         ^^^^^ inline-template.ng text.html meta.ng-binding.template.html expression.ng variable.other.readwrite.ts
+#                                                              ^ inline-template.ng text.html meta.ng-binding.template.html string.quoted.html punctuation.definition.string.end.html
+#                                                               ^^^^^^^^^^^^^^^^ inline-template.ng text.html
+>  `,
+#^^ inline-template.ng text.html
+#  ^ inline-template.ng string
+#   ^^ inline-template.ng
+>})
+#^^^ inline-template.ng
+>export class TMComponent{}
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^ inline-template.ng
 >