Skip to content

Commit f239ffe

Browse files
committed
simplify actionscript
1 parent 2f9471f commit f239ffe

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/languages/actionscript.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ import * as regex from '../lib/regex.js';
1010
/** @type LanguageFn */
1111
export default function(hljs) {
1212
const IDENT_RE = /[a-zA-Z_$][a-zA-Z0-9_$]*/;
13+
const PKG_NAME_RE = regex.concat(
14+
IDENT_RE,
15+
regex.optional(regex.concat("(\.", IDENT_RE, ")*"))
16+
);
1317
const IDENT_FUNC_RETURN_TYPE_RE = /([*]|[a-zA-Z_$][a-zA-Z0-9_$]*)/;
1418

1519
const AS3_REST_ARG_MODE = {
@@ -37,20 +41,16 @@ export default function(hljs) {
3741
hljs.C_BLOCK_COMMENT_MODE,
3842
hljs.C_NUMBER_MODE,
3943
{
40-
className: 'class',
41-
beginKeywords: 'package',
42-
end: /\{/,
43-
contains: [ hljs.TITLE_MODE ]
44+
beforeMatch: /\b(package)\s+/,
45+
keywords: "package",
46+
match: PKG_NAME_RE,
47+
className: "title.class"
4448
},
4549
{
46-
className: 'class',
47-
beginKeywords: 'class interface',
48-
end: /\{/,
49-
excludeEnd: true,
50-
contains: [
51-
{ beginKeywords: 'extends implements' },
52-
hljs.TITLE_MODE
53-
]
50+
beforeMatch: /\b(class|interface|extends|implements)\s+/,
51+
keywords: "class interface extends implements",
52+
match: IDENT_RE,
53+
className: "title.class"
5454
},
5555
{
5656
className: 'meta',

0 commit comments

Comments
 (0)