Skip to content

Commit 11d0f75

Browse files
Applied Array.isArray (#1804)
This replaces all occurrences of `Prism.util.type(variable) {!==, ===} 'Array'` with an equivalent `Array.isArray` expression.
1 parent a944c41 commit 11d0f75

18 files changed

+26
-26
lines changed

components/prism-core.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var _ = {
2525
encode: function (tokens) {
2626
if (tokens instanceof Token) {
2727
return new Token(tokens.type, _.util.encode(tokens.content), tokens.alias);
28-
} else if (_.util.type(tokens) === 'Array') {
28+
} else if (Array.isArray(tokens)) {
2929
return tokens.map(_.util.encode);
3030
} else {
3131
return tokens.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/\u00a0/g, ' ');
@@ -464,7 +464,7 @@ Token.stringify = function(o, language, parent) {
464464
return o;
465465
}
466466

467-
if (_.util.type(o) === 'Array') {
467+
if (Array.isArray(o)) {
468468
return o.map(function(element) {
469469
return Token.stringify(element, language, o);
470470
}).join('');
@@ -481,7 +481,7 @@ Token.stringify = function(o, language, parent) {
481481
};
482482

483483
if (o.alias) {
484-
var aliases = _.util.type(o.alias) === 'Array' ? o.alias : [o.alias];
484+
var aliases = Array.isArray(o.alias) ? o.alias : [o.alias];
485485
Array.prototype.push.apply(env.classes, aliases);
486486
}
487487

components/prism-core.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/prism-flow.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020
});
2121

22-
if (Prism.util.type(Prism.languages.flow.keyword) !== 'Array') {
22+
if (!Array.isArray(Prism.languages.flow.keyword)) {
2323
Prism.languages.flow.keyword = [Prism.languages.flow.keyword];
2424
}
2525
Prism.languages.flow.keyword.unshift(

components/prism-flow.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/prism-javadoclike.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
token = grammar[tokenName] = { pattern: token };
4747
}
4848

49-
if (Prism.util.type(token) === 'Array') {
49+
if (Array.isArray(token)) {
5050
for (var i = 0, l = token.length; i < l; i++) {
5151
if (token[i] instanceof RegExp) {
5252
token[i] = { pattern: token[i] };

components/prism-javadoclike.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/prism-plsql.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
});
99

1010
var keyword = plsql['keyword'];
11-
if (Prism.util.type(keyword) !== 'Array') {
11+
if (!Array.isArray(keyword)) {
1212
keyword = plsql['keyword'] = [keyword];
1313
}
1414
keyword.unshift(
1515
/\b(?:ACCESS|AGENT|AGGREGATE|ARRAY|ARROW|AT|ATTRIBUTE|AUDIT|AUTHID|BFILE_BASE|BLOB_BASE|BLOCK|BODY|BOTH|BOUND|BYTE|CALLING|CHAR_BASE|CHARSET(?:FORM|ID)|CLOB_BASE|COLAUTH|COLLECT|CLUSTERS?|COMPILED|COMPRESS|CONSTANT|CONSTRUCTOR|CONTEXT|CRASH|CUSTOMDATUM|DANGLING|DATE_BASE|DEFINE|DETERMINISTIC|DURATION|ELEMENT|EMPTY|EXCEPTIONS?|EXCLUSIVE|EXTERNAL|FINAL|FORALL|FORM|FOUND|GENERAL|HEAP|HIDDEN|IDENTIFIED|IMMEDIATE|INCLUDING|INCREMENT|INDICATOR|INDEXES|INDICES|INFINITE|INITIAL|ISOPEN|INSTANTIABLE|INTERFACE|INVALIDATE|JAVA|LARGE|LEADING|LENGTH|LIBRARY|LIKE[24C]|LIMITED|LONG|LOOP|MAP|MAXEXTENTS|MAXLEN|MEMBER|MINUS|MLSLABEL|MULTISET|NAME|NAN|NATIVE|NEW|NOAUDIT|NOCOMPRESS|NOCOPY|NOTFOUND|NOWAIT|NUMBER(?:_BASE)?|OBJECT|OCI(?:COLL|DATE|DATETIME|DURATION|INTERVAL|LOBLOCATOR|NUMBER|RAW|REF|REFCURSOR|ROWID|STRING|TYPE)|OFFLINE|ONLINE|ONLY|OPAQUE|OPERATOR|ORACLE|ORADATA|ORGANIZATION|ORL(?:ANY|VARY)|OTHERS|OVERLAPS|OVERRIDING|PACKAGE|PARALLEL_ENABLE|PARAMETERS?|PASCAL|PCTFREE|PIPE(?:LINED)?|PRAGMA|PRIOR|PRIVATE|RAISE|RANGE|RAW|RECORD|REF|REFERENCE|REM|REMAINDER|RESULT|RESOURCE|RETURNING|REVERSE|ROW(?:ID|NUM|TYPE)|SAMPLE|SB[124]|SEGMENT|SELF|SEPARATE|SEQUENCE|SHORT|SIZE(?:_T)?|SPARSE|SQL(?:CODE|DATA|NAME|STATE)|STANDARD|STATIC|STDDEV|STORED|STRING|STRUCT|STYLE|SUBMULTISET|SUBPARTITION|SUBSTITUTABLE|SUBTYPE|SUCCESSFUL|SYNONYM|SYSDATE|TABAUTH|TDO|THE|TIMEZONE_(?:ABBR|HOUR|MINUTE|REGION)|TRAILING|TRANSAC(?:TIONAL)?|TRUSTED|UB[124]|UID|UNDER|UNTRUSTED|VALIDATE|VALIST|VARCHAR2|VARIABLE|VARIANCE|VARRAY|VIEWS|VOID|WHENEVER|WRAPPED|ZONE)\b/i
1616
);
1717

1818
var operator = plsql['operator'];
19-
if (Prism.util.type(operator) !== 'Array') {
19+
if (!Array.isArray(operator)) {
2020
operator = plsql['operator'] = [operator];
2121
}
2222
operator.unshift(

0 commit comments

Comments
 (0)