feat: do not raise generic spacing on line break (#430)

* feat: Allow multiline formatting for generic-spacing ("never" config) * chore: Make sure all contributors have the same dependencies version * docs: Auto-generate readme * docs: Explain to future contributors that they should re-generating the readme * Delete yarn.lock
gajus · Sep 3, 2019 · 63815f9 · 63815f9
1 parent 2627ef0
commit 63815f9
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 12 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -31,6 +31,10 @@ Run them with `npm test`.
 
 Run with `npm run lint`.
 
+## Submitting a PR
+
+Just before submitting a PR, run `npm run create-readme` to generate the new README.md
+
 ## Adding a Rule
 
 ### Source & Tests

diff --git a/README.md b/README.md
@@ -1328,6 +1328,12 @@ type X = Promise<(string)>
 
 type X = Promise<(foo), bar, (((baz)))>
 
+type X = Promise<
+  (foo),
+  bar,
+  (((baz))),
+>
+
 // Options: ["always"]
 type X = Promise< string >
 

diff --git a/src/rules/genericSpacing.js b/src/rules/genericSpacing.js
@@ -31,21 +31,25 @@ const create = (context) => {
 
       if (never) {
         if (spacesBefore) {
-          context.report({
-            data: {name: node.id.name},
-            fix: spacingFixers.stripSpacesAfter(opener, spacesBefore),
-            message: 'There must be no space at start of "{{name}}" generic type annotation',
-            node: types,
-          });
+          if (sourceCode.text[opener.end] !== '\n') {
+            context.report({
+              data: {name: node.id.name},
+              fix: spacingFixers.stripSpacesAfter(opener, spacesBefore),
+              message: 'There must be no space at start of "{{name}}" generic type annotation',
+              node: types,
+            });
+          }
         }
 
         if (spacesAfter) {
-          context.report({
-            data: {name: node.id.name},
-            fix: spacingFixers.stripSpacesAfter(lastInnerToken, spacesAfter),
-            message: 'There must be no space at end of "{{name}}" generic type annotation',
-            node: types,
-          });
+          if (sourceCode.text[closer.start - 1] !== '\n') {
+            context.report({
+              data: {name: node.id.name},
+              fix: spacingFixers.stripSpacesAfter(lastInnerToken, spacesAfter),
+              message: 'There must be no space at end of "{{name}}" generic type annotation',
+              node: types,
+            });
+          }
         }
       } else {
         if (spacesBefore > 1) {

diff --git a/tests/rules/assertions/genericSpacing.js b/tests/rules/assertions/genericSpacing.js
@@ -129,6 +129,12 @@ export default {
     {code: 'type X = Promise<string>'},
     {code: 'type X = Promise<(string)>'},
     {code: 'type X = Promise<(foo), bar, (((baz)))>'},
+    {code:
+`type X = Promise<
+  (foo),
+  bar,
+  (((baz))),
+>`},
 
     // Always