From fdc8abddaa49dbad3519d5bedfda90b887875e3d Mon Sep 17 00:00:00 2001
From: Tiago Ferreira <tiago.tferr@gmail.com>
Date: Thu, 24 Apr 2025 11:16:05 -0400
Subject: [PATCH] Update to RSyntaxTextArea v3.6.0

This fixes the issue detailed in
https://github.com/scijava/pom-scijava/pull/288.

Context:
In newer versions of RSyntaxtTextArea, AbstractJFlexCTokenMaker adds an
abstract yystate() method intended to return the current state of a
JFlex lexer. Since it is abstract, it must be implemented by any
concrete subclass, so we patch ImageJMacroTokenMaker so that the current
zzLexicalState is returned.

Tested with: `mvn clean package -Denforcer.skip`

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml                                                      | 4 +++-
 .../ui/swing/script/highliters/ImageJMacroTokenMaker.java    | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6b786e3f..26d78d63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>37.0.0</version>
+		<version>40.0.0</version>
 		<relativePath />
 	</parent>
 
@@ -147,6 +147,8 @@
 
 		<!-- NB: Deploy releases to the SciJava Maven repository. -->
 		<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
+
+		<rsyntaxtextarea.version>3.6.0</rsyntaxtextarea.version>
 	</properties>
 
 	<dependencies>
diff --git a/src/main/java/org/scijava/ui/swing/script/highliters/ImageJMacroTokenMaker.java b/src/main/java/org/scijava/ui/swing/script/highliters/ImageJMacroTokenMaker.java
index 74f28d56..13b1f939 100644
--- a/src/main/java/org/scijava/ui/swing/script/highliters/ImageJMacroTokenMaker.java
+++ b/src/main/java/org/scijava/ui/swing/script/highliters/ImageJMacroTokenMaker.java
@@ -2635,6 +2635,11 @@ public void yypushback(final int number) {
 		zzMarkedPos -= number;
 	}
 
+	@Override
+	public int yystate() {
+		return zzLexicalState; // the current lexical state
+	}
+
 	/**
 	 * Resumes scanning until the next regular expression is matched, the end of
 	 * input is encountered or an I/O-Error occurs.