Fix incorrect detection of keyword vs function call

Fixes #628

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -1349,9 +1349,9 @@ repository:
     - name: keyword.operator.expression.delete.ts
       match: '{{startOfIdentifier}}delete{{endOfIdentifier}}'
     - name: keyword.operator.expression.in.ts
-      match: '{{startOfIdentifier}}in{{endOfIdentifier}}'
+      match: '{{startOfIdentifier}}in{{endOfIdentifier}}(?!\()'
     - name: keyword.operator.expression.of.ts
-      match: '{{startOfIdentifier}}of{{endOfIdentifier}}'
+      match: '{{startOfIdentifier}}of{{endOfIdentifier}}(?!\()'
     - name: keyword.operator.expression.instanceof.ts
       match: '{{startOfIdentifier}}instanceof{{endOfIdentifier}}'
     - name: keyword.operator.new.ts

TypeScript.tmLanguage

@@ -4258,13 +4258,13 @@
             <key>name</key>
             <string>keyword.operator.expression.in.ts</string>
             <key>match</key>
-            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))in(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
+            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))in(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))(?!\()</string>
           </dict>
           <dict>
             <key>name</key>
             <string>keyword.operator.expression.of.ts</string>
             <key>match</key>
-            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))of(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
+            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))of(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))(?!\()</string>
           </dict>
           <dict>
             <key>name</key>

TypeScriptReact.tmLanguage

@@ -4204,13 +4204,13 @@
             <key>name</key>
             <string>keyword.operator.expression.in.tsx</string>
             <key>match</key>
-            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))in(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
+            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))in(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))(?!\()</string>
           </dict>
           <dict>
             <key>name</key>
             <string>keyword.operator.expression.of.tsx</string>
             <key>match</key>
-            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))of(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
+            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))of(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))(?!\()</string>
           </dict>
           <dict>
             <key>name</key>

tests/baselines/Issue628.baseline.txt

@@ -0,0 +1,18 @@
+original file
+-----------------------------------
+of(1);
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>of(1);
+ ^^
+ source.ts meta.function-call.ts entity.name.function.ts
+   ^
+   source.ts meta.brace.round.ts
+    ^
+    source.ts constant.numeric.decimal.ts
+     ^
+     source.ts meta.brace.round.ts
+      ^
+      source.ts punctuation.terminator.statement.ts

tests/cases/Issue628.ts

@@ -0,0 +1 @@
+of(1);