Merge pull request #109 from anubmat/issue_38

Correctly classify keywords in object-heritage clauses

Author: anubmat

TypeScript.YAML-tmLanguage

@@ -103,7 +103,7 @@ repository:
 
   object-heritage-type:
     name: meta.object.heritage.parent.ts
-    match: '(?:\s*([a-zA-Z_$][\w$]*)\b)'
+    match: '(?:\b([a-zA-Z_$][\w$]*)\b)'
     captures:
       '1': { name: support.type.ts }
 

TypeScript.tmLanguage

@@ -1064,7 +1064,7 @@
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>(?:\s*([a-zA-Z_$][\w$]*)\b)</string>
+			<string>(?:\b([a-zA-Z_$][\w$]*)\b)</string>
 			<key>name</key>
 			<string>meta.object.heritage.parent.ts</string>
 		</dict>

TypeScriptReact.YAML-tmLanguage

@@ -105,7 +105,7 @@ repository:
 
   object-heritage-type:
     name: meta.object.heritage.parent.tsx
-    match: '(?:\s*([a-zA-Z_$][\w$]*)\b)'
+    match: '(?:\b([a-zA-Z_$][\w$]*)\b)'
     captures:
       '1': { name: support.type.tsx }
 

TypeScriptReact.tmLanguage

@@ -1430,7 +1430,7 @@
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>(?:\s*([a-zA-Z_$][\w$]*)\b)</string>
+			<string>(?:\b([a-zA-Z_$][\w$]*)\b)</string>
 			<key>name</key>
 			<string>meta.object.heritage.parent.tsx</string>
 		</dict>

tests/baselines/Issue89.txt

@@ -3,25 +3,33 @@
 [1, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts 
 [1, 27]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts 
 [1, 30]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts 
-[1, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts 
-[1, 47]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts 
+[1, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts 
+[1, 47]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts 
 [2, 2]: source.ts meta.declaration.object.ts meta.object.body.ts 
 [4, 1]: source.ts 
 [7, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts 
 [7, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts 
-[7, 31]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts 
-[7, 34]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts 
-[7, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts 
-[7, 48]: source.ts meta.declaration.object.ts meta.object.heritage.ts 
+[7, 31]: source.ts meta.declaration.object.ts meta.object.heritage.ts 
+[7, 34]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts 
+[7, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts 
+[7, 48]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts 
 [8, 2]: source.ts meta.declaration.object.ts meta.object.body.ts 
 [10, 1]: source.ts 
 [12, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts 
 [12, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts 
 [12, 28]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts 
-[12, 30]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts 
-[12, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts 
-[12, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts 
-[12, 51]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts 
-[12, 56]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts 
+[12, 30]: source.ts meta.declaration.object.ts meta.object.heritage.ts 
+[12, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts 
+[12, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts 
+[12, 51]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts 
+[12, 56]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts 
 [13, 2]: source.ts meta.declaration.object.ts meta.object.body.ts 
-[15, 1]: source.ts 
+[15, 1]: source.ts 
+[17, 1]: source.ts meta.declaration.object.ts storage.type.ts 
+[17, 7]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts 
+[17, 17]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts 
+[17, 25]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts 
+[17, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts 
+[17, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts 
+[18, 5]: source.ts meta.declaration.object.ts meta.object.body.ts 
+[22, 20]: source.ts comment.block.ts 

tests/cases/Issue89.ts

@@ -13,3 +13,11 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{
 	^^	
 }
 ^^
+
+^^class ^^className ^^extends ^^class1 ^^implements ^^class2 {
+    ^^
+}
+
+/*
+	Checking comments ^^
+*/