8000 Enhance definitions in TypeScript component (#1522) · PrismJS/prism@1169562 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit 1169562

Browse files
MichalLytekmAAdhaTTah
MichalLytek
authored and
mAAdhaTTah
committed
Enhance definitions in TypeScript component (#1522)
Add missing keywords & built-ins to the TypeScript definition.
1 parent 716923f commit 1169562

File tree

4 files changed

+42
-14
lines changed

4 files changed

+42
-14
lines changed

‎components/prism-typescript.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Prism.languages.typescript = Prism.languages.extend('javascript', {
22
// From JavaScript Prism keyword list and TypeScript language spec: https://github.com/Microsoft/TypeScript/blob/master/doc/spec.md#221-reserved-words
3-
'keyword': /\b(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield|module|declare|constructor|namespace|abstract|require|type)\b/,
4-
'builtin': /\b(?:string|Function|any|number|boolean|Array|symbol|console)\b/,
3+
'keyword': /\b(?:abstract|as|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|var|void|while|with|yield)\b/,
4+
'builtin': /\b(?:string|Function|any|number|boolean|Array|symbol|console|Promise|unknown|never)\b/,
55
});
66

7-
Prism.languages.ts = Prism.languages.typescript;
7+
Prism.languages.ts = Prism.languages.typescript;

‎components/prism-typescript.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/languages/typescript/builtin_feature.test

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ boolean
66
Array
77
symbol
88
console
9+
Promise
10+
unknown
11+
never
912

1013
----------------------------------------------------
1114

@@ -17,7 +20,10 @@ console
1720
["builtin", "boolean"],
1821
["builtin", "Array"],
1922
["builtin", "symbol"],
20-
["builtin", "console"]
23+
["builtin", "console"],
24+
["builtin", "Promise"],
25+
["builtin", "unknown"],
26+
["builtin", "never"]
2127
]
2228

2329
----------------------------------------------------

‎tests/languages/typescript/keyword_feature.test

+31-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1+
abstract
2+
as
3+
async
4+
await
15
break
26
case
37
catch
48
class;
59
const
10+
constructor
611
continue
712
debugger
13+
declare
814
default
915
delete
1016
do
@@ -14,6 +20,7 @@ export
1420
extends;
1521
finally
1622
for
23+
from
1724
function
1825
get
1926
if
@@ -22,42 +29,52 @@ import
2229
in
2330
instanceof;
2431
interface;
32+
is
33+
keyof
2534
let
35+
module
36+
namespace
2637
new;
2738
null
39+
of
2840
package
2941
private
3042
protected
3143
public
44+
readonly
3245
return
46+
require
3347
set
3448
static
3549
super
3650
switch
3751
this
3852
throw
3953
try
54+
type
4055
typeof
4156
var
4257
void
4358
while
4459
with
4560
yield
46-
module
47-
declare
48-
constructor
49-
enum
5061

5162
----------------------------------------------------
5263

5364
[
65+
["keyword", "abstract"],
66+
["keyword", "as"],
67+
["keyword", "async"],
68+
["keyword", "await"],
5469
["keyword", "break"],
5570
["keyword", "case"],
5671
["keyword", "catch"],
5772
["keyword", "class"], ["punctuation", ";"],
5873
["keyword", "const"],
74+
["keyword", "constructor"],
5975
["keyword", "continue"],
6076
["keyword", "debugger"],
77+
["keyword", "declare"],
6178
["keyword", "default"],
6279
["keyword", "delete"],
6380
["keyword", "do"],
@@ -67,6 +84,7 @@ enum
6784
["keyword", "extends"], ["punctuation", ";"],
6885
["keyword", "finally"],
6986
["keyword", "for"],
87+
["keyword", "from"],
7088
["keyword", "function"],
7189
["keyword", "get"],
7290
["keyword", "if"],
@@ -75,31 +93,35 @@ enum
7593
["keyword", "in"],
7694
["keyword", "instanceof"], ["punctuation", ";"],
7795
["keyword", "interface"], ["punctuation", ";"],
96+
["keyword", "is"],
97+
["keyword", "keyof"],
7898
["keyword", "let"],
99+
["keyword", "module"],
100+
["keyword", "namespace"],
79101
["keyword", "new"], ["punctuation", ";"],
80102
["keyword", "null"],
103+
["keyword", "of"],
81104
["keyword", "package"],
82105
["keyword", "private"],
83106
["keyword", "protected"],
84107
["keyword", "public"],
108+
["keyword", "readonly"],
85109
["keyword", "return"],
110+
["keyword", "require"],
86111
["keyword", "set"],
87112
["keyword", "static"],
88113
["keyword", "super"],
89114
["keyword", "switch"],
 AD12
90115
["keyword", "this"],
91116
["keyword", "throw"],
92117
["keyword", "try"],
118+
["keyword", "type"],
93119
["keyword", "typeof"],
94120
["keyword", "var"],
95121
["keyword", "void"],
96122
["keyword", "while"],
97123
["keyword", "with"],
98-
["keyword", "yield"],
99-
["keyword", "module"],
100-
["keyword", "declare"],
101-
["keyword", "constructor"],
102-
["keyword", "enum"]
124+
["keyword", "yield"]
103125
]
104126

105127
----------------------------------------------------

0 commit comments

Comments
 (0)
0