Fix method declaration detection when method name is string literal

Fixes #612

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -788,12 +788,12 @@ repository:
     endCaptures:
       '0': { name: punctuation.definition.block.ts }
     patterns:
-    - include: "#string"
     - include: '#comment'
     - include: '#decorator'
     - include: '#method-declaration'
     - include: '#indexer-declaration'
     - include: '#field-declaration'
+    - include: "#string"
     - include: '#type-annotation'
     - include: '#variable-initializer'
     - include: '#access-modifier'

TypeScript.tmLanguage

@@ -2474,10 +2474,6 @@
         </dict>
         <key>patterns</key>
         <array>
-          <dict>
-            <key>include</key>
-            <string>#string</string>
-          </dict>
           <dict>
             <key>include</key>
             <string>#comment</string>
@@ -2498,6 +2494,10 @@
             <key>include</key>
             <string>#field-declaration</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#string</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#type-annotation</string>

TypeScriptReact.tmLanguage

@@ -2478,10 +2478,6 @@
         </dict>
         <key>patterns</key>
         <array>
-          <dict>
-            <key>include</key>
-            <string>#string</string>
-          </dict>
           <dict>
             <key>include</key>
             <string>#comment</string>
@@ -2502,6 +2498,10 @@
             <key>include</key>
             <string>#field-declaration</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#string</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#type-annotation</string>

tests/baselines/Issue612.baseline.txt

@@ -0,0 +1,64 @@
+original file
+-----------------------------------
+class C {
+    'm'?(): void;
+}
+const x = 0;
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>class C {
+ ^^^^^
+ source.ts meta.class.ts storage.type.class.ts
+      ^
+      source.ts meta.class.ts
+       ^
+       source.ts meta.class.ts entity.name.type.class.ts
+        ^
+        source.ts meta.class.ts
+         ^
+         source.ts meta.class.ts punctuation.definition.block.ts
+>    'm'?(): void;
+ ^^^^
+ source.ts meta.class.ts
+     ^
+     source.ts meta.class.ts meta.method.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts
+      ^
+      source.ts meta.class.ts meta.method.declaration.ts string.quoted.single.ts
+       ^
+       source.ts meta.class.ts meta.method.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts
+        ^
+        source.ts meta.class.ts meta.method.declaration.ts keyword.operator.optional.ts
+         ^
+         source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
+          ^
+          source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts
+           ^
+           source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts keyword.operator.type.annotation.ts
+            ^
+            source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts
+             ^^^^
+             source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts
+                 ^
+                 source.ts meta.class.ts punctuation.terminator.statement.ts
+>}
+ ^
+ source.ts meta.class.ts punctuation.definition.block.ts
+>const x = 0;
+ ^^^^^
+ source.ts meta.var.expr.ts storage.type.ts
+      ^
+      source.ts meta.var.expr.ts
+       ^
+       source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
+        ^
+        source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+         ^
+         source.ts meta.var.expr.ts keyword.operator.assignment.ts
+          ^
+          source.ts meta.var.expr.ts
+           ^
+           source.ts meta.var.expr.ts constant.numeric.decimal.ts
+            ^
+            source.ts punctuation.terminator.statement.ts

tests/cases/Issue612.ts

@@ -0,0 +1,4 @@
+class C {
+    'm'?(): void;
+}
+const x = 0;