Skip to content

Commit a090d06

Browse files
authored
Scala: Updated keywords to support Scala 3 (#3506)
1 parent b9512b2 commit a090d06

File tree

3 files changed

+75
-19
lines changed

3 files changed

+75
-19
lines changed

components/prism-scala.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Prism.languages.scala = Prism.languages.extend('java', {
88
pattern: /("|')(?:\\.|(?!\1)[^\\\r\n])*\1/,
99
greedy: true
1010
},
11-
'keyword': /<-|=>|\b(?:abstract|case|catch|class|def|do|else|extends|final|finally|for|forSome|if|implicit|import|lazy|match|new|null|object|override|package|private|protected|return|sealed|self|super|this|throw|trait|try|type|val|var|while|with|yield)\b/,
11+
'keyword': /<-|=>|\b(?:abstract|case|catch|class|def|derives|do|else|enum|extends|extension|final|finally|for|forSome|given|if|implicit|import|infix|inline|lazy|match|new|null|object|opaque|open|override|package|private|protected|return|sealed|self|super|this|throw|trait|transparent|try|type|using|val|var|while|with|yield)\b/,
1212
'number': /\b0x(?:[\da-f]*\.)?[\da-f]+|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e\d+)?[dfl]?/i,
1313
'builtin': /\b(?:Any|AnyRef|AnyVal|Boolean|Byte|Char|Double|Float|Int|Long|Nothing|Short|String|Unit)\b/,
1414
'symbol': /'[^\d\s\\]\w*/

components/prism-scala.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
+73-17
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,91 @@
11
<- =>
22

33
abstract case catch
4-
class def do else
5-
extends final finally
6-
for forSome if
7-
implicit import; lazy
4+
class def derives do
5+
else enum extends extension
6+
final finally
7+
for forSome given if
8+
implicit import;
9+
infix inline lazy
810
match new null object
11+
opaque open
912
override package private
1013
protected return sealed
1114
self super this throw
12-
trait try type val
15+
trait transparent try
16+
type using val
1317
var while with yield
1418

1519
----------------------------------------------------
1620

1721
[
1822
["keyword", "<-"], ["keyword", "=>"],
1923

20-
["keyword", "abstract"], ["keyword", "case"], ["keyword", "catch"],
21-
["keyword", "class"], ["keyword", "def"], ["keyword", "do"], ["keyword", "else"],
22-
["keyword", "extends"], ["keyword", "final"], ["keyword", "finally"],
23-
["keyword", "for"], ["keyword", "forSome"], ["keyword", "if"],
24-
["keyword", "implicit"], ["keyword", "import"], ["punctuation", ";"], ["keyword", "lazy"],
25-
["keyword", "match"], ["keyword", "new"], ["keyword", "null"], ["keyword", "object"],
26-
["keyword", "override"], ["keyword", "package"], ["keyword", "private"],
27-
["keyword", "protected"], ["keyword", "return"], ["keyword", "sealed"],
28-
["keyword", "self"], ["keyword", "super"], ["keyword", "this"], ["keyword", "throw"],
29-
["keyword", "trait"], ["keyword", "try"], ["keyword", "type"], ["keyword", "val"],
30-
["keyword", "var"], ["keyword", "while"], ["keyword", "with"], ["keyword", "yield"]
24+
["keyword", "abstract"],
25+
["keyword", "case"],
26+
["keyword", "catch"],
27+
28+
["keyword", "class"],
29+
["keyword", "def"],
30+
["keyword", "derives"],
31+
["keyword", "do"],
32+
33+
["keyword", "else"],
34+
["keyword", "enum"],
35+
["keyword", "extends"],
36+
["keyword", "extension"],
37+
38+
["keyword", "final"],
39+
["keyword", "finally"],
40+
41+
["keyword", "for"],
42+
["keyword", "forSome"],
43+
["keyword", "given"],
44+
["keyword", "if"],
45+
46+
["keyword", "implicit"],
47+
["keyword", "import"],
48+
["punctuation", ";"],
49+
50+
["keyword", "infix"],
51+
["keyword", "inline"],
52+
["keyword", "lazy"],
53+
54+
["keyword", "match"],
55+
["keyword", "new"],
56+
["keyword", "null"],
57+
["keyword", "object"],
58+
59+
["keyword", "opaque"],
60+
["keyword", "open"],
61+
62+
["namespace", ["override"]],
63+
["keyword", "package"],
64+
["keyword", "private"],
65+
66+
["keyword", "protected"],
67+
["keyword", "return"],
68+
["keyword", "sealed"],
69+
70+
["keyword", "self"],
71+
["keyword", "super"],
72+
["keyword", "this"],
73+
["keyword", "throw"],
74+
75+
["keyword", "trait"],
76+
["keyword", "transparent"],
77+
["keyword", "try"],
78+
79+
["keyword", "type"],
80+
["keyword", "using"],
81+
["keyword", "val"],
82+
83+
["keyword", "var"],
84+
["keyword", "while"],
85+
["keyword", "with"],
86+
["keyword", "yield"]
3187
]
3288

3389
----------------------------------------------------
3490

35-
Checks for keywords.
91+
Checks for keywords.

0 commit comments

Comments
 (0)