Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update: support multiple fixes in a report (fixes #7348) #8101

Merged
merged 9 commits into from Jun 18, 2017
Merged

Update: support multiple fixes in a report (fixes #7348) #8101

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
926b00a
Update: support multiple fixes in a report (refs #7348)
mysticatea Feb 28, 2017
7271a5e
Chore: refactor fix of arrow-body-style
mysticatea Feb 18, 2017
5dba973
Chore: add a test for semi
mysticatea Feb 16, 2017
cc5de10
Merge changes from master branch.
mysticatea May 4, 2017
c888f09
add docs
mysticatea Jun 16, 2017
3847673
fix for negative indices
mysticatea Jun 16, 2017
a4c3372
Merge remote-tracking branch 'origin/master' into multiple-fixes-per-…
mysticatea Jun 16, 2017
f85aee0
add docs
mysticatea Jun 16, 2017
11a9043
fix for overlapping of negative ranges
mysticatea Jun 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions lib/rule-context.js
View file
Open in desktop
Expand Up @@ -92,12 +92,14 @@ function mergeFixes(fixes, sourceCode) {
const start = fixes[0].range[0];
const end = fixes[fixes.length - 1].range[1];
let text = "";
let lastPos = start;
let lastPos = Math.max(0, start);

for (const fix of fixes) {
assert(fix.range[0] >= lastPos, "Fix objects must not be overlapped in a report.");
assert(fix.range[0] >= lastPos || fix.range[0] < 0, "Fix objects must not be overlapped in a report.");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would this fail to detect a conflict if two fixes have ranges [-1, 0] and [-1, 5]? It seems like the assertion will always pass for fixes that start at -1.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch.


text += originalText.slice(lastPos, fix.range[0]);
if (fix.range[0] >= 0) {
text += originalText.slice(lastPos, fix.range[0]);
}
text += fix.text;
lastPos = fix.range[1];
}
Expand Down
74 changes: 74 additions & 0 deletions tests/lib/rule-context.js
View file
Open in desktop
Expand Up @@ -161,6 +161,80 @@ describe("RuleContext", () => {

mockESLint.verify();
});


it("should handle inserting BOM correctly.", () => {
const mockESLint = sandbox.mock(eslint);

mockESLint.expects("getSourceCode")
.returns({ text: "var foo = 100;" });
mockESLint.expects("report")
.once()
.withArgs(
sinon.match.any,
sinon.match.any,
sinon.match.any,
sinon.match.any,
sinon.match.any,
sinon.match.any,
sinon.match({
range: [0, 13],
text: "\uFEFFvar bar = 234"
})
);

ruleContext.report({
node: {},
loc: {},
message: "Message",
fix(fixer) {
return [
fixer.insertTextBeforeRange([0, 1], "\uFEFF"),
fixer.replaceTextRange([10, 13], "234"),
fixer.replaceTextRange([4, 7], "bar")
];
}
});

mockESLint.verify();
});


it("should handle removing BOM correctly.", () => {
const mockESLint = sandbox.mock(eslint);

mockESLint.expects("getSourceCode")
.returns({ text: "var foo = 100;" });
mockESLint.expects("report")
.once()
.withArgs(
sinon.match.any,
sinon.match.any,
sinon.match.any,
sinon.match.any,
sinon.match.any,
sinon.match.any,
sinon.match({
range: [-1, 13],
text: "var bar = 234"
})
);

ruleContext.report({
node: {},
loc: {},
message: "Message",
fix(fixer) {
return [
fixer.removeRange([-1, 0]),
fixer.replaceTextRange([10, 13], "234"),
fixer.replaceTextRange([4, 7], "bar")
];
}
});

mockESLint.verify();
});
});
});

Expand Down