Page MenuHomePhabricator
Create Task
Maniphest T403741

Move annotation-removal logic out of AnnotationAction into SurfaceFragment
Open, Needs TriagePublic
Actions

Description

dm.Annotation supports a removes key which specifies other annotations that shouldn't overlap a given annotation. However, this is only respected by AnnotationAction, so it's relatively easily to accidentally ignore this. We can move it upstream into SurfaceFragment, so AnnotationAction doesn't need to know about it and more places will automatically respect it.

Details

Related Changes in Gerrit:
SubjectRepoBranchLines +/-
SurfaceFragment: respect annotation.removesVisualEditor/VisualEditormaster+38 -11
ImportedDataAnnotation: note that it should remove itself if presentVisualEditor/VisualEditormaster+3 -0
Update VE core submodule to master (a5bd08c8b)mediawiki/extensions/VisualEditorwmf/1.45.0-wmf.17+1 -1
Update VE core submodule to master (a5bd08c8b)mediawiki/extensions/VisualEditormaster+1 -1
dm.SurfaceFragment: fix updating of insertion annotationsVisualEditor/VisualEditormaster+65 -2
dm.SurfaceFragment.test: test annotateContentVisualEditor/VisualEditormaster+50 -0
Customize query in gerrit

Related Objects

Mentioned In
T403745: ve.track module isn't loaded when launching 2017 editor on a page with discussiontools enabled
T400849: Enable "Thanks" from talk pages as an opt-in beta feature
T391521: VE: Deleting sub-ref attached to main content does not orphan other sub-refs in same article
T397145: Move footnote numbering information out of singleton document cache
T401890: Long link labels don't show ellipsis in link context on mobile
T402392: Bring basic reference functionality into VisualEditor standalone
T397518: VisualDiff should use vertical ellipsis consistenly
T302413: Visual diff of templates inside the table shows all descriptions at the bottom, in backwards order
T402717: ClipboardHandler preserves existing ImportedDataAnnotation when pasting over previously-pasted content
Mentioned Here
rGVEDa5bd08c8bc2a: Move ve.track.js into a separate module
T302413: Visual diff of templates inside the table shows all descriptions at the bottom, in backwards order
T391521: VE: Deleting sub-ref attached to main content does not orphan other sub-refs in same article
T397145: Move footnote numbering information out of singleton document cache
T397518: VisualDiff should use vertical ellipsis consistenly
T400849: Enable "Thanks" from talk pages as an opt-in beta feature
T401890: Long link labels don't show ellipsis in link context on mobile
T402392: Bring basic reference functionality into VisualEditor standalone
T402717: ClipboardHandler preserves existing ImportedDataAnnotation when pasting over previously-pasted content
T403745: ve.track module isn't loaded when launching 2017 editor on a page with discussiontools enabled

Event Timeline

DLynch created this task.Sep 4 2025, 3:23 PM
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptSep 4 2025, 3:23 PM
gerritbot added a comment.Sep 4 2025, 3:29 PM

Change #1184817 had a related patch set uploaded (by DLynch; author: DLynch):

[VisualEditor/VisualEditor@master] dm.SurfaceFragment: fix updating of insertion annotations

https://gerrit.wikimedia.org/r/1184817

gerritbot added a project: Patch-For-Review.Sep 4 2025, 3:29 PM

Change #1184818 had a related patch set uploaded (by DLynch; author: DLynch):

[VisualEditor/VisualEditor@master] dm.SurfaceFragment.test: test annotateContent

https://gerrit.wikimedia.org/r/1184818

gerritbot added a comment.Sep 4 2025, 3:30 PM

Change #1184819 had a related patch set uploaded (by DLynch; author: DLynch):

[VisualEditor/VisualEditor@master] SurfaceFragment: respect annotation.removes

https://gerrit.wikimedia.org/r/1184819

gerritbot added a comment.Sep 4 2025, 3:30 PM

Change #1184820 had a related patch set uploaded (by DLynch; author: DLynch):

[VisualEditor/VisualEditor@master] ImportedDataAnnotation: note that it should remove itself if present

https://gerrit.wikimedia.org/r/1184820

DLynch mentioned this in T402717: ClipboardHandler preserves existing ImportedDataAnnotation when pasting over previously-pasted content.Sep 4 2025, 3:31 PM
gerritbot added a comment.Sep 4 2025, 5:48 PM

Change #1184818 abandoned by Esanders:

[VisualEditor/VisualEditor@master] dm.SurfaceFragment.test: test annotateContent

Reason:

squashed into Ifd463502161491cc358bde94ec9e61581253daa0

https://gerrit.wikimedia.org/r/1184818

gerritbot added a comment.Sep 4 2025, 5:50 PM

Change #1184817 merged by jenkins-bot:

[VisualEditor/VisualEditor@master] dm.SurfaceFragment: fix updating of insertion annotations

https://gerrit.wikimedia.org/r/1184817

gerritbot added a comment.Sep 5 2025, 6:02 PM

Change #1185179 had a related patch set uploaded (by DLynch; author: DLynch):

[mediawiki/extensions/VisualEditor@master] Update VE core submodule to master (a5bd08c8b)

https://gerrit.wikimedia.org/r/1185179

gerritbot added a comment.Sep 5 2025, 7:19 PM

Change #1185179 merged by jenkins-bot:

[mediawiki/extensions/VisualEditor@master] Update VE core submodule to master (a5bd08c8b)

https://gerrit.wikimedia.org/r/1185179

gerritbot added a comment.Sep 8 2025, 4:30 PM

Change #1185982 had a related patch set uploaded (by DLynch; author: DLynch):

[mediawiki/extensions/VisualEditor@wmf/1.45.0-wmf.17] Update VE core submodule to master (a5bd08c8b)

https://gerrit.wikimedia.org/r/1185982

gerritbot added a comment.Sep 8 2025, 4:37 PM

Change #1185982 abandoned by DLynch:

[mediawiki/extensions/VisualEditor@wmf/1.45.0-wmf.17] Update VE core submodule to master (a5bd08c8b)

Reason:

Would need to do the subrepo backport anyway

https://gerrit.wikimedia.org/r/1185982

gerritbot added a comment.Sep 8 2025, 7:11 PM

Change #1185982 restored by DLynch:

[mediawiki/extensions/VisualEditor@wmf/1.45.0-wmf.17] Update VE core submodule to master (a5bd08c8b)

https://gerrit.wikimedia.org/r/1185982

gerritbot added a comment.Sep 8 2025, 8:04 PM

Change #1185982 merged by jenkins-bot:

[mediawiki/extensions/VisualEditor@wmf/1.45.0-wmf.17] Update VE core submodule to master (a5bd08c8b)

https://gerrit.wikimedia.org/r/1185982

Stashbot mentioned this in T302413: Visual diff of templates inside the table shows all descriptions at the bottom, in backwards order.Sep 8 2025, 8:04 PM
Stashbot mentioned this in T397518: VisualDiff should use vertical ellipsis consistenly.
Stashbot mentioned this in T402392: Bring basic reference functionality into VisualEditor standalone.
Stashbot mentioned this in T401890: Long link labels don't show ellipsis in link context on mobile.
Stashbot mentioned this in T397145: Move footnote numbering information out of singleton document cache.
Stashbot mentioned this in T391521: VE: Deleting sub-ref attached to main content does not orphan other sub-refs in same article.
Stashbot mentioned this in T400849: Enable "Thanks" from talk pages as an opt-in beta feature.

Mentioned in SAL (#wikimedia-operations) [2025-09-08T20:04:45Z] <kemayo@deploy1003> Started scap sync-world: Backport for [[gerrit:1185991|Enable DT thanks at mediawikiwiki (T400849)]], [[gerrit:1185982|Update VE core submodule to master (a5bd08c8b) (T302413 T391521 T397145 T401890 T402392 T397518 T402717 T403741 T403745)]]

Stashbot mentioned this in T403745: ve.track module isn't loaded when launching 2017 editor on a page with discussiontools enabled.Sep 8 2025, 8:05 PM
Stashbot added a comment.Sep 8 2025, 8:11 PM

Mentioned in SAL (#wikimedia-operations) [2025-09-08T20:11:02Z] <kemayo@deploy1003> kemayo, esanders: Backport for [[gerrit:1185991|Enable DT thanks at mediawikiwiki (T400849)]], [[gerrit:1185982|Update VE core submodule to master (a5bd08c8b) (T302413 T391521 T397145 T401890 T402392 T397518 T402717 T403741 T403745)]] synced to the testservers (see https://wikitech.wikimedia.org/wiki/Mwdebug). Changes can now be verified there.

Stashbot added a comment.Sep 8 2025, 8:18 PM

Mentioned in SAL (#wikimedia-operations) [2025-09-08T20:17:50Z] <kemayo@deploy1003> Finished scap sync-world: Backport for [[gerrit:1185991|Enable DT thanks at mediawikiwiki (T400849)]], [[gerrit:1185982|Update VE core submodule to master (a5bd08c8b) (T302413 T391521 T397145 T401890 T402392 T397518 T402717 T403741 T403745)]] (duration: 13m 05s)

gerritbot added a comment.Fri, Nov 14, 10:32 AM

Change #1184820 abandoned by Esanders:

[VisualEditor/VisualEditor@master] ImportedDataAnnotation: note that it should remove itself if present

Reason:

See I6ef87b39ca4c9726d3f1b8908ab20a4811e44e12

https://gerrit.wikimedia.org/r/1184820

Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL · Credits