Correcting Issue #38/#89

Author: anubmat

TypeScript.YAML-tmLanguage

@@ -89,7 +89,7 @@ repository:
 
   object-heritage:
     name: meta.object.heritage.ts
-    begin: '(?:\b(extends|implements)\b)'
+    begin: '(?:\s*\b(extends|implements)\b)'
     beginCaptures:
       '1': { name: keyword.other.ts }
     end: (?=\{)

TypeScript.tmLanguage

@@ -998,7 +998,7 @@
 		<key>object-heritage</key>
 		<dict>
 			<key>begin</key>
-			<string>(?:\b(extends|implements)\b)</string>
+			<string>(?:\s*\b(extends|implements)\b)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>

TypeScriptReact.YAML-tmLanguage

@@ -91,7 +91,7 @@ repository:
 
   object-heritage:
     name: meta.object.heritage.tsx
-    begin: '(?:\b(extends|implements)\b)'
+    begin: '(?:\s*\b(extends|implements)\b)'
     beginCaptures:
       '1': { name: keyword.other.tsx }
     end: (?=\{)

TypeScriptReact.tmLanguage

@@ -1364,7 +1364,7 @@
 		<key>object-heritage</key>
 		<dict>
 			<key>begin</key>
-			<string>(?:\b(extends|implements)\b)</string>
+			<string>(?:\s*\b(extends|implements)\b)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>

tests/baselines/Issue89.txt

@@ -3,25 +3,25 @@
 [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 storage.type.ts 
-[1, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts 
-[1, 47]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.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 storage.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 storage.type.ts 
-[7, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts 
-[7, 48]: 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 storage.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 storage.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 storage.type.ts 
-[12, 51]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts 
-[12, 56]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts 
+[12, 30]: source.ts meta.declaration.object.ts meta.object.heritage.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 storage.type.ts 
+[12, 51]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts 
+[12, 56]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts 
 [13, 2]: source.ts meta.declaration.object.ts meta.object.body.ts 
 [15, 1]: source.ts