Skip to content

Removing/outdent a line from ordered list causes the following list to start with an incorrect number#62938

Merged
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
jesxilin:eng/312522
Apr 21, 2026
Merged

Removing/outdent a line from ordered list causes the following list to start with an incorrect number#62938
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
jesxilin:eng/312522

Conversation

@jesxilin
Copy link
Copy Markdown
Contributor

@jesxilin jesxilin commented Apr 16, 2026 •
edited by webkit-early-warning-system
Loading

4216f6e

Removing/outdent a line from ordered list causes the following list to start with an incorrect number
https://bugs.webkit.org/show_bug.cgi?id=312522
rdar://173537449

Reviewed by Aditya Keerthi.

In unlistifyParagraph, there isn't a procedure to set the
starting list number after splitting. So, when it calls
splitElement() to split the list, this calls
Element::cloneElementWithoutChildren which clones all attributes,
including the start attribute.

For example, if the original list started with 11 and the list
is split in the middle, both lists now start with 11. The
expectation is when splitting the list, the second list starts
from 1.

Thus, make a function that splits the list and sets the second starting
list number to be 1 if a start attribute was originally provided. Otherwise,
don't do anything. Now, outdenting, removing list formatting, and entering to
create new lines should all have the following list start with 1.

Additionally, add layout tests for the cases to confirm the correct
starting list numbers. For outdenting and remove list formatting, both
go down the same code path so there is only one test.

* LayoutTests/editing/execCommand/break-out-of-list-resets-start-number-expected.txt: Added.
* LayoutTests/editing/execCommand/break-out-of-list-resets-start-number.html: Added.
* LayoutTests/editing/execCommand/outdent-list-resets-start-number-expected.txt: Added.
* LayoutTests/editing/execCommand/outdent-list-resets-start-number.html: Added.
* Source/WebCore/editing/CompositeEditCommand.cpp:
(WebCore::CompositeEditCommand::splitListElement):
(WebCore::CompositeEditCommand::moveParagraphs):
* Source/WebCore/editing/CompositeEditCommand.h:
* Source/WebCore/editing/InsertListCommand.cpp:
(WebCore::InsertListCommand::unlistifyParagraph):

Canonical link: https://commits.webkit.org/311696@main

a385044

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows Apple Internal
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win ❌ 🛠 ios-apple
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 win-tests ❌ 🛠 mac-apple
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe ✅ 🛠 vision-apple
✅ 🧪 ios-wk2-wpt ✅ 🧪 api-mac-debug ✅ 🛠 gtk3-libwebrtc
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🛠 gtk
✅ 🛠 ios-safer-cpp ✅ 🧪 mac-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 api-gtk
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ❌ 🛠 playstation
✅ 🛠 🧪 unsafe-merge ✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2
✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@jesxilin jesxilin self-assigned this Apr 16, 2026
@jesxilin jesxilin requested a review from rniwa as a code owner April 16, 2026 23:52
@jesxilin jesxilin added the WebKit Misc. For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore). label Apr 16, 2026
@webkit-early-warning-system
Copy link
Copy Markdown
Collaborator

webkit-early-warning-system commented Apr 16, 2026 •
edited
Loading

EWS run on previous version of this PR (hash 8916351)

Details

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows Apple Internal
✅ 🧪 style ✅ 🛠 ios   🛠 mac   🛠 wpe   🛠 win ⏳ 🛠 ios-apple
✅ 🧪 bindings   🛠 ios-sim ✅ 🛠 mac-AS-debug   🧪 wpe-wk2   🧪 win-tests ⏳ 🛠 mac-apple
✅ 🧪 webkitperl   🧪 ios-wk2   🧪 api-mac   🧪 api-wpe ⏳ 🛠 vision-apple
  🧪 ios-wk2-wpt   🧪 api-mac-debug   🛠 gtk3-libwebrtc
  🧪 api-ios   🧪 mac-wk1   🛠 gtk
  🛠 ios-safer-cpp   🧪 mac-wk2   🧪 gtk-wk2
  🛠 vision   🧪 mac-AS-debug-wk2   🧪 api-gtk
  🛠 vision-sim   🧪 mac-wk2-stress   🛠 playstation
  🧪 vision-wk2   🧪 mac-intel-wk2
  🛠 tv   🛠 mac-safer-cpp
  🛠 tv-sim
  🛠 watch
  🛠 watch-sim

@webkit-early-warning-system
Copy link
Copy Markdown
Collaborator

webkit-early-warning-system commented Apr 17, 2026 •
edited
Loading

EWS run on previous version of this PR (hash 91e0c11)

Details

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows Apple Internal
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac   🛠 wpe   🛠 win ⏳ 🛠 ios-apple
✅ 🧪 bindings   🛠 ios-sim ✅ 🛠 mac-AS-debug   🧪 wpe-wk2   🧪 win-tests ⏳ 🛠 mac-apple
✅ 🧪 webkitperl   🧪 ios-wk2   🧪 api-mac   🧪 api-wpe ⏳ 🛠 vision-apple
  🧪 ios-wk2-wpt   🧪 api-mac-debug   🛠 gtk3-libwebrtc
  🧪 api-ios   🧪 mac-wk1   🛠 gtk
  🛠 ios-safer-cpp   🧪 mac-wk2   🧪 gtk-wk2
  🛠 vision   🧪 mac-AS-debug-wk2   🧪 api-gtk
  🛠 vision-sim ✅ 🧪 mac-wk2-stress   🛠 playstation
  🧪 vision-wk2   🧪 mac-intel-wk2
✅ 🛠 tv ✅ 🛠 mac-safer-cpp
  🛠 tv-sim
  🛠 watch
  🛠 watch-sim

pxlcoder
pxlcoder reviewed Apr 17, 2026
View reviewed changes
Comment thread Source/WebCore/editing/InsertListCommand.cpp Outdated
pxlcoder
pxlcoder reviewed Apr 17, 2026
View reviewed changes
Comment thread Source/WebCore/editing/InsertListCommand.cpp Outdated
pxlcoder
pxlcoder previously approved these changes Apr 17, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@pxlcoder pxlcoder left a comment

Choose a reason for hiding this comment

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

r+ with the one comment addressed.

@webkit-early-warning-system
Copy link
Copy Markdown
Collaborator

webkit-early-warning-system commented Apr 17, 2026 •
edited
Loading

EWS run on previous version of this PR (hash 7513d20)

Details

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows Apple Internal
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win ⏳ 🛠 ios-apple
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ❌ 🧪 wpe-wk2 ❌ 🧪 win-tests ⏳ 🛠 mac-apple
✅ 🧪 webkitperl ❌ 🧪 ios-wk2 ❌ 🧪 api-mac ✅ 🧪 api-wpe ⏳ 🛠 vision-apple
❌ 🧪 ios-wk2-wpt ✅ 🧪 api-mac-debug ✅ 🛠 gtk3-libwebrtc
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🛠 gtk
✅ 🛠 ios-safer-cpp ❌ 🧪 mac-wk2 ❌ 🧪 gtk-wk2
✅ 🛠 vision ❌ 🧪 mac-AS-debug-wk2 ✅ 🧪 api-gtk
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🛠 playstation
✅ 🧪 vision-wk2 ❌ 🧪 mac-intel-wk2
✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Apr 17, 2026
@pxlcoder pxlcoder dismissed their stale review April 17, 2026 06:40

Looks like there's some more work needed here. We should not be adding the start attribute if the list already starts at 1.

@jesxilin jesxilin removed the merging-blocked Applied to prevent a change from being merged label Apr 17, 2026
@webkit-early-warning-system
Copy link
Copy Markdown
Collaborator

webkit-early-warning-system commented Apr 17, 2026 •
edited
Loading

EWS run on previous version of this PR (hash 0c5aafd)

Details

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows Apple Internal
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win ⏳ 🛠 ios-apple
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2   🧪 win-tests ✅ 🛠 mac-apple
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe ⏳ 🛠 vision-apple
✅ 🧪 ios-wk2-wpt ✅ 🧪 api-mac-debug ✅ 🛠 gtk3-libwebrtc
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🛠 gtk
✅ 🛠 ios-safer-cpp ✅ 🧪 mac-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 api-gtk
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🛠 playstation
✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2
✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

pxlcoder
pxlcoder reviewed Apr 17, 2026
View reviewed changes
Comment thread Source/WebCore/editing/InsertListCommand.cpp Outdated
@webkit-early-warning-system
Copy link
Copy Markdown
Collaborator

webkit-early-warning-system commented Apr 17, 2026 •
edited
Loading

EWS run on previous version of this PR (hash a17f816)

Details

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows Apple Internal
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win ❌ 🛠 ios-apple
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ❌ 🧪 win-tests ✅ 🛠 mac-apple
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe ❌ 🛠 vision-apple
✅ 🧪 ios-wk2-wpt ✅ 🧪 api-mac-debug ✅ 🛠 gtk3-libwebrtc
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🛠 gtk
✅ 🛠 ios-safer-cpp ✅ 🧪 mac-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 api-gtk
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🛠 playstation
✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2
✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@webkit-early-warning-system
Copy link
Copy Markdown
Collaborator

webkit-early-warning-system commented Apr 20, 2026 •
edited
Loading

EWS run on previous version of this PR (hash cda9543)

Details

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows Apple Internal
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac   🛠 wpe   🛠 win ✅ 🛠 ios-apple
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug   🧪 wpe-wk2   🧪 win-tests ✅ 🛠 mac-apple
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac   🧪 api-wpe loading 🛠 vision-apple
✅ 🧪 ios-wk2-wpt   🧪 api-mac-debug   🛠 gtk3-libwebrtc
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🛠 gtk
✅ 🛠 ios-safer-cpp ✅ 🧪 mac-wk2   🧪 gtk-wk2
✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2   🧪 api-gtk
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🛠 playstation
✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2
✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@pxlcoder
Copy link
Copy Markdown
Member

pxlcoder commented Apr 20, 2026

The latest version of the PR makes an additional change to CompositeEditCommand to cover another case, but did not add more test coverage. Can we add another test?

@webkit-early-warning-system
Copy link
Copy Markdown
Collaborator

webkit-early-warning-system commented Apr 20, 2026 •
edited
Loading

EWS run on current version of this PR (hash a385044)

Details

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows Apple Internal
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win ❌ 🛠 ios-apple
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 win-tests ❌ 🛠 mac-apple
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe ✅ 🛠 vision-apple
✅ 🧪 ios-wk2-wpt ✅ 🧪 api-mac-debug ✅ 🛠 gtk3-libwebrtc
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🛠 gtk
✅ 🛠 ios-safer-cpp ✅ 🧪 mac-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 api-gtk
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ❌ 🛠 playstation
✅ 🛠 🧪 unsafe-merge ✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2
✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

pxlcoder
pxlcoder approved these changes Apr 20, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@pxlcoder pxlcoder left a comment

Choose a reason for hiding this comment

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

J C Made It

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Apr 21, 2026
@jesxilin jesxilin added unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing and removed merging-blocked Applied to prevent a change from being merged labels Apr 21, 2026
@jesxilin
Removing/outdent a line from ordered list causes the following list t…
4216f6e 
…o start with an incorrect number

https://bugs.webkit.org/show_bug.cgi?id=312522
rdar://173537449

Reviewed by Aditya Keerthi.

In unlistifyParagraph, there isn't a procedure to set the
starting list number after splitting. So, when it calls
splitElement() to split the list, this calls
Element::cloneElementWithoutChildren which clones all attributes,
including the start attribute.

For example, if the original list started with 11 and the list
is split in the middle, both lists now start with 11. The
expectation is when splitting the list, the second list starts
from 1.

Thus, make a function that splits the list and sets the second starting
list number to be 1 if a start attribute was originally provided. Otherwise,
don't do anything. Now, outdenting, removing list formatting, and entering to
create new lines should all have the following list start with 1.

Additionally, add layout tests for the cases to confirm the correct
starting list numbers. For outdenting and remove list formatting, both
go down the same code path so there is only one test.

* LayoutTests/editing/execCommand/break-out-of-list-resets-start-number-expected.txt: Added.
* LayoutTests/editing/execCommand/break-out-of-list-resets-start-number.html: Added.
* LayoutTests/editing/execCommand/outdent-list-resets-start-number-expected.txt: Added.
* LayoutTests/editing/execCommand/outdent-list-resets-start-number.html: Added.
* Source/WebCore/editing/CompositeEditCommand.cpp:
(WebCore::CompositeEditCommand::splitListElement):
(WebCore::CompositeEditCommand::moveParagraphs):
* Source/WebCore/editing/CompositeEditCommand.h:
* Source/WebCore/editing/InsertListCommand.cpp:
(WebCore::InsertListCommand::unlistifyParagraph):

Canonical link: https://commits.webkit.org/311696@main
@webkit-commit-queue
Copy link
Copy Markdown
Collaborator

webkit-commit-queue commented Apr 21, 2026

Committed 311696@main (4216f6e): https://commits.webkit.org/311696@main

Reviewed commits have been landed. Closing PR #62938 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 4216f6e into WebKit:main Apr 21, 2026
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Apr 21, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pxlcoder pxlcoder pxlcoder approved these changes

@rniwa rniwa Awaiting requested review from rniwa rniwa is a code owner

Assignees

@jesxilin jesxilin

Labels

WebKit Misc. For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore).

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jesxilin @webkit-early-warning-system @pxlcoder @webkit-commit-queue @webkit-ews-buildbot