Skip to content

Commit 5237166

Browse files
committed
Respect .prettierignore config
1 parent bc33780 commit 5237166

File tree

3 files changed

+47
-35
lines changed

3 files changed

+47
-35
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## v2.6.3 (2018-07-17)
4+
5+
* Fix: respect .prettierignore settings ([#88](https://github.com/prettier/eslint-plugin-prettier/issues/88))
6+
37
## v2.6.2 (2018-07-06)
48

59
* Fix: Add representation for \r to showInvisibles ([#100](https://github.com/prettier/eslint-plugin-prettier/issues/100)) ([731bbb5](https://github.com/prettier/eslint-plugin-prettier/commit/731bbb576ce422a5c73a1fa9750aa3466c7da928))

eslint-plugin-prettier.js

Lines changed: 41 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ module.exports = {
357357
!context.options[1] || context.options[1].usePrettierrc !== false;
358358
const sourceCode = context.getSourceCode();
359359
const source = sourceCode.text;
360+
const sourceFileName = context.getFilename();
360361

361362
// The pragma is only valid if it is found in a block comment at the very
362363
// start of the file.
@@ -401,48 +402,55 @@ module.exports = {
401402
usePrettierrc &&
402403
prettier.resolveConfig &&
403404
prettier.resolveConfig.sync
404-
? prettier.resolveConfig.sync(context.getFilename(), {
405+
? prettier.resolveConfig.sync(sourceFileName, {
405406
editorconfig: true
406407
})
407408
: null;
408409
const prettierOptions = Object.assign(
409410
{},
410411
prettierRcOptions,
411412
eslintPrettierOptions,
412-
{ filepath: context.getFilename() }
413+
{ filepath: sourceFileName }
413414
);
414-
415415
const prettierSource = prettier.format(source, prettierOptions);
416-
if (source !== prettierSource) {
417-
const differences = generateDifferences(source, prettierSource);
418-
419-
differences.forEach(difference => {
420-
switch (difference.operation) {
421-
case OPERATION_INSERT:
422-
reportInsert(
423-
context,
424-
difference.offset,
425-
difference.insertText
426-
);
427-
break;
428-
case OPERATION_DELETE:
429-
reportDelete(
430-
context,
431-
difference.offset,
432-
difference.deleteText
433-
);
434-
break;
435-
case OPERATION_REPLACE:
436-
reportReplace(
437-
context,
438-
difference.offset,
439-
difference.deleteText,
440-
difference.insertText
441-
);
442-
break;
443-
}
444-
});
445-
}
416+
417+
prettier.getFileInfo(sourceFileName, {
418+
ignorePath: '.prettierignore'
419+
}).then((sourceFileInfo) => {
420+
if (sourceFileInfo.ignored && source !== prettierSource) {
421+
const differences = generateDifferences(source, prettierSource);
422+
423+
differences.forEach(difference => {
424+
switch (difference.operation) {
425+
case OPERATION_INSERT:
426+
reportInsert(
427+
context,
428+
difference.offset,
429+
difference.insertText
430+
);
431+
break;
432+
case OPERATION_DELETE:
433+
reportDelete(
434+
context,
435+
difference.offset,
436+
difference.deleteText
437+
);
438+
break;
439+
case OPERATION_REPLACE:
440+
reportReplace(
441+
context,
442+
difference.offset,
443+
difference.deleteText,
444+
difference.insertText
445+
);
446+
break;
447+
}
448+
});
449+
}
450+
}).catch(() => {
451+
// catches UnhandledPromiseRejectionWarnings caused
452+
// by RangeErrors.
453+
});
446454
}
447455
};
448456
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eslint-plugin-prettier",
3-
"version": "2.6.2",
3+
"version": "2.6.3",
44
"description": "Runs prettier as an eslint rule",
55
"keywords": [
66
"eslint",
@@ -41,7 +41,7 @@
4141
"eslint-plugin-self": "^1.0.1",
4242
"mocha": "^3.1.2",
4343
"moment": "^2.18.1",
44-
"prettier": "^1.10.2",
44+
"prettier": "^1.13.0",
4545
"semver": "^5.3.0",
4646
"vue-eslint-parser": "^2.0.2"
4747
},

0 commit comments

Comments
 (0)