Public-Mirrors
/
markdown-it
mirror of https://github.com/markdown-it/markdown-it.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

fix inconsistent variable naming

pull/223/head
Sean Lang 9 years ago
parent
86eea8c1d3
commit
4e513aaf76
9 changed files with 52 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      lib/common/html_re.js
  2. 24
      lib/renderer.js
  3. 6
      lib/rules_block/html_block.js
  4. 10
      lib/rules_block/state_block.js
  5. 8
      lib/rules_core/replacements.js
  6. 4
      lib/rules_core/smartquotes.js
  7. 4
      lib/rules_inline/emphasis.js
  8. 26
      lib/rules_inline/state_inline.js
  9. 4
      lib/rules_inline/strikethrough.js

18
lib/common/html_re.js
View File

@ -2,27 +2,27 @@
'use strict'; 'use strict';
var attr_name = '[a-zA-Z_:][a-zA-Z0-9:._-]*'; var attrName = '[a-zA-Z_:][a-zA-Z0-9:._-]*';
var unquoted = '[^"\'=<>`\\x00-\\x20]+'; var unquoted = '[^"\'=<>`\\x00-\\x20]+';
var single_quoted = "'[^']*'"; var singleQuoted = "'[^']*'";
var double_quoted = '"[^"]*"'; var doubleQuoted = '"[^"]*"';
var attr_value = '(?:' + unquoted + '|' + single_quoted + '|' + double_quoted + ')'; var attrValue = '(?:' + unquoted + '|' + singleQuoted + '|' + doubleQuoted + ')';
var attribute = '(?:\\s+' + attr_name + '(?:\\s*=\\s*' + attr_value + ')?)'; var attribute = '(?:\\s+' + attrName + '(?:\\s*=\\s*' + attrValue + ')?)';
var open_tag = '<[A-Za-z][A-Za-z0-9\\-]*' + attribute + '*\\s*\\/?>'; var openTag = '<[A-Za-z][A-Za-z0-9\\-]*' + attribute + '*\\s*\\/?>';
var close_tag = '<\\/[A-Za-z][A-Za-z0-9\\-]*\\s*>'; var closeTag = '<\\/[A-Za-z][A-Za-z0-9\\-]*\\s*>';
var comment = '<!---->|<!--(?:-?[^>-])(?:-?[^-])*-->'; var comment = '<!---->|<!--(?:-?[^>-])(?:-?[^-])*-->';
var processing = '<[?].*?[?]>'; var processing = '<[?].*?[?]>';
var declaration = '<![A-Z]+\\s+[^>]*>'; var declaration = '<![A-Z]+\\s+[^>]*>';
var cdata = '<!\\[CDATA\\[[\\s\\S]*?\\]\\]>'; var cdata = '<!\\[CDATA\\[[\\s\\S]*?\\]\\]>';
var HTML_TAG_RE = new RegExp('^(?:' + open_tag + '|' + close_tag + '|' + comment + var HTML_TAG_RE = new RegExp('^(?:' + openTag + '|' + closeTag + '|' + comment +
'|' + processing + '|' + declaration + '|' + cdata + ')'); '|' + processing + '|' + declaration + '|' + cdata + ')');
var HTML_OPEN_CLOSE_TAG_RE = new RegExp('^(?:' + open_tag + '|' + close_tag + ')'); var HTML_OPEN_CLOSE_TAG_RE = new RegExp('^(?:' + openTag + '|' + closeTag + ')');
module.exports.HTML_TAG_RE = HTML_TAG_RE; module.exports.HTML_TAG_RE = HTML_TAG_RE;
module.exports.HTML_OPEN_CLOSE_TAG_RE = HTML_OPEN_CLOSE_TAG_RE; module.exports.HTML_OPEN_CLOSE_TAG_RE = HTML_OPEN_CLOSE_TAG_RE;

24
lib/renderer.js
View File

@ -15,20 +15,20 @@ var escapeHtml = require('./common/utils').escapeHtml;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
var default_rules = {}; var defaultRules = {};
default_rules.code_inline = function (tokens, idx /*, options, env */) { defaultRules.code_inline = function (tokens, idx /*, options, env */) {
return '<code>' + escapeHtml(tokens[idx].content) + '</code>'; return '<code>' + escapeHtml(tokens[idx].content) + '</code>';
}; };
default_rules.code_block = function (tokens, idx /*, options, env */) { defaultRules.code_block = function (tokens, idx /*, options, env */) {
return '<pre><code>' + escapeHtml(tokens[idx].content) + '</code></pre>\n'; return '<pre><code>' + escapeHtml(tokens[idx].content) + '</code></pre>\n';
}; };
default_rules.fence = function (tokens, idx, options, env, slf) { defaultRules.fence = function (tokens, idx, options, env, slf) {
var token = tokens[idx], var token = tokens[idx],
info = token.info ? unescapeAll(token.info).trim() : '', info = token.info ? unescapeAll(token.info).trim() : '',
langName = '', langName = '',
@ -55,7 +55,7 @@ default_rules.fence = function (tokens, idx, options, env, slf) {
}; };
default_rules.image = function (tokens, idx, options, env, slf) { defaultRules.image = function (tokens, idx, options, env, slf) {
var token = tokens[idx]; var token = tokens[idx];
// "alt" attr MUST be set, even if empty. Because it's mandatory and // "alt" attr MUST be set, even if empty. Because it's mandatory and
@ -70,23 +70,23 @@ default_rules.image = function (tokens, idx, options, env, slf) {
}; };
default_rules.hardbreak = function (tokens, idx, options /*, env */) { defaultRules.hardbreak = function (tokens, idx, options /*, env */) {
return options.xhtmlOut ? '<br />\n' : '<br>\n'; return options.xhtmlOut ? '<br />\n' : '<br>\n';
}; };
default_rules.softbreak = function (tokens, idx, options /*, env */) { defaultRules.softbreak = function (tokens, idx, options /*, env */) {
return options.breaks ? (options.xhtmlOut ? '<br />\n' : '<br>\n') : '\n'; return options.breaks ? (options.xhtmlOut ? '<br />\n' : '<br>\n') : '\n';
}; };
default_rules.text = function (tokens, idx /*, options, env */) { defaultRules.text = function (tokens, idx /*, options, env */) {
return escapeHtml(tokens[idx].content); return escapeHtml(tokens[idx].content);
}; };
default_rules.html_block = function (tokens, idx /*, options, env */) { defaultRules.html_block = function (tokens, idx /*, options, env */) {
return tokens[idx].content; return tokens[idx].content;
}; };
default_rules.html_inline = function (tokens, idx /*, options, env */) { defaultRules.html_inline = function (tokens, idx /*, options, env */) {
return tokens[idx].content; return tokens[idx].content;
}; };
@ -117,7 +117,7 @@ function Renderer() {
* Each rule is called as independed static function with fixed signature: * Each rule is called as independed static function with fixed signature:
* *
* ```javascript * ```javascript
* function my_token_render(tokens, idx, options, env, renderer) { * function myTokenRender(tokens, idx, options, env, renderer) {
* // ... * // ...
* return renderedHTML; * return renderedHTML;
* } * }
@ -126,7 +126,7 @@ function Renderer() {
* See [source code](https://github.com/markdown-it/markdown-it/blob/master/lib/renderer.js) * See [source code](https://github.com/markdown-it/markdown-it/blob/master/lib/renderer.js)
* for more details and examples. * for more details and examples.
**/ **/
this.rules = assign({}, default_rules); this.rules = assign({}, defaultRules);
} }

6
lib/rules_block/html_block.js
View File

@ -3,7 +3,7 @@
'use strict'; 'use strict';
var block_names = require('../common/html_blocks'); var blockNames = require('../common/html_blocks');
var HTML_OPEN_CLOSE_TAG_RE = require('../common/html_re').HTML_OPEN_CLOSE_TAG_RE; var HTML_OPEN_CLOSE_TAG_RE = require('../common/html_re').HTML_OPEN_CLOSE_TAG_RE;
// An array of opening and corresponding closing sequences for html tags, // An array of opening and corresponding closing sequences for html tags,
@ -15,12 +15,12 @@ var HTML_SEQUENCES = [
[ /^<\?/, /\?>/, true ], [ /^<\?/, /\?>/, true ],
[ /^<![A-Z]/, />/, true ], [ /^<![A-Z]/, />/, true ],
[ /^<!\[CDATA\[/, /\]\]>/, true ], [ /^<!\[CDATA\[/, /\]\]>/, true ],
[ new RegExp('^</?(' + block_names.join('|') + ')(?=(\\s|/?>|$))', 'i'), /^$/, true ], [ new RegExp('^</?(' + blockNames.join('|') + ')(?=(\\s|/?>|$))', 'i'), /^$/, true ],
[ new RegExp(HTML_OPEN_CLOSE_TAG_RE.source + '\\s*$'), /^$/, false ] [ new RegExp(HTML_OPEN_CLOSE_TAG_RE.source + '\\s*$'), /^$/, false ]
]; ];
module.exports = function html_block(state, startLine, endLine, silent) { module.exports = function htmlBlock(state, startLine, endLine, silent) {
var i, nextLine, token, lineText, var i, nextLine, token, lineText,
pos = state.bMarks[startLine] + state.tShift[startLine], pos = state.bMarks[startLine] + state.tShift[startLine],
max = state.eMarks[startLine]; max = state.eMarks[startLine];

10
lib/rules_block/state_block.js
View File

@ -7,7 +7,7 @@ var isSpace = require('../common/utils').isSpace;
function StateBlock(src, md, env, tokens) { function StateBlock(src, md, env, tokens) {
var ch, s, start, pos, len, indent, offset, indent_found; var ch, s, start, pos, len, indent, offset, indentFound;
this.src = src; this.src = src;
@ -44,12 +44,12 @@ function StateBlock(src, md, env, tokens) {
// Create caches // Create caches
// Generate markers. // Generate markers.
s = this.src; s = this.src;
indent_found = false; indentFound = false;
for (start = pos = indent = offset = 0, len = s.length; pos < len; pos++) { for (start = pos = indent = offset = 0, len = s.length; pos < len; pos++) {
ch = s.charCodeAt(pos); ch = s.charCodeAt(pos);
if (!indent_found) { if (!indentFound) {
if (isSpace(ch)) { if (isSpace(ch)) {
indent++; indent++;
@ -60,7 +60,7 @@ function StateBlock(src, md, env, tokens) {
} }
continue; continue;
} else { } else {
indent_found = true; indentFound = true;
} }
} }
@ -71,7 +71,7 @@ function StateBlock(src, md, env, tokens) {
this.tShift.push(indent); this.tShift.push(indent);
this.sCount.push(offset); this.sCount.push(offset);
indent_found = false; indentFound = false;
indent = 0; indent = 0;
offset = 0; offset = 0;
start = pos + 1; start = pos + 1;

8
lib/rules_core/replacements.js
View File

@ -33,7 +33,7 @@ function replaceFn(match, name) {
return SCOPED_ABBR[name.toLowerCase()]; return SCOPED_ABBR[name.toLowerCase()];
} }
function replace_scoped(inlineTokens) { function replaceScoped(inlineTokens) {
var i, token; var i, token;
for (i = inlineTokens.length - 1; i >= 0; i--) { for (i = inlineTokens.length - 1; i >= 0; i--) {
@ -44,7 +44,7 @@ function replace_scoped(inlineTokens) {
} }
} }
function replace_rare(inlineTokens) { function replaceRare(inlineTokens) {
var i, token; var i, token;
for (i = inlineTokens.length - 1; i >= 0; i--) { for (i = inlineTokens.length - 1; i >= 0; i--) {
@ -78,11 +78,11 @@ module.exports = function replace(state) {
if (state.tokens[blkIdx].type !== 'inline') { continue; } if (state.tokens[blkIdx].type !== 'inline') { continue; }
if (SCOPED_ABBR_TEST_RE.test(state.tokens[blkIdx].content)) { if (SCOPED_ABBR_TEST_RE.test(state.tokens[blkIdx].content)) {
replace_scoped(state.tokens[blkIdx].children); replaceScoped(state.tokens[blkIdx].children);
} }
if (RARE_RE.test(state.tokens[blkIdx].content)) { if (RARE_RE.test(state.tokens[blkIdx].content)) {
replace_rare(state.tokens[blkIdx].children); replaceRare(state.tokens[blkIdx].children);
} }
} }

4
lib/rules_core/smartquotes.js
View File

@ -16,7 +16,7 @@ function replaceAt(str, index, ch) {
return str.substr(0, index) + ch + str.substr(index + 1); return str.substr(0, index) + ch + str.substr(index + 1);
} }
function process_inlines(tokens, state) { function processInlines(tokens, state) {
var i, token, text, t, pos, max, thisLevel, item, lastChar, nextChar, var i, token, text, t, pos, max, thisLevel, item, lastChar, nextChar,
isLastPunctChar, isNextPunctChar, isLastWhiteSpace, isNextWhiteSpace, isLastPunctChar, isNextPunctChar, isLastWhiteSpace, isNextWhiteSpace,
canOpen, canClose, j, isSingle, stack, openQuote, closeQuote; canOpen, canClose, j, isSingle, stack, openQuote, closeQuote;
@ -188,6 +188,6 @@ module.exports = function smartquotes(state) {
continue; continue;
} }
process_inlines(state.tokens[blkIdx].children, state); processInlines(state.tokens[blkIdx].children, state);
} }
}; };

4
lib/rules_inline/emphasis.js
View File

@ -50,8 +50,8 @@ module.exports.tokenize = function emphasis(state, silent) {
// Boolean flags that determine if this delimiter could open or close // Boolean flags that determine if this delimiter could open or close
// an emphasis. // an emphasis.
// //
open: scanned.can_open, open: scanned.canOpen,
close: scanned.can_close close: scanned.canClose
}); });
} }

26
lib/rules_inline/state_inline.js
View File

@ -67,11 +67,11 @@ StateInline.prototype.push = function (type, tag, nesting) {
// - canSplitWord - determine if these markers can be found inside a word // - canSplitWord - determine if these markers can be found inside a word
// //
StateInline.prototype.scanDelims = function (start, canSplitWord) { StateInline.prototype.scanDelims = function (start, canSplitWord) {
var pos = start, lastChar, nextChar, count, can_open, can_close, var pos = start, lastChar, nextChar, count, canOpen, canClose,
isLastWhiteSpace, isLastPunctChar, isLastWhiteSpace, isLastPunctChar,
isNextWhiteSpace, isNextPunctChar, isNextWhiteSpace, isNextPunctChar,
left_flanking = true, leftFlanking = true,
right_flanking = true, rightFlanking = true,
max = this.posMax, max = this.posMax,
marker = this.src.charCodeAt(start); marker = this.src.charCodeAt(start);
@ -92,32 +92,32 @@ StateInline.prototype.scanDelims = function (start, canSplitWord) {
isNextWhiteSpace = isWhiteSpace(nextChar); isNextWhiteSpace = isWhiteSpace(nextChar);
if (isNextWhiteSpace) { if (isNextWhiteSpace) {
left_flanking = false; leftFlanking = false;
} else if (isNextPunctChar) { } else if (isNextPunctChar) {
if (!(isLastWhiteSpace || isLastPunctChar)) { if (!(isLastWhiteSpace || isLastPunctChar)) {
left_flanking = false; leftFlanking = false;
} }
} }
if (isLastWhiteSpace) { if (isLastWhiteSpace) {
right_flanking = false; rightFlanking = false;
} else if (isLastPunctChar) { } else if (isLastPunctChar) {
if (!(isNextWhiteSpace || isNextPunctChar)) { if (!(isNextWhiteSpace || isNextPunctChar)) {
right_flanking = false; rightFlanking = false;
} }
} }
if (!canSplitWord) { if (!canSplitWord) {
can_open = left_flanking && (!right_flanking || isLastPunctChar); canOpen = leftFlanking && (!rightFlanking || isLastPunctChar);
can_close = right_flanking && (!left_flanking || isNextPunctChar); canClose = rightFlanking && (!leftFlanking || isNextPunctChar);
} else { } else {
can_open = left_flanking; canOpen = leftFlanking;
can_close = right_flanking; canClose = rightFlanking;
} }
return { return {
can_open: can_open, canOpen: canOpen,
can_close: can_close, canClose: canClose,
length: count length: count
}; };
}; };

4
lib/rules_inline/strikethrough.js
View File

@ -36,8 +36,8 @@ module.exports.tokenize = function strikethrough(state, silent) {
token: state.tokens.length - 1, token: state.tokens.length - 1,
level: state.level, level: state.level,
end: -1, end: -1,
open: scanned.can_open, open: scanned.canOpen,
close: scanned.can_close close: scanned.canClose
}); });
} }

Write Preview
Loading…
Cancel
Save