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.

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

Jump to bottom

Fix editor markdown not incrementing in a numbered list #33187

Merged
merged 7 commits into from
Jan 10, 2025
Merged

Fix editor markdown not incrementing in a numbered list #33187

merged 7 commits into from
Jan 10, 2025
+273 −33

Conversation

harryvince
Copy link
Contributor

Amended the logic for newPrefix in the MarkdownEditor to resolve incorrect number ordering.

Fixes #33184

Attached screenshot of fixed input similar to issue
Screenshot 2025-01-09 at 23 59 24

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 10, 2025
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 10, 2025
@harryvince harryvince force-pushed the main branch 6 times, most recently from cd32276 to fd815c8 Compare January 10, 2025 00:31
@harryvince harryvince changed the title fix: editor markdown not incrementing in a numbered list Fix editor markdown not incrementing in a numbered list Jan 10, 2025
@wxiaoguang
Copy link
Contributor

I will try to make a full fix here, to handle all edge cases including:

1. a
2. b <- enter here, then last line should be "4. c"
3. c

@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 10, 2025
@pull-request-size pull-request-size bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 10, 2025
@wxiaoguang
Copy link
Contributor

Now most edge cases should have been fixed, and added more tests

@wxiaoguang wxiaoguang mentioned this pull request Jan 10, 2025
Merged
@wxiaoguang wxiaoguang added the backport/v1.23 This PR should be backported to Gitea 1.23 label Jan 10, 2025
@wxiaoguang wxiaoguang added this to the 1.24.0 milestone Jan 10, 2025
@wxiaoguang wxiaoguang mentioned this pull request Jan 10, 2025
Closed
wxiaoguang
wxiaoguang approved these changes Jan 10, 2025
View reviewed changes
Copy link
Contributor

@wxiaoguang wxiaoguang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So many edge cases .... I have done my best 🤣

@GiteaBot GiteaBot removed the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 10, 2025
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jan 10, 2025
@wxiaoguang wxiaoguang mentioned this pull request Jan 10, 2025
Merged
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 10, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 10, 2025
@lunny lunny enabled auto-merge (squash) January 10, 2025 07:28
@lunny lunny merged commit d7ec23f into go-gitea:main Jan 10, 2025
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 10, 2025
wxiaoguang added a commit to wxiaoguang/gitea that referenced this pull request Jan 10, 2025
@harryvince @wxiaoguang
Fix editor markdown not incrementing in a numbered list (go-gitea#33187)
e6d2d85 
Amended the logic for newPrefix in the MarkdownEditor to resolve
incorrect number ordering.

Fixes go-gitea#33184

Attached screenshot of fixed input similar to issue 
<img width="175" alt="Screenshot 2025-01-09 at 23 59 24"
src="https://github.com/user-attachments/assets/dfa23cf1-f3db-4b5e-99d2-a71bbcb289a8"
/>

---------

Co-authored-by: wxiaoguang <[email protected]>
@wxiaoguang wxiaoguang mentioned this pull request Jan 10, 2025
Merged
lunny pushed a commit that referenced this pull request Jan 10, 2025
@wxiaoguang @harryvince
Fix editor markdown not incrementing in a numbered list (#33187) (#33193
1454e1b 
)

Backport #33187 (no conflict)

Co-authored-by: Harry Vince <[email protected]>
@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Jan 10, 2025
@lunny lunny added the backport/done All backports for this PR have been created label Jan 10, 2025
@go-gitea go-gitea deleted a comment from GiteaBot Jan 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.23 This PR should be backported to Gitea 1.23 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/frontend size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
1.24.0
Development

Successfully merging this pull request may close these issues.

Markdown editor doesn't increment points in numbered lists on enter
4 participants
@harryvince @wxiaoguang @lunny @GiteaBot