Make prettier handle closing tags better

acteng · Jul 14, 2023 · f44a5bd · f44a5bd
1 parent 15df8d7
commit f44a5bd
Show file tree

Hide file tree

Showing 22 changed files with 215 additions and 102 deletions.
diff --git 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
@@ -10,17 +10,39 @@
   <CollapsibleCard label="Objects" open>
     <ul>
       {#if schema == "planning"}
-        <li><span style:background={colors.preapp} />Preapp</li>
-        <li><span style:background={colors.outline} />Outline</li>
         <li>
-          <span style:background={colors["reserved matters"]} />Reserved matters
+          <span style:background={colors.preapp} />
+          Preapp
+        </li>
+        <li>
+          <span style:background={colors.outline} />
+          Outline
+        </li>
+        <li>
+          <span style:background={colors["reserved matters"]} />
+          Reserved matters
+        </li>
+        <li>
+          <span style:background={colors["local plan"]} />
+          Local plan
         </li>
-        <li><span style:background={colors["local plan"]} />Local plan</li>
       {:else}
-        <li><span style:background={colors.area} />Areas</li>
-        <li><span style:background={colors.route} />Routes</li>
-        <li><span style:background={colors.crossing} />Crossings</li>
-        <li><span style:background={colors.other} />Other</li>
+        <li>
+          <span style:background={colors.area} />
+          Areas
+        </li>
+        <li>
+          <span style:background={colors.route} />
+          Routes
+        </li>
+        <li>
+          <span style:background={colors.crossing} />
+          Crossings
+        </li>
+        <li>
+          <span style:background={colors.other} />
+          Other
+        </li>
       {/if}
     </ul>
   </CollapsibleCard>

diff --git a/src/lib/common/ConfirmationModal.svelte b/src/lib/common/ConfirmationModal.svelte
@@ -32,8 +32,8 @@
   <p>{message}</p>
   <div class="govuk-button-group">
     <WarningButton on:click={onClickConfirm}>{confirmButtonText}</WarningButton>
-    <SecondaryButton on:click={onClickCancel}
-      >{cancelButtonText}</SecondaryButton
-    >
+    <SecondaryButton on:click={onClickCancel}>
+      {cancelButtonText}
+    </SecondaryButton>
   </div>
 </Modal>
diff --git a/src/lib/common/Layout.svelte b/src/lib/common/Layout.svelte
@@ -14,8 +14,10 @@
     <button
       type="button"
       class="sidebar-toggle rounded-rect"
-      on:click={toggleSidebar}>&rarr;</button
+      on:click={toggleSidebar}
     >
+      &rarr;
+    </button>
   </aside>
   <main>
     <slot name="main" />

diff --git 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}
-  ><img src={icon} alt={label} /> {label}</button
 >
+  <img src={icon} alt={label} />
+  {label}
+</button>
 
 <style>
   button {

diff --git a/src/lib/draw/StreetViewMode.svelte b/src/lib/draw/StreetViewMode.svelte
@@ -58,9 +58,13 @@
   <CollapsibleCard label="Help">
     <ul>
       <li>
-        <b>Click</b> on the map to open a new tab with a 3rd-party imagery provider
+        <b>Click</b>
+         on the map to open a new tab with a 3rd-party imagery provider
+      </li>
+      <li>
+        Press <b>Escape</b>
+         to exit this mode
       </li>
-      <li>Press <b>Escape</b> to exit this mode</li>
     </ul>
   </CollapsibleCard>
 {/if}
diff --git a/src/lib/draw/point/PointControls.svelte b/src/lib/draw/point/PointControls.svelte
@@ -14,7 +14,10 @@
     {:else}
       <li>Click to add a new point</li>
     {/if}
-    <li>Press <b>Escape</b> to cancel</li>
+    <li>
+      Press <b>Escape</b>
+       to cancel
+    </li>
   </ul>
 </CollapsibleCard>
 

diff --git a/src/lib/draw/polygon/PolygonControls.svelte b/src/lib/draw/polygon/PolygonControls.svelte
@@ -9,16 +9,34 @@
 
 <CollapsibleCard label="Help">
   <ul>
-    <li><b>Click</b> the map to add a vertex</li>
-    <li><b>Click</b> a vertex to delete it</li>
-    <li><b>Drag</b> a vertex or the polygon to move it</li>
-    <li>Press <b>Enter</b> or <b>double click</b> to finish</li>
-    <li>Press <b>Escape</b> to cancel</li>
+    <li>
+      <b>Click</b>
+       the map to add a vertex
+    </li>
+    <li>
+      <b>Click</b>
+       a vertex to delete it
+    </li>
+    <li>
+      <b>Drag</b>
+       a vertex or the polygon to move it
+    </li>
+    <li>
+      Press <b>Enter</b>
+      or
+      <b>double click</b>
+       to finish
+    </li>
+    <li>
+      Press <b>Escape</b>
+       to cancel
+    </li>
   </ul>
 </CollapsibleCard>
 
 <div style="display: flex; justify-content: space-between">
   <DefaultButton on:click={() => polygonTool.finish()}>Finish</DefaultButton>
-  <SecondaryButton on:click={() => polygonTool.cancel()}>Cancel</SecondaryButton
-  >
+  <SecondaryButton on:click={() => polygonTool.cancel()}>
+    Cancel
+  </SecondaryButton>
 </div>
diff --git a/src/lib/draw/route/RouteControls.svelte b/src/lib/draw/route/RouteControls.svelte
@@ -25,13 +25,31 @@
 <CollapsibleCard label="Help">
   <ul>
     <li>
-      <b>Click</b> green points on the transport network to create snapped routes
+      <b>Click</b>
+       green points on the transport network to create snapped routes
+    </li>
+    <li>
+      Hold <b>Shift</b>
+       to draw a point anywhere
+    </li>
+    <li>
+      <b>Click and drag</b>
+       any point to move it
+    </li>
+    <li>
+      <b>Click</b>
+       a red waypoint to delete it
+    </li>
+    <li>
+      Press <b>Enter</b>
+      or
+      <b>double click</b>
+       to finish
+    </li>
+    <li>
+      Press <b>Escape</b>
+       to cancel
     </li>
-    <li>Hold <b>Shift</b> to draw a point anywhere</li>
-    <li><b>Click and drag</b> any point to move it</li>
-    <li><b>Click</b> a red waypoint to delete it</li>
-    <li>Press <b>Enter</b> or <b>double click</b> to finish</li>
-    <li>Press <b>Escape</b> to cancel</li>
   </ul>
 </CollapsibleCard>
 

diff --git a/src/lib/draw/route/SplitRouteMode.svelte b/src/lib/draw/route/SplitRouteMode.svelte
@@ -258,8 +258,16 @@
 {#if $currentMode == thisMode}
   <CollapsibleCard label="Help">
     <ul>
-      <li><b>Click</b> on a route to split it</li>
-      <li><b>Click</b> on the map or press <b>Escape</b> to cancel</li>
+      <li>
+        <b>Click</b>
+         on a route to split it
+      </li>
+      <li>
+        <b>Click</b>
+        on the map or press
+        <b>Escape</b>
+         to cancel
+      </li>
     </ul>
   </CollapsibleCard>
 {/if}
diff --git a/src/lib/draw/snap_polygon/SnapPolygonControls.svelte b/src/lib/draw/snap_polygon/SnapPolygonControls.svelte
@@ -12,12 +12,27 @@
 <CollapsibleCard label="Help">
   <ul>
     <li>
-      <b>Click</b> green points on the transport network to create snapped routes
+      <b>Click</b>
+       green points on the transport network to create snapped routes
+    </li>
+    <li>
+      <b>Click and drag</b>
+       any point to move it
+    </li>
+    <li>
+      <b>Click</b>
+       a red waypoint to delete it
+    </li>
+    <li>
+      Press <b>Enter</b>
+      or
+      <b>double click</b>
+       to finish
+    </li>
+    <li>
+      Press <b>Escape</b>
+       to cancel
     </li>
-    <li><b>Click and drag</b> any point to move it</li>
-    <li><b>Click</b> a red waypoint to delete it</li>
-    <li>Press <b>Enter</b> or <b>double click</b> to finish</li>
-    <li>Press <b>Escape</b> to cancel</li>
   </ul>
 </CollapsibleCard>
 

diff --git a/src/lib/forms/AutogenerateForm.svelte b/src/lib/forms/AutogenerateForm.svelte
@@ -98,7 +98,8 @@
           on:change={otherOneOf}
           value={x.name}
         />
-        {x.name}<br />
+        {x.name}
+        <br />
       </label>
 
       {#if oneOfCase == x.name && typeof value == "object"}

diff --git a/src/lib/forms/FormV1.svelte b/src/lib/forms/FormV1.svelte
@@ -38,9 +38,9 @@
   <input type="text" class="govuk-input" bind:value={name} />
   <!-- Only LineStrings can be auto-named, and length_meters being set is the simplest proxy for that -->
   {#if length_meters}
-    <SecondaryButton on:click={() => autoFillName()} disabled={!$routeInfo}
-      >Auto-fill</SecondaryButton
-    >
+    <SecondaryButton on:click={() => autoFillName()} disabled={!$routeInfo}>
+      Auto-fill
+    </SecondaryButton>
   {/if}
 </FormElement>
 

diff --git a/src/lib/govuk/Checkbox.svelte b/src/lib/govuk/Checkbox.svelte
@@ -13,7 +13,7 @@
 
 <div class="govuk-checkboxes__item">
   <input type="checkbox" class="govuk-checkboxes__input" {id} bind:checked />
-  <label class="govuk-label govuk-checkboxes__label" for={id} title={hint}
-    >{label}</label
-  >
+  <label class="govuk-label govuk-checkboxes__label" for={id} title={hint}>
+    {label}
+  </label>
 </div>
diff --git a/src/lib/sidebar/About.svelte b/src/lib/sidebar/About.svelte
@@ -9,26 +9,27 @@
   <div class="govuk-prose">
     <p>
       ATIP v2 is an
-      <ExternalLink href="https://github.com/acteng/atip"
-        >open source project</ExternalLink
-      > supported by Active Travel England and developed by:
+      <ExternalLink href="https://github.com/acteng/atip">
+        open source project
+      </ExternalLink> supported by Active Travel England and developed by:
     </p>
 
     <ul>
       <li>
         <ExternalLink
           href="https://www.turing.ac.uk/people/researchers/dustin-carlino"
-          >Dustin Carlino</ExternalLink
-        >: lead developer, from The Alan Turing Institute
+        >
+          Dustin Carlino
+        </ExternalLink>: lead developer, from The Alan Turing Institute
       </li>
       <li>
         With UX help from
-        <ExternalLink href="https://www.linkedin.com/in/madison-wang-841977bb/"
-          >Madison Wang</ExternalLink
-        > and CSS help from
-        <ExternalLink href="https://github.com/BudgieInWA"
-          >Ben Ritter</ExternalLink
-        >
+        <ExternalLink href="https://www.linkedin.com/in/madison-wang-841977bb/">
+          Madison Wang
+        </ExternalLink> and CSS help from
+        <ExternalLink href="https://github.com/BudgieInWA">
+          Ben Ritter
+        </ExternalLink>
       </li>
       <li>
         With great thanks to ATIP's various users for feedback, testing, and
@@ -38,39 +39,45 @@
 
     <p>
       ATIP builds on
-      <ExternalLink href="https://www.openstreetmap.org/about"
-        >OpenStreetMap</ExternalLink
-      >
+      <ExternalLink href="https://www.openstreetmap.org/about">
+        OpenStreetMap
+      </ExternalLink>
       contributors,
       <ExternalLink href="https://maplibre.org/">MapLibre</ExternalLink>,
       <ExternalLink href="https://georust.org/">GeoRust</ExternalLink>,
-      <ExternalLink href="https://github.com/a-b-street/osm2streets"
-        >osm2streets</ExternalLink
-      >,
-      <ExternalLink href="https://material.io/resources/icons/"
-        >Material icons</ExternalLink
-      >, and other open source projects.
+      <ExternalLink href="https://github.com/a-b-street/osm2streets">
+        osm2streets
+      </ExternalLink>,
+      <ExternalLink href="https://material.io/resources/icons/">
+        Material icons
+      </ExternalLink>, and other open source projects.
     </p>
 
     <p>
       We want your feedback about ATIP! Please <ExternalLink
         href="https://github.com/acteng/atip/issues/new"
-        >start an issue on Github</ExternalLink
       >
+        start an issue on Github
+      </ExternalLink>
       or email
-      <a href="mailto: dcarlino@turing.ac.uk">dcarlino@turing.ac.uk</a>.
+      <a href="mailto: dcarlino@turing.ac.uk">dcarlino@turing.ac.uk</a>
+      .
     </p>
 
     <hr />
 
     <h2>Recent changes</h2>
     <ul>
       <li>
-        <b>v2</b> launched on 2 June 2023. Changes: a complete UI rewrite, new draw
-        tools, drawing areas snapped to roads, splitting routes, multiple data schemas,
+        <b>v2</b>
+         launched on 2 June 2023. Changes: a complete UI rewrite, new draw tools,
+        drawing areas snapped to roads, splitting routes, multiple data schemas,
         speed limit layer, lane visualization layer
       </li>
-      <li><b>v1</b> launched in March 2023</li>
+      <li>
+        <b>v1</b>
+         launched in March 2023
+      </li>
     </ul>
   </div>
 </Modal>