From f31cc2d4a2d63a8013db9516c963ff012747ab9a Mon Sep 17 00:00:00 2001
From: Michael Wolf <maw@pobox.com>
Date: Sat, 30 Sep 2023 18:05:36 -0600
Subject: [PATCH] Create and use dart_format.sh wrapper script

---
 dart_format.sh    | 40 ++++++++++++++++++++++++++++++++++++++++
 would-reformat.sh | 11 ++---------
 2 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100755 dart_format.sh

diff --git a/dart_format.sh b/dart_format.sh
new file mode 100755
index 0000000..d5c929a
--- /dev/null
+++ b/dart_format.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -uo pipefail
+IFS=$'\n\t'
+
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+source "$DIR/_reformat-common.bash"
+
+set -e
+
+file="$1"
+
+pushd "$(dirname "$file")" 2>&1
+
+if [[ "$WOULD_REFORMAT" = "would_reformat" ]]; then
+    # probably others too :(
+    syntax_error_retval=65
+
+    set +e
+    out=$(dart format -o none --set-exit-if-changed "$file")
+    retval="$?"
+    set -e
+
+    if [[ "$retval" = "$syntax_error_retval" ]]; then
+        retval=2
+    fi
+
+    exit "$retval"
+fi
+
+if [[ "$WOULD_REFORMAT" = "do_reformat" ]]; then
+    out=$(npx prettier --write "$file" 2>&1 >/dev/null)
+    retval="$?"
+
+    echo "$out"
+    exit "$retval"
+fi
+
+exit 255
diff --git a/would-reformat.sh b/would-reformat.sh
index f3563dd..457729f 100755
--- a/would-reformat.sh
+++ b/would-reformat.sh
@@ -46,17 +46,10 @@ elif [[ $file_type == "golang" ]]; then
     retval="$?"
     set -e
 elif [[ $file_type == "dart" ]]; then
-    success_retval=0
-    would_reformat_retval=1
-    # probably others too :(
-    syntax_error_retval=65
-
     set +e
-    out=$(dart format -o none --set-exit-if-changed "$file")
-    exitval="$?"
+    out=$("$WF_ROOT"/./dart_format.sh "$file")
+    retval="$?"
     set -e
-
-    retval="$exitval"
 else
     echo -n "ignoring"
     exit 0