From 1740c405bfd628e8476b5b3b8ee1e1a379a0f851 Mon Sep 17 00:00:00 2001 From: Micha Reiser Date: Tue, 16 Aug 2022 18:10:50 +0200 Subject: [PATCH] rebase --- .../src/js/classes/extends_clause.rs | 2 + .../tests/specs/js/module/class/class.js.snap | 10 +- .../prettier/js/classes/assignment.js.snap | 113 ------------------ 3 files changed, 5 insertions(+), 120 deletions(-) delete mode 100644 crates/rome_js_formatter/tests/specs/prettier/js/classes/assignment.js.snap diff --git a/crates/rome_js_formatter/src/js/classes/extends_clause.rs b/crates/rome_js_formatter/src/js/classes/extends_clause.rs index df00e9a1ed47..8d37c889ae6a 100644 --- a/crates/rome_js_formatter/src/js/classes/extends_clause.rs +++ b/crates/rome_js_formatter/src/js/classes/extends_clause.rs @@ -1,5 +1,6 @@ use crate::prelude::*; +use crate::parentheses::resolve_parent; use rome_formatter::{format_args, write}; use rome_js_syntax::JsExtendsClauseFields; use rome_js_syntax::JsSyntaxKind::JS_ASSIGNMENT_EXPRESSION; @@ -31,6 +32,7 @@ impl FormatNodeRule for FormatJsExtendsClause { if node .syntax() .parent() + .and_then(|node| resolve_parent(&node)) .map_or(false, |p| p.kind() == JS_ASSIGNMENT_EXPRESSION) { if super_class.syntax().has_leading_comments() || has_trailing_comments { diff --git a/crates/rome_js_formatter/tests/specs/js/module/class/class.js.snap b/crates/rome_js_formatter/tests/specs/js/module/class/class.js.snap index 78c41f4bec8e..56f257a8e5d0 100644 --- a/crates/rome_js_formatter/tests/specs/js/module/class/class.js.snap +++ b/crates/rome_js_formatter/tests/specs/js/module/class/class.js.snap @@ -1,6 +1,5 @@ --- source: crates/rome_js_formatter/tests/spec_test.rs -assertion_line: 257 expression: class.js --- # Input @@ -135,7 +134,9 @@ x = class {}; x = class foo extends Boar {}; -x = class aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa extends bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb {}; +x = class aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa extends ( + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb +) {}; export class Task { constructor(script, duration, threadCount, ...args) { @@ -143,8 +144,3 @@ export class Task { } } - -## Lines exceeding width of 80 characters - - 53: x = class aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa extends bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb {}; - diff --git a/crates/rome_js_formatter/tests/specs/prettier/js/classes/assignment.js.snap b/crates/rome_js_formatter/tests/specs/prettier/js/classes/assignment.js.snap deleted file mode 100644 index bad7dfdb08c2..000000000000 --- a/crates/rome_js_formatter/tests/specs/prettier/js/classes/assignment.js.snap +++ /dev/null @@ -1,113 +0,0 @@ ---- -source: crates/rome_js_formatter/tests/prettier_tests.rs ---- - -# Input - -```js -aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends ( - aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg1 -) { - method () { - console.log("foo"); - } -}; - -foo = class extends bar { - method() { - console.log("foo"); - } -}; - -aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends bar { - method() { - console.log("foo"); - } -}; - -foo = class extends aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 { - method() { - console.log("foo"); - } -}; - -module.exports = class A extends B { - method () { - console.log("foo"); - } -}; -``` - - -# Prettier differences - -```diff ---- Prettier -+++ Rome -@@ -12,17 +12,14 @@ - } - }; - --aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends ( -- bar --) { -+aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends bar { - method() { - console.log("foo"); - } - }; - --foo = class extends ( -- aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 --) { -+foo = class extends aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff -+ .gggggggg2 { - method() { - console.log("foo"); - } -``` - -# Output - -```js -aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends ( - aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg1 -) { - method() { - console.log("foo"); - } -}; - -foo = class extends bar { - method() { - console.log("foo"); - } -}; - -aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends bar { - method() { - console.log("foo"); - } -}; - -foo = class extends aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff - .gggggggg2 { - method() { - console.log("foo"); - } -}; - -module.exports = class A extends B { - method() { - console.log("foo"); - } -}; -``` - - -# Lines exceeding max width of 80 characters -``` - 1: aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends ( - 15: aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends bar { -``` -