CHANGELOG.md

@@ -1,6 +1,11 @@
 # prettier-plugin-svelte changelog
 
-## 2.8.0 (unreleased)
+## 2.8.1 (Unreleased)
+
+* (fix) format `{#await .. catch ..}..{/await}` correctly ([#323](https://github.com/sveltejs/prettier-plugin-svelte/issues/323)) 
+* (fix) respect strict mode and shorthand options when formatting bindings ([#321](https://github.com/sveltejs/prettier-plugin-svelte/issues/321)) 
+
+## 2.8.0
 
 * (feat) support `singleAttributePerLine` Prettier option ([#305](https://github.com/sveltejs/prettier-plugin-svelte/issues/305))
 * (feat) add `svelteSortOrder: none` Prettier option which skips reordering scripts/styles/html ([#305](https://github.com/sveltejs/prettier-plugin-svelte/issues/314))

package.json

@@ -1,6 +1,6 @@
 {
     "name": "prettier-plugin-svelte",
-    "version": "2.7.1",
+    "version": "2.8.0",
     "description": "Svelte plugin for prettier",
     "main": "plugin.js",
     "files": [

src/print/index.ts

@@ -540,6 +540,17 @@ export function print(path: FastPath, options: ParserOptions, print: PrintFn): D
                     ]),
                     path.call(print, 'then'),
                 );
+            } else if (!hasPendingBlock && hasCatchBlock) {
+                block.push(
+                    groupConcat([
+                        '{#await ',
+                        printSvelteBlockJS(path, print, 'expression'),
+                        ' catch',
+                        expandNode(node.error),
+                        '}',
+                    ]),
+                    path.call(print, 'catch'),
+                );
             } else {
                 block.push(
                     groupConcat(['{#await ', printSvelteBlockJS(path, print, 'expression'), '}']),
@@ -557,7 +568,7 @@ export function print(path: FastPath, options: ParserOptions, print: PrintFn): D
                 }
             }
 
-            if (hasCatchBlock) {
+            if ((hasPendingBlock || hasThenBlock) && hasCatchBlock) {
                 block.push(
                     groupConcat(['{:catch', expandNode(node.error), '}']),
                     path.call(print, 'catch'),
@@ -597,7 +608,10 @@ export function print(path: FastPath, options: ParserOptions, print: PrintFn): D
             return concat([
                 'bind:',
                 node.name,
-                node.expression.type === 'Identifier' && node.expression.name === node.name
+                node.expression.type === 'Identifier' &&
+                node.expression.name === node.name &&
+                options.svelteAllowShorthand &&
+                !options.svelteStrictMode
                     ? ''
                     : concat(['=', ...printJsExpression()]),
             ]);

test/formatting/samples/strict-mode-false/input.html

@@ -0,0 +1,8 @@
+<input value />
+<input value="string" />
+<input {value} />
+<input value={value} />
+<input value="{value}" />
+<input bind:value />
+<input bind:value={value} />
+<input bind:value="{value}" />

test/formatting/samples/strict-mode-false/output.html

@@ -0,0 +1,8 @@
+<input value />
+<input value="string" />
+<input {value} />
+<input {value} />
+<input {value} />
+<input bind:value />
+<input bind:value />
+<input bind:value />

test/formatting/samples/strict-mode-true/input.html

@@ -3,3 +3,6 @@
 <input {value} />
 <input value={value} />
 <input value="{value}" />
+<input bind:value />
+<input bind:value={value} />
+<input bind:value="{value}" />

test/formatting/samples/strict-mode-true/output.html

@@ -3,3 +3,6 @@
 <input value="{value}" />
 <input value="{value}" />
 <input value="{value}" />
+<input bind:value="{value}" />
+<input bind:value="{value}" />
+<input bind:value="{value}" />

test/printer/samples/allow-shorthand-false.html

@@ -1,3 +1,5 @@
 <input type="text" value={value} />
 
 <input type="text" data={data} />
+
+<input type="text" bind:value={value} />

test/printer/samples/await-catch-without-pending.html

@@ -0,0 +1 @@
+{#await thePromise catch theCatch}the value is {theCatch}{/await}