From c6f9b6f6267ddb3aa598620e8cae860860bb9789 Mon Sep 17 00:00:00 2001 From: A Samuel Pottinger Date: Sun, 27 Nov 2022 19:56:35 +0000 Subject: [PATCH] Fix leading space. --- .../java/preproc/PdeParseTreeListener.java | 4 +- java/test/resources/whitespace.expected | 49 +++++++++---------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/java/src/processing/mode/java/preproc/PdeParseTreeListener.java b/java/src/processing/mode/java/preproc/PdeParseTreeListener.java index 10fdc523d..d774b6e92 100644 --- a/java/src/processing/mode/java/preproc/PdeParseTreeListener.java +++ b/java/src/processing/mode/java/preproc/PdeParseTreeListener.java @@ -589,9 +589,9 @@ public class PdeParseTreeListener extends ProcessingBaseListener { // Insert at start of method or after annoation if (!hasVisibilityModifier) { if (annoationPoint == null) { - insertBefore(possibleModifiers.getStart(), " public "); + insertBefore(possibleModifiers.getStart(), "public "); } else { - insertAfter(annoationPoint.getStop(), " public "); + insertAfter(annoationPoint.getStop(), "public "); } } diff --git a/java/test/resources/whitespace.expected b/java/test/resources/whitespace.expected index bdd1b3e94..479a68e3e 100644 --- a/java/test/resources/whitespace.expected +++ b/java/test/resources/whitespace.expected @@ -3,8 +3,6 @@ import processing.data.*; import processing.event.*; import processing.opengl.*; -import processing.pdf.*; - import java.util.HashMap; import java.util.ArrayList; import java.io.File; @@ -16,33 +14,34 @@ import java.io.IOException; public class whitespace extends PApplet { - void setup() { - size(640, 360); - stroke(255); - noFill(); - } +public void setup() { + /* size commented out by preprocessor */; + stroke(255); + noFill(); +} - void drawBezier(int i) { - bezier( - mouseX - (i/2.0), - 40+i, - 410, - 20, - 440, - 300, - 240 - (i/16.0), - 300 + (i/8.0) - ); - } +public void drawBezier(int i) { + bezier( + mouseX - (i/2.0f), + 40+i, + 410, + 20, + 440, + 300, + 240 - (i/16.0f), + 300 + (i/8.0f) + ); +} - void draw() { - background(0); - for (int i = 0; i < 200; i += 20) { - drawBezier(i); - } +public void draw() { + background(0); + for (int i = 0; i < 200; i += 20) { + drawBezier(i); } +} - public void settings() { size(640,360); } + + public void settings() { size(640, 360); } static public void main(String[] passedArgs) { String[] appletArgs = new String[] { "whitespace" };