Skip to content
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

[JEWEL-748] Define delimited inlines extension API, implement strikethrough #2915

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

rock3r
Copy link
Collaborator

@rock3r rock3r commented Jan 17, 2025

This includes a bunch of changes to the Markdown inline APIs to better align with CommonMark and our actual needs; a clean-up of the previous half-hearted attempt at supporting custom inline nodes (it did not and could never have worked in the way it was implemented), and some misc tweaks and cleanup.

This PR also includes a fix to the pre-push hook to work in the IJP repo.

Superseeds JetBrains/jewel#748

Caution

Requires #2913 to be merged first

@jakub-senohrabek
Copy link
Collaborator

This cannot be cherry-picked as there is following error:
error: sha1 information is lacking or useless (community/.idea/modules.xml).
error: could not build fake ancestor
Patch failed at 0001 Define delimited inlines extension API, implement strikethrough

Maybe rebase on latest community master will help?

@hamen
Copy link
Collaborator

hamen commented Feb 6, 2025

On it ⌛

UPDATE:
Rebased and stitched some config file 🤞

@hamen hamen force-pushed the sebp/delimited-api branch from 43ec38e to 2243ea2 Compare February 6, 2025 16:19
@rock3r
Copy link
Collaborator Author

rock3r commented Feb 10, 2025

I reckon Ivan got tangled up in the rebase somewhere, let me fix these...

@rock3r
Copy link
Collaborator Author

rock3r commented Feb 10, 2025

@AlexVanGogen should have fixed the bad rebase, and have renamed the module as requested for consistency :)

@rock3r rock3r force-pushed the sebp/delimited-api branch from 9779443 to c38198c Compare February 10, 2025 17:33
@rock3r
Copy link
Collaborator Author

rock3r commented Feb 10, 2025

I ended up doing a clean-slate squash/rebase because there was too much random crap in the history, plus the fun conflicts that just showed up...

@rock3r rock3r force-pushed the sebp/delimited-api branch 3 times, most recently from f01874b to 30e9002 Compare February 11, 2025 10:21
…hrough

This includes a bunch of changes to the Markdown inline APIs to better align with CommonMark and our actual needs; a clean-up of the previous half-hearted attempt at supporting custom inline nodes (it did not and could never have worked in the way it was implemented), and some misc tweaks and cleanup.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants