TypeScript: Updated keywords

components/prism-typescript.js

@@ -7,11 +7,16 @@
 			greedy: true,
 			inside: null // see below
 		},
-		// From JavaScript Prism keyword list and TypeScript language spec: https://github.com/Microsoft/TypeScript/blob/master/doc/spec.md#221-reserved-words
-		'keyword': /\b(?:abstract|as|asserts|async|await|break|case|catch|class|const|constructor|continue|debugger|declare|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|is|keyof|let|module|namespace|new|null|of|package|private|protected|public|readonly|return|require|set|static|super|switch|this|throw|try|type|typeof|undefined|var|void|while|with|yield)\b/,
 		'builtin': /\b(?:string|Function|any|number|boolean|Array|symbol|console|Promise|unknown|never)\b/,
 	});
 
+	// The keywords TypeScript adds to JavaScript
+	Prism.languages.typescript.keyword.push(
+		/\b(?:abstract|as|declare|implements|is|keyof|readonly|require)\b/,
+		// keywords that have to be followed by an identifier
+		/\b(?:asserts|infer|interface|module|namespace|type)(?!\s*[^\s_${}*a-zA-Z\xA0-\uFFFF])/
+	)
+
 	// doesn't work with TS because TS is too complex
 	delete Prism.languages.typescript['parameter'];
 

tests/languages/typescript/issue2860.test

@@ -0,0 +1,37 @@
+export interface R<T> {
+  data: T;
+  total: number;
+  type?: string;
+}
+
+----------------------------------------------------
+
+[
+	["keyword", "export"],
+	["keyword", "interface"],
+	["class-name", [
+		["constant", "R"],
+		["operator", "<"],
+		["constant", "T"],
+		["operator", ">"]
+	]],
+	["punctuation", "{"],
+
+	"\r\n  data",
+	["operator", ":"],
+	["constant", "T"],
+	["punctuation", ";"],
+
+	"\r\n  total",
+	["operator", ":"],
+	["builtin", "number"],
+	["punctuation", ";"],
+
+	"\r\n  type",
+	["operator", "?"],
+	["operator", ":"],
+	["builtin", "string"],
+	["punctuation", ";"],
+
+	["punctuation", "}"]
+]