Fix printing of comments around decorators and class properties (#3382)

prettier · Dec 3, 2017 · 8524ed5 · 8524ed5
1 parent d80728b
commit 8524ed5
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 0 deletions.
diff --git a/src/comments.js b/src/comments.js
@@ -638,6 +638,9 @@ function handleMethodNameComments(text, enclosingNode, precedingNode, comment) {
     enclosingNode &&
     precedingNode.type === "Decorator" &&
     (enclosingNode.type === "ClassMethod" ||
+      enclosingNode.type === "ClassProperty" ||
+      enclosingNode.type === "TSAbstractClassProperty" ||
+      enclosingNode.type === "TSAbstractMethodDefinition" ||
       enclosingNode.type === "MethodDefinition")
   ) {
     addTrailingComment(precedingNode, comment);

diff --git a/tests/decorator_comments/__snapshots__/jsfmt.spec.js.snap b/tests/decorator_comments/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,16 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`comments.js 1`] = `
+class Something {
+    @Annotateme()
+    // comment
+    static property: Array<string>;
+}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+class Something {
+  @Annotateme()
+  // comment
+  static property: Array<string>;
+}
+
+`;
diff --git a/tests/decorator_comments/comments.js b/tests/decorator_comments/comments.js
@@ -0,0 +1,5 @@
+class Something {
+    @Annotateme()
+    // comment
+    static property: Array<string>;
+}
diff --git a/tests/decorator_comments/jsfmt.spec.js b/tests/decorator_comments/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(__dirname, ["babylon", "typescript"]);
diff --git a/tests/typescript_decorators/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_decorators/__snapshots__/jsfmt.spec.js.snap
@@ -80,6 +80,23 @@ class Foo4 {
     async *method() {}
 }
 
+class Something {
+    @foo()
+    // comment
+    readonly property: Array<string>
+}
+
+class Something {
+    @foo()
+    // comment
+    abstract property: Array<string>
+}
+
+class Something {
+    @foo()
+    // comment
+    abstract method(): Array<string>
+}
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 class Foo1 {
   @foo
@@ -105,6 +122,24 @@ class Foo4 {
   async *method() {}
 }
 
+class Something {
+  @foo()
+  // comment
+  readonly property: Array<string>;
+}
+
+class Something {
+  @foo()
+  // comment
+  abstract property: Array<string>;
+}
+
+class Something {
+  @foo()
+  // comment
+  abstract method(): Array<string>;
+}
+
 `;
 
 exports[`inline-decorators.ts 1`] = `

diff --git a/tests/typescript_decorators/decorators-comments.js b/tests/typescript_decorators/decorators-comments.js
@@ -23,3 +23,20 @@ class Foo4 {
     async *method() {}
 }
 
+class Something {
+    @foo()
+    // comment
+    readonly property: Array<string>
+}
+
+class Something {
+    @foo()
+    // comment
+    abstract property: Array<string>
+}
+
+class Something {
+    @foo()
+    // comment
+    abstract method(): Array<string>
+}