Skip to content

Commit ca392a2

Browse files
committed
Patch ImageJMacroTokenMaker to accommodate RSyntaxtTextArea v3.6.0
This fixes the issue detailed in scijava/pom-scijava#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`
1 parent b682698 commit ca392a2

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>37.0.0</version>
8+
<version>40.1.0-SNAPSHOT</version>
99
<relativePath />
1010
</parent>
1111

src/main/java/org/scijava/ui/swing/script/highliters/ImageJMacroTokenMaker.java

+5
Original file line numberDiff line numberDiff line change
@@ -2635,6 +2635,11 @@ public void yypushback(final int number) {
26352635
zzMarkedPos -= number;
26362636
}
26372637

2638+
@Override
2639+
public int yystate() {
2640+
return zzLexicalState; // the current lexical state
2641+
}
2642+
26382643
/**
26392644
* Resumes scanning until the next regular expression is matched, the end of
26402645
* input is encountered or an I/O-Error occurs.

0 commit comments

Comments
 (0)