Merge pull request #902 from microsoft/infer-extends

Updated to support 'infer..extends'
microsoft · Apr 6, 2022 · b38c52f · b38c52f
2 parents 08fbf95 + 4d30ff8
commit b38c52f
Show file tree

Hide file tree

Showing 7 changed files with 299 additions and 70 deletions.
diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage
@@ -2332,8 +2332,8 @@ repository:
     - include: '#type-parameters'
     - include: '#type-tuple'
     - include: '#type-object'
-    - include: '#type-conditional'
     - include: '#type-operators'
+    - include: '#type-conditional'
     - include: '#type-fn-type-parameters'
     - include: '#type-paren-or-function-parameters'
     - include: '#type-function-return-type'
@@ -2519,6 +2519,7 @@ repository:
   type-operators:
     patterns:
     - include: '#typeof-operator'
+    - include: '#type-infer'
     # Handle the object types followed by | or & operator as { can be used as end of Type in many places and this avoids tripping that
     - begin: ([&|])(?=\s*\{)
       beginCaptures:
@@ -2536,11 +2537,18 @@ repository:
       match: '{{startOfIdentifier}}keyof{{endOfIdentifier}}'
     - name: keyword.operator.ternary.ts
       match: (\?|\:)
-    - name: keyword.operator.expression.infer.ts
-      match: '{{startOfIdentifier}}infer(?=\s+[_$[:alpha:]])'
     - name: keyword.operator.expression.import.ts
       match: '{{startOfIdentifier}}import(?=\s*\()'
 
+  type-infer:
+    patterns:
+    - match: '{{startOfIdentifier}}(infer)\s+({{identifier}}){{endOfIdentifier}}(?:\s+(extends){{endOfIdentifier}})?'
+      name: meta.type.infer.ts
+      captures:
+        '1': { name: keyword.operator.expression.infer.ts }
+        '2': { name: entity.name.type.ts }
+        '3': { name: keyword.operator.expression.extends.ts }
+
   type-predicate-operator:
     patterns:
     - match: '{{startOfIdentifier}}(?:(asserts)\s+)?(?!asserts)(?:(this)|({{identifier}}))\s(is){{endOfIdentifier}}'

diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage
@@ -7076,11 +7076,11 @@
           </dict>
           <dict>
             <key>include</key>
-            <string>#type-conditional</string>
+            <string>#type-operators</string>
           </dict>
           <dict>
             <key>include</key>
-            <string>#type-operators</string>
+            <string>#type-conditional</string>
           </dict>
           <dict>
             <key>include</key>
@@ -7630,6 +7630,10 @@
             <key>include</key>
             <string>#typeof-operator</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#type-infer</string>
+          </dict>
           <dict>
             <key>begin</key>
             <string>([&amp;|])(?=\s*\{)</string>
@@ -7679,15 +7683,39 @@
           </dict>
           <dict>
             <key>name</key>
-            <string>keyword.operator.expression.infer.ts</string>
+            <string>keyword.operator.expression.import.ts</string>
             <key>match</key>
-            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))infer(?=\s+[_$[:alpha:]])</string>
+            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))import(?=\s*\()</string>
           </dict>
+        </array>
+      </dict>
+      <key>type-infer</key>
+      <dict>
+        <key>patterns</key>
+        <array>
           <dict>
-            <key>name</key>
-            <string>keyword.operator.expression.import.ts</string>
             <key>match</key>
-            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))import(?=\s*\()</string>
+            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(infer)\s+([_$[:alpha:]][_$[:alnum:]]*)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))(?:\s+(extends)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))?</string>
+            <key>name</key>
+            <string>meta.type.infer.ts</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.expression.infer.ts</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>entity.name.type.ts</string>
+              </dict>
+              <key>3</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.expression.extends.ts</string>
+              </dict>
+            </dict>
           </dict>
         </array>
       </dict>

diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage
@@ -7024,11 +7024,11 @@
           </dict>
           <dict>
             <key>include</key>
-            <string>#type-conditional</string>
+            <string>#type-operators</string>
           </dict>
           <dict>
             <key>include</key>
-            <string>#type-operators</string>
+            <string>#type-conditional</string>
           </dict>
           <dict>
             <key>include</key>
@@ -7578,6 +7578,10 @@
             <key>include</key>
             <string>#typeof-operator</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#type-infer</string>
+          </dict>
           <dict>
             <key>begin</key>
             <string>([&amp;|])(?=\s*\{)</string>
@@ -7627,15 +7631,39 @@
           </dict>
           <dict>
             <key>name</key>
-            <string>keyword.operator.expression.infer.tsx</string>
+            <string>keyword.operator.expression.import.tsx</string>
             <key>match</key>
-            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))infer(?=\s+[_$[:alpha:]])</string>
+            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))import(?=\s*\()</string>
           </dict>
+        </array>
+      </dict>
+      <key>type-infer</key>
+      <dict>
+        <key>patterns</key>
+        <array>
           <dict>
-            <key>name</key>
-            <string>keyword.operator.expression.import.tsx</string>
             <key>match</key>
-            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))import(?=\s*\()</string>
+            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(infer)\s+([_$[:alpha:]][_$[:alnum:]]*)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))(?:\s+(extends)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))?</string>
+            <key>name</key>
+            <string>meta.type.infer.tsx</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.expression.infer.tsx</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>entity.name.type.tsx</string>
+              </dict>
+              <key>3</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.expression.extends.tsx</string>
+              </dict>
+            </dict>
           </dict>
         </array>
       </dict>

diff --git a/package-lock.json b/package-lock.json