From b1f87428f56d05872f451e6af8d70e5c469883c1 Mon Sep 17 00:00:00 2001
From: Glen Whitney <glen@studioinfinity.org>
Date: Mon, 1 Mar 2021 10:06:44 -0800
Subject: [PATCH] feat: -d option to fosgen now enables nailgun diagnostics

---
 .drone.yml        |  2 +-
 bin/fosgen        |  7 ++++++-
 bin/let_sun_shine | 21 +++++++++++++++++----
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index eea527f..813be68 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -41,7 +41,7 @@ steps:
       - cd ../bin
       - ln -s ../nailgun/nailgun-client/target/ng .
       - cd ..
-      - bin/fosgen tests/emit_sum.fos
+      - bin/fosgen -d tests/emit_sum.fos
   - name: extract_tests
     image: xonsh/xonsh
     commands:
diff --git a/bin/fosgen b/bin/fosgen
index 910c7d9..b03656b 100755
--- a/bin/fosgen
+++ b/bin/fosgen
@@ -75,7 +75,12 @@ fi
 
 if [[ $USE_NAILGUN ]]
 then
-  $BINDIR/let_sun_shine
+  if [[ $SUPPRESS_ERR ]]
+  then
+    $BINDIR/let_sun_shine
+  else
+    $BINDIR/let_sun_shine noisy
+  fi
   $BINDIR/ng sunshine transform -p $PROJDIR -n $LANGUAGE -i $PROGRAM
   exit $?
 fi
diff --git a/bin/let_sun_shine b/bin/let_sun_shine
index 84dfffe..cb3c67a 100755
--- a/bin/let_sun_shine
+++ b/bin/let_sun_shine
@@ -1,13 +1,21 @@
 #!/bin/bash
 
+# Helper for fosgen, not intended to be used directly
+# With an argument, print diagnostic output
+
 BINDIR=$(dirname $BASH_SOURCE)
 
 if $BINDIR/ng sunshine --help
 then
-  # echo "sun already shining."
-  :
+  if [[ $1 ]]
+  then
+    echo "sun already shining."
+  fi
 else
-  # echo "disperse the clouds."
+  if [[ $1 ]]
+  then
+    echo "disperse the clouds."
+  fi
   SUNJAR="$BINDIR/../lib/sunshine.jar"
   PROJDIR="$BINDIR/.."
   if [[ ! $MVN_REPO ]]; then
@@ -21,7 +29,12 @@ else
     echo "MVN_REPO to its full path and re-run."
     exit 1
   fi
-  java -jar $SUNJAR server >/dev/null 2>&1 &
+  if [[ $1 ]]
+  then 
+    java -jar $SUNJAR server & 
+  else
+    java -jar $SUNJAR server >/dev/null 2>&1 &
+  fi
   sleep 5
   $BINDIR/ng sunshine load -l $PROJDIR -l $MVN_REPO
 fi