Browse Source

Removed unnecessary checks

pull/82/head
Vitaly Puzrin 10 years ago
parent
commit
d6128515b3
  1. 35
      lib/rules_block/paragraph.js
  2. 30
      lib/rules_block/reference.js

35
lib/rules_block/paragraph.js

@ -4,31 +4,26 @@
module.exports = function paragraph(state, startLine/*, endLine*/) { module.exports = function paragraph(state, startLine/*, endLine*/) {
var endLine, content, terminate, i, l, token, var content, terminate, i, l, token,
nextLine = startLine + 1, nextLine = startLine + 1,
terminatorRules; terminatorRules = state.md.block.ruler.getRules('paragraph'),
endLine = state.lineMax;
endLine = state.lineMax;
// jump line-by-line until empty one or EOF // jump line-by-line until empty one or EOF
if (nextLine < endLine && !state.isEmpty(nextLine)) { for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
terminatorRules = state.md.block.ruler.getRules('paragraph'); // this would be a code block normally, but after paragraph
// it's considered a lazy continuation regardless of what's there
for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) { if (state.tShift[nextLine] - state.blkIndent > 3) { continue; }
// this would be a code block normally, but after paragraph
// it's considered a lazy continuation regardless of what's there // Some tags can terminate paragraph without empty line.
if (state.tShift[nextLine] - state.blkIndent > 3) { continue; } terminate = false;
for (i = 0, l = terminatorRules.length; i < l; i++) {
// Some tags can terminate paragraph without empty line. if (terminatorRules[i](state, nextLine, endLine, true)) {
terminate = false; terminate = true;
for (i = 0, l = terminatorRules.length; i < l; i++) { break;
if (terminatorRules[i](state, nextLine, endLine, true)) {
terminate = true;
break;
}
} }
if (terminate) { break; }
} }
if (terminate) { break; }
} }
content = state.getLines(startLine, nextLine, state.blkIndent, false).trim(); content = state.getLines(startLine, nextLine, state.blkIndent, false).trim();

30
lib/rules_block/reference.js

@ -43,24 +43,22 @@ module.exports = function reference(state, startLine, _endLine, silent) {
endLine = state.lineMax; endLine = state.lineMax;
// jump line-by-line until empty one or EOF // jump line-by-line until empty one or EOF
if (nextLine < endLine && !state.isEmpty(nextLine)) { terminatorRules = state.md.block.ruler.getRules('reference');
terminatorRules = state.md.block.ruler.getRules('reference');
for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) { // this would be a code block normally, but after paragraph
// this would be a code block normally, but after paragraph // it's considered a lazy continuation regardless of what's there
// it's considered a lazy continuation regardless of what's there if (state.tShift[nextLine] - state.blkIndent > 3) { continue; }
if (state.tShift[nextLine] - state.blkIndent > 3) { continue; }
// Some tags can terminate paragraph without empty line.
// Some tags can terminate paragraph without empty line. terminate = false;
terminate = false; for (i = 0, l = terminatorRules.length; i < l; i++) {
for (i = 0, l = terminatorRules.length; i < l; i++) { if (terminatorRules[i](state, nextLine, endLine, true)) {
if (terminatorRules[i](state, nextLine, endLine, true)) { terminate = true;
terminate = true; break;
break;
}
} }
if (terminate) { break; }
} }
if (terminate) { break; }
} }
str = state.getLines(startLine, nextLine, state.blkIndent, false).trim(); str = state.getLines(startLine, nextLine, state.blkIndent, false).trim();

Loading…
Cancel
Save