Skip to content

Update FlatLaf, RSyntaxTextArea, AutoComplete #288

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.

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
Mar 25, 2025

Conversation

tferr
Copy link
Contributor

@tferr tferr commented Mar 25, 2025

No description provided.

@ctrueden
Copy link
Member

Thanks @tferr. The CI failure is due to an ongoing incompatibility between ImageJ and ImageJ2's legacy layer. It doesn't look like this update broke anything new AFAICT though, so I'm merging it now.

@ctrueden ctrueden merged commit ab6a4da into scijava:master Mar 25, 2025
1 check failed
@tferr tferr deleted the patch-10 branch March 25, 2025 18:47
@ctrueden
Copy link
Member

There is actually a failure now with script-editor:

script-editor/src/main/java/org/scijava/ui/swing/script/highliters/ImageJMacroTokenMaker.java:[46,8] org.scijava.ui.swing.script.highliters.ImageJMacroTokenMaker is not abstract and does not override abstract method yystate() in org.fife.ui.rsyntaxtextarea.AbstractJFlexTokenMaker

@tferr If you have time to fix it, great, otherwise I'll take a look as soon as I can, in conjunction with the other needed BOM fixes.

@tferr
Copy link
Contributor Author

tferr commented Mar 28, 2025

@ctrueden, I will look at it. I have been using it on my computer without noticing anything (I always do before submitting a PR here). I guess I don't have the same versions of all dependencies!?. Will ping you if I need guidance.

@imagesc-bot
Copy link

This pull request has been mentioned on Image.sc Forum. There might be relevant details there:

https://forum.image.sc/t/fiji-friends-weekly-dev-update-thread/103718/84

tferr added a commit to scijava/script-editor that referenced this pull request Apr 24, 2025
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`
@tferr
Copy link
Contributor Author

tferr commented Apr 24, 2025

@ctrueden , scijava/script-editor#72 should fix this

ctrueden pushed a commit to scijava/script-editor that referenced this pull request Apr 24, 2025
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`

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
ctrueden added a commit that referenced this pull request Apr 24, 2025
This accommodates RSyntaxTextArea 3.6.0; see #288.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants