From 477508a971be122cb2374b1cb35ec0e67bae120d Mon Sep 17 00:00:00 2001
From: A Pottinger <samp@gleap.org>
Date: Thu, 3 Feb 2022 08:57:37 -0800
Subject: [PATCH] Resolves preproc issue related to #352.

---
 .../mode/java/preproc/PdeParseTreeListener.java    | 14 +++++++++++---
 java/test/resources/fullscreen_arg.expected        |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/java/src/processing/mode/java/preproc/PdeParseTreeListener.java b/java/src/processing/mode/java/preproc/PdeParseTreeListener.java
index 8412eb693..93fd7bc6d 100644
--- a/java/src/processing/mode/java/preproc/PdeParseTreeListener.java
+++ b/java/src/processing/mode/java/preproc/PdeParseTreeListener.java
@@ -78,6 +78,7 @@ public class PdeParseTreeListener extends ProcessingBaseListener {
   private String pixelDensity;
   private String smoothParam;
   private String sketchRenderer = null;
+  private String fullscreenArgs = "";
   private String sketchOutputFilename = null;
 
   private boolean sizeRequiresRewrite = false;
@@ -720,9 +721,17 @@ public class PdeParseTreeListener extends ProcessingBaseListener {
       thisRequiresRewrite = true;
       sizeIsFullscreen = true;
 
+      StringJoiner fullscreenArgsBuilder = new StringJoiner(", ");
+
       if (argsContext.getChildCount() > 0) {
-        sketchRenderer = argsContext.getChild(0).getText();
+        fullscreenArgsBuilder.add(argsContext.getChild(0).getText());
       }
+
+      if (argsContext.getChildCount() > 2) {
+        fullscreenArgsBuilder.add(argsContext.getChild(2).getText());
+      }
+
+      fullscreenArgs = fullscreenArgsBuilder.toString();
     }
 
     if (thisRequiresRewrite) {
@@ -1153,8 +1162,7 @@ public class PdeParseTreeListener extends ProcessingBaseListener {
 
     if (sizeRequiresRewrite) {
       if (sizeIsFullscreen) {
-        String fullscreenInner = sketchRenderer == null ? "" : sketchRenderer;
-        settingsInner.add(String.format("fullScreen(%s);", fullscreenInner));
+        settingsInner.add(String.format("fullScreen(%s);", fullscreenArgs));
       } else {
 
         if (sketchWidth.isEmpty() || sketchHeight.isEmpty()) {
diff --git a/java/test/resources/fullscreen_arg.expected b/java/test/resources/fullscreen_arg.expected
index 0c561db37..d8aba4453 100644
--- a/java/test/resources/fullscreen_arg.expected
+++ b/java/test/resources/fullscreen_arg.expected
@@ -12,7 +12,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.IOException;
 
-public class fullscreen extends PApplet {
+public class fullscreen_arg extends PApplet {
 
     public void setup() {
 /* size commented out by preprocessor */;