Skip to content

Patch ImageJMacroTokenMaker to accommodate RSyntaxtTextArea v3.6.0 #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2025
Merged

Patch ImageJMacroTokenMaker to accommodate RSyntaxtTextArea v3.6.0 #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/org/scijava/ui/swing/script/highliters/ImageJMacroTokenMaker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down