Commit ce4e10f
committed
Find/Replace overlay: adopt Eclipse command infrastructure
The overlay previously dispatched keyboard shortcuts through custom SWT
KeyListeners and toggled button enablement by manipulating ToolItems
directly, bypassing the Eclipse key binding framework entirely:
shortcuts
could not be seen or customized via Preferences > Keys, and user-defined
overrides were silently ignored.
FindReplaceOverlayAction now extends AbstractHandler, so every overlay
operation is a real Eclipse handler. AccessibleToolItem.setAction()
derives a ToolItem's enabled state and shortcut-hint tooltip from the
action itself (via IHandlerListener and a hint resolved through
IBindingService), instead of having them pushed to it explicitly at each
call site.
A dedicated key-binding context hierarchy, declared in plugin.xml and
activated/deactivated with overlay focus, scopes the search- and
replace-specific commands separately from the ones common to the whole
overlay:
findReplaceOverlay (parent, active while the search or replace field
has focus)
|- findReplaceOverlay.searchFocused (active while the search field has
focus)
|- findReplaceOverlay.replaceFocused (active while the replace field
has focus)
Handler activation for the overlay's own commands is registered once per
action, scoped by an ACTIVE_FOCUS_CONTROL-based expression backed by
IFocusService tracking the search/replace text controls, rather than
imperatively activated and deactivated on every focus-gained/-lost
event.
Context activation/deactivation is made defensively idempotent rather
than
relying on focus-gained/-lost events always alternating strictly:
activating
a bar's context first clears any contexts still active from a previous
activation, and disposing the overlay's container control also
deactivates
any active contexts and reactivates the target editor's actions, since
disposal is not guaranteed to always be preceded by a focus-lost event.
Fixes
#2015
Prepares
#19121 parent 5fe0fc9 commit ce4e10f
7 files changed
Lines changed: 389 additions & 171 deletions
File tree
- bundles/org.eclipse.ui.workbench.texteditor
- src/org/eclipse/ui/internal/findandreplace/overlay
Lines changed: 15 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
206 | 206 | | |
207 | 207 | | |
208 | 208 | | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
209 | 224 | | |
210 | 225 | | |
211 | 226 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
507 | 507 | | |
508 | 508 | | |
509 | 509 | | |
| 510 | + | |
| 511 | + | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
| 519 | + | |
| 520 | + | |
| 521 | + | |
| 522 | + | |
| 523 | + | |
| 524 | + | |
| 525 | + | |
| 526 | + | |
| 527 | + | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
| 532 | + | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
| 539 | + | |
| 540 | + | |
| 541 | + | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
| 545 | + | |
| 546 | + | |
| 547 | + | |
| 548 | + | |
| 549 | + | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
| 556 | + | |
| 557 | + | |
| 558 | + | |
| 559 | + | |
| 560 | + | |
| 561 | + | |
| 562 | + | |
| 563 | + | |
| 564 | + | |
510 | 565 | | |
511 | 566 | | |
512 | 567 | | |
| |||
1500 | 1555 | | |
1501 | 1556 | | |
1502 | 1557 | | |
| 1558 | + | |
| 1559 | + | |
| 1560 | + | |
| 1561 | + | |
| 1562 | + | |
| 1563 | + | |
| 1564 | + | |
| 1565 | + | |
| 1566 | + | |
| 1567 | + | |
| 1568 | + | |
| 1569 | + | |
| 1570 | + | |
| 1571 | + | |
| 1572 | + | |
| 1573 | + | |
| 1574 | + | |
| 1575 | + | |
| 1576 | + | |
| 1577 | + | |
| 1578 | + | |
| 1579 | + | |
| 1580 | + | |
| 1581 | + | |
| 1582 | + | |
| 1583 | + | |
| 1584 | + | |
| 1585 | + | |
| 1586 | + | |
| 1587 | + | |
| 1588 | + | |
| 1589 | + | |
| 1590 | + | |
| 1591 | + | |
| 1592 | + | |
| 1593 | + | |
| 1594 | + | |
| 1595 | + | |
| 1596 | + | |
| 1597 | + | |
| 1598 | + | |
| 1599 | + | |
| 1600 | + | |
| 1601 | + | |
| 1602 | + | |
| 1603 | + | |
| 1604 | + | |
| 1605 | + | |
| 1606 | + | |
| 1607 | + | |
| 1608 | + | |
| 1609 | + | |
| 1610 | + | |
| 1611 | + | |
| 1612 | + | |
| 1613 | + | |
| 1614 | + | |
| 1615 | + | |
| 1616 | + | |
| 1617 | + | |
| 1618 | + | |
| 1619 | + | |
| 1620 | + | |
| 1621 | + | |
| 1622 | + | |
| 1623 | + | |
| 1624 | + | |
| 1625 | + | |
| 1626 | + | |
| 1627 | + | |
| 1628 | + | |
| 1629 | + | |
| 1630 | + | |
| 1631 | + | |
| 1632 | + | |
| 1633 | + | |
| 1634 | + | |
| 1635 | + | |
1503 | 1636 | | |
0 commit comments