From 21a9a545973fdea305d4f27358384207940706c5 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <34116392+bluwy@users.noreply.github.com>
Date: Thu, 30 Sep 2021 15:02:35 +0800
Subject: [PATCH] (feat) support bracketSameLine (#251)

---
 CHANGELOG.md                                     |  4 ++++
 README.md                                        |  2 ++
 package-lock.json                                | 12 ++++++------
 package.json                                     |  4 ++--
 src/options.ts                                   | 12 ++++++++++--
 src/print/index.ts                               | 14 ++++++++------
 src/print/node-helpers.ts                        |  3 ++-
 .../attributes-bracket-same-line/input.html      |  4 ++++
 .../attributes-bracket-same-line/options.json    |  3 +++
 .../attributes-bracket-same-line/output.html     | 16 ++++++++++++++++
 .../samples/attribute-bracket-same-line.html     |  1 +
 .../attribute-bracket-same-line.options.json     |  3 +++
 12 files changed, 61 insertions(+), 17 deletions(-)
 create mode 100644 test/formatting/samples/attributes-bracket-same-line/input.html
 create mode 100644 test/formatting/samples/attributes-bracket-same-line/options.json
 create mode 100644 test/formatting/samples/attributes-bracket-same-line/output.html
 create mode 100644 test/printer/samples/attribute-bracket-same-line.html
 create mode 100644 test/printer/samples/attribute-bracket-same-line.options.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6c3b073..bee257d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # prettier-plugin-svelte changelog
 
+## 2.5.0 (Unreleased)
+
+* (feat) Support `bracketSameLine` option and deprecate `svelteBracketNewLine` ([#251](https://github.com/sveltejs/prettier-plugin-svelte/pull/251))
+
 ## 2.4.0
 
 * (feat) Add support for formatting Pug inside `<template>` tags, if the corresponding plugin is available ([#248](https://github.com/sveltejs/prettier-plugin-svelte/pull/248))
diff --git a/README.md b/README.md
index e67583c6..daad54db 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,8 @@ Example:
 
 ### Svelte Bracket New Line
 
+> Deprecated since 2.5.0. Use Prettier 2.4.0 and [bracketSameLine](https://prettier.io/docs/en/options.html#bracket-line) instead.
+
 Put the `>` of a multiline element on a new line. Roughly the Svelte equivalent of the [jsxBracketSameLine](https://prettier.io/docs/en/options.html#jsx-brackets) rule. Setting this to `false` will have no effect for whitespace-sensitive tags (inline elements) when there's no whitespace between the `>` of the start tag and the inner content, or when there's no whitespace after the `>` of the end tag. 
 
 Example:
diff --git a/package-lock.json b/package-lock.json
index bf886455..3bafe16b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -220,9 +220,9 @@
             "dev": true
         },
         "@types/prettier": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.6.tgz",
-            "integrity": "sha512-6gOkRe7OIioWAXfnO/2lFiv+SJichKVSys1mSsgyrYHSEjk8Ctv4tSR/Odvnu+HWlH2C8j53dahU03XmQdd5fA==",
+            "version": "2.4.1",
+            "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.1.tgz",
+            "integrity": "sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw==",
             "dev": true
         },
         "@types/resolve": {
@@ -2048,9 +2048,9 @@
             "dev": true
         },
         "prettier": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz",
-            "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==",
+            "version": "2.4.1",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz",
+            "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==",
             "dev": true
         },
         "pretty-ms": {
diff --git a/package.json b/package.json
index a7450f3d..12dc3414 100644
--- a/package.json
+++ b/package.json
@@ -32,9 +32,9 @@
         "@rollup/plugin-commonjs": "14.0.0",
         "@rollup/plugin-node-resolve": "11.0.1",
         "@types/node": "^10.12.18",
-        "@types/prettier": "^2.1.6",
+        "@types/prettier": "^2.4.1",
         "ava": "3.15.0",
-        "prettier": "^2.3.0",
+        "prettier": "^2.4.1",
         "rollup": "2.36.0",
         "rollup-plugin-typescript": "1.0.1",
         "svelte": "^3.38.2",
diff --git a/src/options.ts b/src/options.ts
index 6c30e6ec..eb3cef1e 100644
--- a/src/options.ts
+++ b/src/options.ts
@@ -1,4 +1,4 @@
-import { SupportOption } from 'prettier';
+import { ParserOptions, SupportOption } from 'prettier';
 
 declare module 'prettier' {
     interface RequiredOptions extends PluginOptions {}
@@ -68,8 +68,8 @@ export const options: Record<keyof PluginOptions, SupportOption> = {
         since: '0.6.0',
         category: 'Svelte',
         type: 'boolean',
-        default: true,
         description: 'Put the `>` of a multiline element on a new line',
+        deprecated: '2.5.0',
     },
     svelteAllowShorthand: {
         since: '1.0.0',
@@ -139,3 +139,11 @@ export function parseSortOrder(sortOrder: SortOrder): SortOrderPart[] {
     }
     return order;
 }
+
+export function isBracketSameLine(options: ParserOptions): boolean {
+    return options.svelteBracketNewLine != null
+        ? !options.svelteBracketNewLine
+        : options.bracketSameLine != null
+        ? options.bracketSameLine
+        : false;
+}
diff --git a/src/print/index.ts b/src/print/index.ts
index 6651aa0f..e3a6a5b7 100644
--- a/src/print/index.ts
+++ b/src/print/index.ts
@@ -3,7 +3,7 @@ import { formattableAttributes, selfClosingTags } from '../lib/elements';
 import { extractAttributes } from '../lib/extractAttributes';
 import { getText } from '../lib/getText';
 import { hasSnippedContent, unsnipContent } from '../lib/snipTagContent';
-import { parseSortOrder, SortOrderPart } from '../options';
+import { isBracketSameLine, parseSortOrder, SortOrderPart } from '../options';
 import { isEmptyDoc, isLine, trim, trimRight } from './doc-helpers';
 import { flatten, isASTNode, isPreTagContent, replaceEndOfLineWith } from './helpers';
 import {
@@ -82,6 +82,8 @@ function groupConcat(contents: doc.builders.Doc[]): doc.builders.Doc {
 }
 
 export function print(path: FastPath, options: ParserOptions, print: PrintFn): Doc {
+    const bracketSameLine = isBracketSameLine(options);
+
     const n = path.getValue();
     if (!n) {
         return '';
@@ -210,11 +212,11 @@ export function print(path: FastPath, options: ParserOptions, print: PrintFn): D
                         groupConcat([
                             possibleThisBinding,
                             ...attributes,
-                            options.svelteBracketNewLine ? dedent(line) : '',
+                            bracketSameLine ? '' : dedent(line),
                         ]),
                     ),
 
-                    ...[options.svelteBracketNewLine ? '' : ' ', `/>`],
+                    ...[bracketSameLine ? ' ' : '', `/>`],
                 ]);
             }
 
@@ -236,7 +238,7 @@ export function print(path: FastPath, options: ParserOptions, print: PrintFn): D
                     isTextNodeStartingWithWhitespace(node.children[0]) &&
                     !isPreTagContent(path)
                         ? () => line
-                        : () => (options.svelteBracketNewLine ? '' : softline);
+                        : () => (bracketSameLine ? softline : '');
             } else if (isPreTagContent(path)) {
                 body = () => printRaw(node, options.originalText);
             } else if (!isSupportedLanguage) {
@@ -257,7 +259,7 @@ export function print(path: FastPath, options: ParserOptions, print: PrintFn): D
                         ...attributes,
                         hugStart
                             ? ''
-                            : options.svelteBracketNewLine && !isPreTagContent(path)
+                            : !bracketSameLine && !isPreTagContent(path)
                             ? dedent(softline)
                             : '',
                     ]),
@@ -282,7 +284,7 @@ export function print(path: FastPath, options: ParserOptions, print: PrintFn): D
                     groupConcat(['>', body(), `</${node.name}`]),
                 ]);
                 const omitSoftlineBeforeClosingTag =
-                    (isEmpty && options.svelteBracketNewLine) ||
+                    (isEmpty && !bracketSameLine) ||
                     canOmitSoftlineBeforeClosingTag(node, path, options);
                 return groupConcat([
                     ...openingTag,
diff --git a/src/print/node-helpers.ts b/src/print/node-helpers.ts
index eab93540..0d8f94b8 100644
--- a/src/print/node-helpers.ts
+++ b/src/print/node-helpers.ts
@@ -24,6 +24,7 @@ import {
 import { blockElements, TagName } from '../lib/elements';
 import { FastPath, ParserOptions } from 'prettier';
 import { findLastIndex, isASTNode, isPreTagContent } from './helpers';
+import { isBracketSameLine } from '../options';
 
 const unsupportedLanguages = ['coffee', 'coffeescript', 'styl', 'stylus', 'sass'];
 
@@ -520,7 +521,7 @@ export function canOmitSoftlineBeforeClosingTag(
     options: ParserOptions,
 ): boolean {
     return (
-        !options.svelteBracketNewLine &&
+        isBracketSameLine(options) &&
         (!hugsStartOfNextNode(node, options) || isLastChildWithinParentBlockElement(path, options))
     );
 }
diff --git a/test/formatting/samples/attributes-bracket-same-line/input.html b/test/formatting/samples/attributes-bracket-same-line/input.html
new file mode 100644
index 00000000..99394020
--- /dev/null
+++ b/test/formatting/samples/attributes-bracket-same-line/input.html
@@ -0,0 +1,4 @@
+<button class="bg-green-500 text-gray-100 hover:bg-green-400 flex items-center px-4 py-2 border border-l-0 rounded-r"> Copy </button>
+<div class="bg-green-500 text-gray-100 hover:bg-green-400 flex items-center px-4 py-2 border border-l-0 rounded-r"> Copy </div>
+<span class="bg-green-500 text-gray-100 hover:bg-green-400 flex items-center px-4 py-2 border border-l-0 rounded-r"> Copy </span>
+<p class="bg-green-500 text-gray-100 hover:bg-green-400 flex items-center px-4 py-2 border border-l-0 rounded-r"> Copy </p>
\ No newline at end of file
diff --git a/test/formatting/samples/attributes-bracket-same-line/options.json b/test/formatting/samples/attributes-bracket-same-line/options.json
new file mode 100644
index 00000000..5d236171
--- /dev/null
+++ b/test/formatting/samples/attributes-bracket-same-line/options.json
@@ -0,0 +1,3 @@
+{
+    "bracketSameLine": true
+}
diff --git a/test/formatting/samples/attributes-bracket-same-line/output.html b/test/formatting/samples/attributes-bracket-same-line/output.html
new file mode 100644
index 00000000..9262ddcd
--- /dev/null
+++ b/test/formatting/samples/attributes-bracket-same-line/output.html
@@ -0,0 +1,16 @@
+<button
+    class="bg-green-500 text-gray-100 hover:bg-green-400 flex items-center px-4 py-2 border border-l-0 rounded-r">
+    Copy
+</button>
+<div
+    class="bg-green-500 text-gray-100 hover:bg-green-400 flex items-center px-4 py-2 border border-l-0 rounded-r">
+    Copy
+</div>
+<span
+    class="bg-green-500 text-gray-100 hover:bg-green-400 flex items-center px-4 py-2 border border-l-0 rounded-r">
+    Copy
+</span>
+<p
+    class="bg-green-500 text-gray-100 hover:bg-green-400 flex items-center px-4 py-2 border border-l-0 rounded-r">
+    Copy
+</p>
diff --git a/test/printer/samples/attribute-bracket-same-line.html b/test/printer/samples/attribute-bracket-same-line.html
new file mode 100644
index 00000000..508f13ae
--- /dev/null
+++ b/test/printer/samples/attribute-bracket-same-line.html
@@ -0,0 +1 @@
+<div class="foo" />
diff --git a/test/printer/samples/attribute-bracket-same-line.options.json b/test/printer/samples/attribute-bracket-same-line.options.json
new file mode 100644
index 00000000..5d236171
--- /dev/null
+++ b/test/printer/samples/attribute-bracket-same-line.options.json
@@ -0,0 +1,3 @@
+{
+    "bracketSameLine": true
+}