Merge pull request #72 from scijava/fix-pom-scijava#148

ctrueden · web-flow · commit d5a80a7b297c · 2025-04-24T12:23:30.000-05:00
Patch ImageJMacroTokenMaker to accommodate RSyntaxtTextArea v3.6.0
diff --git 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
@@ -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.
