Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions eslint-plugin-prettier.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,22 +104,28 @@ function getLocFromIndex(sourceCode, index) {
function reportDifference(context, difference) {
const { operation, offset, deleteText = '', insertText = '' } = difference;
/** @type {AST.Range} */
const range = [offset, offset + deleteText.length];
const [highlightStart, highlightEnd] = [
offset,
offset + (deleteText.length || Math.min(insertText.length, 1)),
];
/** @type {AST.Range} */
const replaceRange = [offset, offset + deleteText.length];
// `context.getSourceCode()` was deprecated in ESLint v8.40.0 and replaced
// with the `sourceCode` property.
// TODO: Only use property when our eslint peerDependency is >=8.40.0.
const sourceCode = context.sourceCode ?? context.getSourceCode();

const [start, end] = range.map(index => getLocFromIndex(sourceCode, index));

context.report({
messageId: operation,
data: {
deleteText: showInvisibles(deleteText),
insertText: showInvisibles(insertText),
},
loc: { start, end },
fix: fixer => fixer.replaceTextRange(range, insertText),
loc: {
start: getLocFromIndex(sourceCode, highlightStart),
end: getLocFromIndex(sourceCode, highlightEnd),
},
fix: fixer => fixer.replaceTextRange(replaceRange, insertText),
});
}

Expand Down
Loading