Skip to content

Commit

Permalink
Replaced all occurrences of new RegExp with RegExp (#1493)
Browse files Browse the repository at this point in the history
Using the factory vs constructor form is the same, so removing
`new` results in less code.
  • Loading branch information
RunDevelopment authored and mAAdhaTTah committed Aug 19, 2018
1 parent ebd1b9a commit 44fed4d
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion components/prism-http.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ for (var contentType in httpLanguages) {
if (httpLanguages[contentType]) {
var options = {};
options[contentType] = {
pattern: new RegExp('(content-type:\\s*' + contentType + '[\\w\\W]*?)(?:\\r?\\n|\\r){2}[\\w\\W]*', 'i'),
pattern: RegExp('(content-type:\\s*' + contentType + '[\\w\\W]*?)(?:\\r?\\n|\\r){2}[\\w\\W]*', 'i'),
lookbehind: true,
inside: {
rest: httpLanguages[contentType]
Expand Down
2 changes: 1 addition & 1 deletion components/prism-http.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 23 additions & 23 deletions components/prism-lisp.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
// simple form
// e.g. (interactive ... or (interactive)
function simple_form(name) {
return new RegExp('(\\()' + name + '(?=[\\s\\)])');
return RegExp('(\\()' + name + '(?=[\\s\\)])');
}
// booleans and numbers
function primitive(pattern) {
return new RegExp('([\\s([])' + pattern + '(?=[\\s)])');
return RegExp('([\\s([])' + pattern + '(?=[\\s)])');
}

// Patterns in regular expressions
Expand Down Expand Up @@ -36,32 +36,32 @@
greedy: true,
inside: {
argument: /[-A-Z]+(?=[.,\s])/,
symbol: new RegExp('`' + symbol + "'")
symbol: RegExp('`' + symbol + "'")
}
},
'quoted-symbol': {
pattern: new RegExp("#?'" + symbol),
pattern: RegExp("#?'" + symbol),
alias: ['variable', 'symbol']
},
'lisp-property': {
pattern: new RegExp(':' + symbol),
pattern: RegExp(':' + symbol),
alias: 'property'
},
splice: {
pattern: new RegExp(',@?' + symbol),
pattern: RegExp(',@?' + symbol),
alias: ['symbol', 'variable']
},
keyword: [
{
pattern: new RegExp(
pattern: RegExp(
par +
'(?:(?:lexical-)?let\\*?|(?:cl-)?letf|if|when|while|unless|cons|cl-loop|and|or|not|cond|setq|error|message|null|require|provide|use-package)' +
space
),
lookbehind: true
},
{
pattern: new RegExp(
pattern: RegExp(
par + '(?:for|do|collect|return|finally|append|concat|in|by)' + space
),
lookbehind: true
Expand All @@ -86,15 +86,15 @@
lookbehind: true
},
defvar: {
pattern: new RegExp(par + 'def(?:var|const|custom|group)\\s+' + symbol),
pattern: RegExp(par + 'def(?:var|const|custom|group)\\s+' + symbol),
lookbehind: true,
inside: {
keyword: /^def[a-z]+/,
variable: new RegExp(symbol)
variable: RegExp(symbol)
}
},
defun: {
pattern: new RegExp(
pattern: RegExp(
par +
'(?:cl-)?(?:defun\\*?|defmacro)\\s+' +
symbol +
Expand All @@ -107,14 +107,14 @@
// reference the language object.
arguments: null,
function: {
pattern: new RegExp('(^\\s)' + symbol),
pattern: RegExp('(^\\s)' + symbol),
lookbehind: true
},
punctuation: /[()]/
}
},
lambda: {
pattern: new RegExp(par + 'lambda\\s+\\((?:&?' + symbol + '\\s*)*\\)'),
pattern: RegExp(par + 'lambda\\s+\\((?:&?' + symbol + '\\s*)*\\)'),
lookbehind: true,
inside: {
keyword: /^lambda/,
Expand All @@ -125,7 +125,7 @@
}
},
car: {
pattern: new RegExp(par + symbol),
pattern: RegExp(par + symbol),
lookbehind: true
},
punctuation: [
Expand All @@ -140,14 +140,14 @@
};

var arg = {
'lisp-marker': new RegExp(marker),
'lisp-marker': RegExp(marker),
rest: {
argument: {
pattern: new RegExp(symbol),
pattern: RegExp(symbol),
alias: 'variable'
},
varform: {
pattern: new RegExp(par + symbol + '\\s+\\S[\\s\\S]*' + endpar),
pattern: RegExp(par + symbol + '\\s+\\S[\\s\\S]*' + endpar),
lookbehind: true,
inside: {
string: language.string,
Expand All @@ -163,23 +163,23 @@
var forms = '\\S+(?:\\s+\\S+)*';

var arglist = {
pattern: new RegExp(par + '[\\s\\S]*' + endpar),
pattern: RegExp(par + '[\\s\\S]*' + endpar),
lookbehind: true,
inside: {
'rest-vars': {
pattern: new RegExp('&(?:rest|body)\\s+' + forms),
pattern: RegExp('&(?:rest|body)\\s+' + forms),
inside: arg
},
'other-marker-vars': {
pattern: new RegExp('&(?:optional|aux)\\s+' + forms),
pattern: RegExp('&(?:optional|aux)\\s+' + forms),
inside: arg
},
keys: {
pattern: new RegExp('&key\\s+' + forms + '(?:\\s+&allow-other-keys)?'),
pattern: RegExp('&key\\s+' + forms + '(?:\\s+&allow-other-keys)?'),
inside: arg
},
argument: {
pattern: new RegExp(symbol),
pattern: RegExp(symbol),
alias: 'variable'
},
punctuation: /[()]/
Expand All @@ -194,4 +194,4 @@
Prism.languages.elisp = language;
Prism.languages.emacs = language;
Prism.languages['emacs-lisp'] = language;
}(Prism));
}(Prism));
2 changes: 1 addition & 1 deletion components/prism-lisp.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions plugins/normalize-whitespace/prism-normalize-whitespace.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ NormalizeWhitespace.prototype = {
},
spacesToTabs: function (input, spaces) {
spaces = spaces|0 || 4;
return input.replace(new RegExp(' {' + spaces + '}', 'g'), '\t');
return input.replace(RegExp(' {' + spaces + '}', 'g'), '\t');
},
removeTrailing: function (input) {
return input.replace(/\s*?$/gm, '');
Expand All @@ -80,7 +80,7 @@ NormalizeWhitespace.prototype = {
if (!indents[0].length)
return input;

return input.replace(new RegExp('^' + indents[0], 'gm'), '');
return input.replace(RegExp('^' + indents[0], 'gm'), '');
},
indent: function (input, tabs) {
return input.replace(/^[^\S\n\r]*(?=\S)/gm, new Array(++tabs).join('\t') + '$&');
Expand Down Expand Up @@ -187,4 +187,4 @@ Prism.hooks.add('before-sanity-check', function (env) {
}
});

}());
}());

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 44fed4d

Please sign in to comment.