From f44a5bdcf051e8708c61e9afd4fdbf48e9dd55b4 Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Fri, 14 Jul 2023 15:09:57 +0100 Subject: [PATCH] Make prettier handle closing tags better --- .prettierrc | 3 +- src/lib/Legend.svelte | 38 ++++++++++--- src/lib/common/ConfirmationModal.svelte | 6 +- src/lib/common/Layout.svelte | 4 +- src/lib/draw/SelectToolButton.svelte | 4 +- src/lib/draw/StreetViewMode.svelte | 8 ++- src/lib/draw/point/PointControls.svelte | 5 +- src/lib/draw/polygon/PolygonControls.svelte | 32 ++++++++--- src/lib/draw/route/RouteControls.svelte | 30 ++++++++-- src/lib/draw/route/SplitRouteMode.svelte | 12 +++- .../snap_polygon/SnapPolygonControls.svelte | 25 ++++++-- src/lib/forms/AutogenerateForm.svelte | 3 +- src/lib/forms/FormV1.svelte | 6 +- src/lib/govuk/Checkbox.svelte | 6 +- src/lib/sidebar/About.svelte | 57 +++++++++++-------- src/lib/sidebar/AccordionItem.svelte | 7 ++- src/lib/sidebar/EntireScheme.svelte | 3 +- src/lib/sidebar/Instructions.svelte | 19 +++++-- src/lib/sidebar/InterventionList.svelte | 11 ++-- src/pages/App.svelte | 10 ++-- src/pages/BrowseSchemes.svelte | 22 +++---- src/pages/ChooseArea.svelte | 6 +- 22 files changed, 215 insertions(+), 102 deletions(-) diff --git a/.prettierrc b/.prettierrc index 90bc22e27..18a0ba19f 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,3 +1,4 @@ { - "importOrderTypeScriptVersion": "5.0.0" + "importOrderTypeScriptVersion": "5.0.0", + "htmlWhitespaceSensitivity": "ignore" } diff --git a/src/lib/Legend.svelte b/src/lib/Legend.svelte index 8f79a4fa0..6222f08ef 100644 --- a/src/lib/Legend.svelte +++ b/src/lib/Legend.svelte @@ -10,17 +10,39 @@ diff --git a/src/lib/common/ConfirmationModal.svelte b/src/lib/common/ConfirmationModal.svelte index 044f6999d..e28d0c85b 100644 --- a/src/lib/common/ConfirmationModal.svelte +++ b/src/lib/common/ConfirmationModal.svelte @@ -32,8 +32,8 @@

{message}

{confirmButtonText} - {cancelButtonText} + + {cancelButtonText} +
diff --git a/src/lib/common/Layout.svelte b/src/lib/common/Layout.svelte index b79b02427..9cef7ab13 100644 --- a/src/lib/common/Layout.svelte +++ b/src/lib/common/Layout.svelte @@ -14,8 +14,10 @@ + → +
diff --git a/src/lib/draw/SelectToolButton.svelte b/src/lib/draw/SelectToolButton.svelte index 7f38328f5..175097d80 100644 --- a/src/lib/draw/SelectToolButton.svelte +++ b/src/lib/draw/SelectToolButton.svelte @@ -12,8 +12,10 @@ type="button" on:click={() => changeMode(thisMode)} disabled={$currentMode == thisMode} - >{label} {label} + {label} + {label} +