CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v2.6.2 (2018-07-06)
+
+* 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))
+* Docs: Add clarification about Flow/React support to readme ([#96](https://github.com/prettier/eslint-plugin-prettier/issues/96)) ([977aa77](https://github.com/prettier/eslint-plugin-prettier/commit/977aa77a119f22af3f8ca8d6f47e5bcfcc9e23fb))
+
 ## v2.6.1 (2018-06-23)
 
 * Fix: respect editorconfig ([#92](https://github.com/prettier/eslint-plugin-prettier/issues/92)) ([0b04dd3](https://github.com/prettier/eslint-plugin-prettier/commit/0b04dd362d0d92534a7cf11eaebbab8eb59fc96d))

README.md

@@ -66,7 +66,7 @@ To integrate this plugin with `eslint-config-prettier`, you can use the `"recomm
   npm install --save-dev eslint-config-prettier
   ```
 
-2. Then all you need in your `.eslintrc.json` is:
+2. Then you need to add `plugin:prettier/recommended` as the last extension in your `.eslintrc.json`:
 
   ```json
   {
@@ -78,12 +78,27 @@ To integrate this plugin with `eslint-config-prettier`, you can use the `"recomm
 
 This does three things:
 
-1. Enables `eslint-plugin-prettier`.
-2. Sets the `prettier/prettier` rule to `"error"`.
-3. Extends the `eslint-config-prettier` configuration.
+* Enables `eslint-plugin-prettier`.
+* Sets the `prettier/prettier` rule to `"error"`.
+* Extends the `eslint-config-prettier` configuration.
 
 You can then set Prettier's own options inside a `.prettierrc` file.
 
+3. In order to support special ESLint plugins (e.g. [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react)), add extra exclusions for the plugins you use like so:
+
+```json
+{
+  "extends": [
+    "plugin:prettier/recommended",
+    "prettier/flowtype",
+    "prettier/react",
+    "prettier/standard"
+  ]
+}
+```
+
+For the list of every available exclusion rule set, please see the [readme of eslint-config-prettier](https://github.com/prettier/eslint-config-prettier/blob/master/README.md).
+
 ## Options
 
 > Note: While it is possible to pass options to Prettier via your ESLint configuration file, it is not recommended because editor extensions such as `prettier-atom` and `prettier-vscode` **will** read [`.prettierrc`](https://prettier.io/docs/en/configuration.html), but **won't** read settings from ESLint, which can lead to an inconsistent experience.

eslint-plugin-prettier.js

@@ -100,6 +100,9 @@ function showInvisibles(str) {
       case '\t':
         ret += '↹'; // Left Arrow To Bar Over Right Arrow To Bar, \u21b9
         break;
+      case '\r':
+        ret += '␍'; // Carriage Return Symbol, \u240D
+        break;
       default:
         ret += str[i];
         break;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-prettier",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "Runs prettier as an eslint rule",
   "keywords": [
     "eslint",

test/prettier.js

@@ -110,6 +110,15 @@ vueRuleTester.run('prettier', rule, {
   ]
 });
 
+describe('showInvisibles', () => {
+  it('shows invisibles', () => {
+    assert.equal(
+      eslintPluginPrettier.showInvisibles('1 2\n3\t4\r5'),
+      '1·2⏎3↹4␍5'
+    );
+  });
+});
+
 describe('generateDifferences', () => {
   it('operation: insert', () => {
     const differences = eslintPluginPrettier.generateDifferences(