Merge pull request #656 from mjbvz/fix-653

Allow 'export default interface'

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -1095,6 +1095,7 @@ repository:
         '3': { name: keyword.control.default.ts }
       end: (?=$|{{endOfStatement}})
       patterns:
+      - include: '#interface-declaration'
       - include: '#expression'
     - name: meta.export.ts
       begin: '{{startOfIdentifier}}(export)(?!\s*:){{endOfIdentifier}}'

TypeScript.tmLanguage

@@ -3545,6 +3545,10 @@
             <string>(?=$|;|^\s*abstract\b|^\s*async\b|^\s*class\b|^\s*const\b|^\s*declare\b|^\s*enum\b|^\s*export\b|^\s*function\b|^\s*import\b|^\s*interface\b|^\s*let\b|^\s*module\b|^\s*namespace\b|^\s*return\b|^\s*type\b|^\s*var\b)</string>
             <key>patterns</key>
             <array>
+              <dict>
+                <key>include</key>
+                <string>#interface-declaration</string>
+              </dict>
               <dict>
                 <key>include</key>
                 <string>#expression</string>

TypeScriptReact.tmLanguage

@@ -3549,6 +3549,10 @@
             <string>(?=$|;|^\s*abstract\b|^\s*async\b|^\s*class\b|^\s*const\b|^\s*declare\b|^\s*enum\b|^\s*export\b|^\s*function\b|^\s*import\b|^\s*interface\b|^\s*let\b|^\s*module\b|^\s*namespace\b|^\s*return\b|^\s*type\b|^\s*var\b)</string>
             <key>patterns</key>
             <array>
+              <dict>
+                <key>include</key>
+                <string>#interface-declaration</string>
+              </dict>
               <dict>
                 <key>include</key>
                 <string>#expression</string>

tests/baselines/Issue653.baseline.txt

@@ -0,0 +1,44 @@
+original file
+-----------------------------------
+export default interface IFoo {
+    x: string;
+}
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>export default interface IFoo {
+ ^^^^^^
+ source.ts meta.export.default.ts keyword.control.export.ts
+       ^
+       source.ts meta.export.default.ts
+        ^^^^^^^
+        source.ts meta.export.default.ts keyword.control.default.ts
+               ^
+               source.ts meta.export.default.ts
+                ^^^^^^^^^
+                source.ts meta.export.default.ts meta.interface.ts storage.type.interface.ts
+                         ^
+                         source.ts meta.export.default.ts meta.interface.ts
+                          ^^^^
+                          source.ts meta.export.default.ts meta.interface.ts entity.name.type.interface.ts
+                              ^
+                              source.ts meta.export.default.ts meta.interface.ts
+                               ^
+                               source.ts meta.export.default.ts meta.interface.ts punctuation.definition.block.ts
+>    x: string;
+ ^^^^
+ source.ts meta.export.default.ts meta.interface.ts meta.field.declaration.ts
+     ^
+     source.ts meta.export.default.ts meta.interface.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
+      ^
+      source.ts meta.export.default.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
+       ^
+       source.ts meta.export.default.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts
+        ^^^^^^
+        source.ts meta.export.default.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts
+              ^
+              source.ts meta.export.default.ts meta.interface.ts punctuation.terminator.statement.ts
+>}
+ ^
+ source.ts meta.export.default.ts meta.interface.ts punctuation.definition.block.ts

tests/cases/Issue653.ts

@@ -0,0 +1,3 @@
+export default interface IFoo {
+    x: string;
+}