Merge remote-tracking branch 'origin/master' into issue_63

Author: anubmat

TypeScript.YAML-tmLanguage

@@ -89,7 +89,7 @@ repository:
 
   object-heritage:
     name: meta.object.heritage.ts
-    begin: '(?:\b(extends|implements))'
+    begin: '(?:\b(extends|implements)\b)'
     beginCaptures:
       '1': { name: keyword.other.ts }
     end: (?=\{)
@@ -99,11 +99,11 @@ repository:
     - include: '#comment'
     - include: '#object-heritage'
     - include: '#type-parameters'
-    - include: '#object-heritage-parent'
+    - include: '#object-heritage-type'
 
-  object-heritage-parent:
+  object-heritage-type:
     name: meta.object.heritage.parent.ts
-    match: '(?:\s*([a-zA-Z_$][\w$]*))'
+    match: '(?:\s*([a-zA-Z_$][\w$]*)\b)'
     captures:
       '1': { name: storage.type.ts }
 

TypeScript.tmLanguage

@@ -998,7 +998,7 @@
 		<key>object-heritage</key>
 		<dict>
 			<key>begin</key>
-			<string>(?:\b(extends|implements))</string>
+			<string>(?:\b(extends|implements)\b)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -1035,11 +1035,11 @@
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#object-heritage-parent</string>
+					<string>#object-heritage-type</string>
 				</dict>
 			</array>
 		</dict>
-		<key>object-heritage-parent</key>
+		<key>object-heritage-type</key>
 		<dict>
 			<key>captures</key>
 			<dict>
@@ -1050,7 +1050,7 @@
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>(?:\s*([a-zA-Z_$][\w$]*))</string>
+			<string>(?:\s*([a-zA-Z_$][\w$]*)\b)</string>
 			<key>name</key>
 			<string>meta.object.heritage.parent.ts</string>
 		</dict>

TypeScriptReact.YAML-tmLanguage

@@ -91,7 +91,7 @@ repository:
 
   object-heritage:
     name: meta.object.heritage.tsx
-    begin: '(?:\b(extends|implements))'
+    begin: '(?:\b(extends|implements)\b)'
     beginCaptures:
       '1': { name: keyword.other.tsx }
     end: (?=\{)
@@ -101,11 +101,11 @@ repository:
     - include: '#comment'
     - include: '#object-heritage'
     - include: '#type-parameters'
-    - include: '#object-heritage-parent'
+    - include: '#object-heritage-type'
 
-  object-heritage-parent:
+  object-heritage-type:
     name: meta.object.heritage.parent.tsx
-    match: '(?:\s*([a-zA-Z_$][\w$]*))'
+    match: '(?:\s*([a-zA-Z_$][\w$]*)\b)'
     captures:
       '1': { name: storage.type.tsx }
 

TypeScriptReact.tmLanguage

@@ -1364,7 +1364,7 @@
 		<key>object-heritage</key>
 		<dict>
 			<key>begin</key>
-			<string>(?:\b(extends|implements))</string>
+			<string>(?:\b(extends|implements)\b)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -1401,11 +1401,11 @@
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#object-heritage-parent</string>
+					<string>#object-heritage-type</string>
 				</dict>
 			</array>
 		</dict>
-		<key>object-heritage-parent</key>
+		<key>object-heritage-type</key>
 		<dict>
 			<key>captures</key>
 			<dict>
@@ -1416,7 +1416,7 @@
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>(?:\s*([a-zA-Z_$][\w$]*))</string>
+			<string>(?:\s*([a-zA-Z_$][\w$]*)\b)</string>
 			<key>name</key>
 			<string>meta.object.heritage.parent.tsx</string>
 		</dict>

tests/baselines/Issue89.txt

@@ -0,0 +1,27 @@
+[1, 8]: source.ts meta.declaration.object.ts storage.type.ts 
+[1, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts 
+[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 
+[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 
+[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 
+[13, 2]: source.ts meta.declaration.object.ts meta.object.body.ts 
+[15, 1]: source.ts 

tests/cases/Issue89.ts

@@ -0,0 +1,15 @@
+export ^^class ^^A ^^extends /* ^^ */^^B ^^implements/**/ ^^C{
+	^^	
+}
+^^
+
+
+export class ^^D ^^implements/**/ ^^ F ^^extends /**/^^G ^^ {
+	^^	
+}
+^^
+
+export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{
+	^^	
+}
+^^