Skip to content

Commit

Permalink
no use arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
segayuu committed Mar 30, 2018
1 parent f3d7cad commit 9f51f9d
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 32 deletions.
4 changes: 2 additions & 2 deletions lib/plugins/renderer/swig.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ swig.setDefaults({
});

// Hack: Override for tag of Swig
swig.setTag('for', forTag.parse, function(compiler, args, content, parents, options, blockName) {
const compile = forTag.compile.apply(this, arguments).split('\n');
swig.setTag('for', forTag.parse, function(...args) {
const compile = forTag.compile.apply(this, args).split('\n');

compile.splice(3, 0, ' if (!Array.isArray(__l) && typeof __l.toArray === "function") { __l = __l.toArray(); }');

Expand Down
47 changes: 24 additions & 23 deletions lib/plugins/tag/code.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,43 +26,42 @@ const rMark = /\s*mark:([0-9,-]+)/i;
*/

function getHighlightOptions(config, arg) {
let caption = '';
let lang = '';
let line_number = config.line_number;
let first_line = 1;
let mark = [];
let match;

let lang = '';
if (rLang.test(arg)) {
arg = arg.replace(rLang, function() {
lang = arguments[1];
arg = arg.replace(rLang, (match, _lang) => {
lang = _lang;
return '';
});
}

let line_number = config.line_number;
if (rLineNumber.test(arg)) {
arg = arg.replace(rLineNumber, function() {
line_number = arguments[1] === 'true';
arg = arg.replace(rLineNumber, (match, _line_number) => {
line_number = _line_number === 'true';
return '';
});
}

let first_line = 1;
if (rFirstLine.test(arg)) {
arg = arg.replace(rFirstLine, function() {
first_line = arguments[1];
arg = arg.replace(rFirstLine, (match, _first_line) => {
first_line = _first_line;
return '';
});
}

let mark = [];
if (rMark.test(arg)) {
arg = arg.replace(rMark, function() {
mark = arguments[1].split(',').reduce(function getMarkedLines(prev, cur) {
let a, b, temp;
arg = arg.replace(rMark, (match, _mark) => {
mark = _mark.split(',').reduce(function getMarkedLines(prev, cur) {
if (/-/.test(cur)) {
a = Number(cur.substr(0, cur.indexOf('-')));
b = Number(cur.substr(cur.indexOf('-') + 1));
let a = Number(cur.substr(0, cur.indexOf('-')));
let b = Number(cur.substr(cur.indexOf('-') + 1));
if (b < a) { // switch a & b
temp = a; a = b; b = temp;
const temp = a;
a = b;
b = temp;
}

for (; a <= b; a++) {
Expand All @@ -80,16 +79,18 @@ function getHighlightOptions(config, arg) {
});
}

let caption = '';
if (rCaptionUrlTitle.test(arg)) {
match = arg.match(rCaptionUrlTitle);
const match = arg.match(rCaptionUrlTitle);
caption = `<span>${match[1]}</span><a href="${match[2]}${match[3]}">${match[4]}</a>`;
} else if (rCaptionUrl.test(arg)) {
match = arg.match(rCaptionUrl);
const match = arg.match(rCaptionUrl);
caption = `<span>${match[1]}</span><a href="${match[2]}${match[3]}">link</a>`;
} else if (rCaption.test(arg)) {
match = arg.match(rCaption);
const match = arg.match(rCaption);
caption = `<span>${match[1]}</span>`;
}

return {
lang,
firstLine: first_line,
Expand All @@ -108,8 +109,8 @@ module.exports = ctx => function codeTag(args, content) {
let enable = config.enable;

if (rHighlight.test(arg)) {
arg = arg.replace(rHighlight, function() {
enable = arguments[1] === 'true';
arg = arg.replace(rHighlight, (_enable) => {
enable = _enable === 'true';
return '';
});
}
Expand Down
13 changes: 6 additions & 7 deletions lib/plugins/tag/include_code.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,20 @@ module.exports = ctx => function includeCodeTag(args) {
const config = ctx.config.highlight || {};
let codeDir = ctx.config.code_dir;
let arg = args.join(' ');
let path = '';
let title = '';
let lang = '';
let caption = '';

// Add trailing slash to codeDir
if (codeDir[codeDir.length - 1] !== '/') codeDir += '/';

let lang = '';
if (rLang.test(arg)) {
arg = arg.replace(rLang, function() {
lang = arguments[1];
arg = arg.replace(rLang, (match, _lang) => {
lang = _lang;
return '';
});
}

let title = '';
let path = '';
if (rCaptionTitleFile.test(arg)) {
const match = arg.match(rCaptionTitleFile);
title = match[1];
Expand Down Expand Up @@ -63,7 +62,7 @@ module.exports = ctx => function includeCodeTag(args) {
// If the language is not defined, use file extension instead
lang = lang || pathFn.extname(path).substring(1);

caption = `<span>${title}</span><a href="${ctx.config.root}${codeDir}${path}">view raw</a>`;
const caption = `<span>${title}</span><a href="${ctx.config.root}${codeDir}${path}">view raw</a>`;

return highlight(code, {
lang,
Expand Down

0 comments on commit 9f51f9d

Please sign in to comment.