From 0331cbeda3b0093b1554e31eb7e66dbaf7ac0b8f Mon Sep 17 00:00:00 2001
From: XuehaiPan <XuehaiPan@pku.edu.cn>
Date: Tue, 12 Oct 2021 02:12:48 +0800
Subject: [PATCH] utils/shfmt.sh: use utils/shfmt.sh as shell script formmatter

---
 .vscode/settings.json           |  6 +++-
 Library/Homebrew/utils/shfmt.sh | 60 +++++++++++++++++++++++----------
 2 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 3e339e48d8..0fdf786471 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -13,5 +13,9 @@
     "--external-sources",
     "--source-path=${workspaceFolder}/Library"
   ],
-  "shellformat.flag": "-i 2 -ci"
+  "shellformat.effectLanguages": [
+    "shellscript"
+  ],
+  "shellformat.path": "${workspaceFolder}/Library/Homebrew/utils/shfmt.sh",
+  "shellformat.flag": "-i 2 -ci -ln bash"
 }
diff --git a/Library/Homebrew/utils/shfmt.sh b/Library/Homebrew/utils/shfmt.sh
index 814625d5ae..a0f66a2f47 100755
--- a/Library/Homebrew/utils/shfmt.sh
+++ b/Library/Homebrew/utils/shfmt.sh
@@ -35,6 +35,10 @@ then
   if [[ -x "$(PATH="${HOMEBREW_PATH}" command -v diff)" ]]
   then
     DIFF="$(PATH="${HOMEBREW_PATH}" command -v diff)" # fall back to `diff` in PATH without coloring
+  elif [[ -z "${HOMEBREW_PATH}" && -x "$(command -v diff)" ]]
+  then
+    # HOMEBREW_PATH may unset if shfmt.sh is called by vscode
+    DIFF="$(command -v diff)" # fall back to `diff` in PATH without coloring
   else
     odie "${0##*/}: Please install diff by running \`brew install diffutils\`."
   fi
@@ -81,9 +85,11 @@ do
 done
 unset file
 
+STDIN=''
 if [[ "${#FILES[@]}" == 0 ]]
 then
-  exit
+  FILES=(/dev/stdin)
+  STDIN=1
 fi
 
 ###
@@ -334,27 +340,41 @@ align_multiline_switch_cases() {
 format() {
   local file="$1"
   local tempfile
-  if [[ ! -f "${file}" || ! -r "${file}" ]]
-  then
-    onoe "File \"${file}\" is not readable."
-    return 1
-  fi
 
-  tempfile="$(dirname "${file}")/.${file##*/}.temp"
+  if [[ -n "${STDIN}" ]]
+  then
+    tempfile="$(mktemp)"
+  else
+    if [[ ! -f "${file}" || ! -r "${file}" ]]
+    then
+      onoe "File \"${file}\" is not readable."
+      return 1
+    fi
+
+    tempfile="$(dirname "${file}")/.${file##*/}.temp"
+    cp -af "${file}" "${tempfile}"
+  fi
   trap 'rm -f "${tempfile}" 2>/dev/null' RETURN
-  cp -af "${file}" "${tempfile}"
-
-  if [[ ! -f "${tempfile}" || ! -w "${tempfile}" ]]
-  then
-    onoe "File \"${tempfile}\" is not writable."
-    return 1
-  fi
 
   # Format with `shfmt` first
-  if ! "${SHFMT}" -w "${SHFMT_ARGS[@]}" "${tempfile}"
+  if [[ -z "${STDIN}" ]]
   then
-    onoe "Failed to run \`shfmt\` for file \"${file}\"."
-    return 2
+    if [[ ! -f "${tempfile}" || ! -w "${tempfile}" ]]
+    then
+      onoe "File \"${tempfile}\" is not writable."
+      return 1
+    fi
+    if ! "${SHFMT}" -w "${SHFMT_ARGS[@]}" "${tempfile}"
+    then
+      onoe "Failed to run \`shfmt\` for file \"${file}\"."
+      return 2
+    fi
+  else
+    if ! "${SHFMT}" "${SHFMT_ARGS[@]}" >"${tempfile}"
+    then
+      onoe "Failed to run \`shfmt\` for file \"${file}\"."
+      return 2
+    fi
   fi
 
   # Fail fast when forbidden styles detected
@@ -364,6 +384,12 @@ format() {
   wrap_then_do "${file}" "${tempfile}"
   align_multiline_switch_cases "${file}" "${tempfile}"
 
+  if [[ -n "${STDIN}" ]]
+  then
+    cat "${tempfile}"
+    return 0
+  fi
+
   if ! "${DIFF}" -q "${file}" "${tempfile}" &>/dev/null
   then
     if [[ -n "${INPLACE}" ]]