Remove regexp from rule definition to simplify API.

This commit is contained in:
David Anson 2018-01-16 21:27:38 -08:00
parent d47091078e
commit a0e3b4db90
3 changed files with 67 additions and 154 deletions

View file

@ -145,6 +145,7 @@ function lintContent(
var lineNumber = token.lineNumber;
(token.children || []).forEach(function forChild(child) {
child.lineNumber = lineNumber;
child.line = lines[lineNumber - 1];
if ((child.type === "softbreak") || (child.type === "hardbreak")) {
lineNumber++;
}
@ -253,24 +254,6 @@ function lintContent(
if (resultVersion === 0) {
return error.lineNumber;
}
var range = error.range;
var regexp = rule.regexp;
if (!range && regexp) {
if (typeof regexp === "function") {
regexp = regexp(params.options);
}
var lineIndex = error.lineNumber - frontMatterLines.length - 1;
var match = lines[lineIndex].match(regexp);
if (match) {
var column = match.index + 1;
var length = match[0].length;
if (match[2]) {
column += match[1].length;
length -= match[1].length;
}
range = [ column, length ];
}
}
var errorObject = {};
errorObject.lineNumber = error.lineNumber;
if (resultVersion === 1) {
@ -282,7 +265,7 @@ function lintContent(
errorObject.ruleDescription = rule.desc;
errorObject.errorDetail = error.detail;
errorObject.errorContext = error.context;
errorObject.errorRange = range;
errorObject.errorRange = error.range;
return errorObject;
});
if (filteredErrors.length) {