Commit d1666a6
committed
Ignore non-linkable definitions when resolving links
This avoids links not being generated if a definition in a non-linkable
file has higher priority than the one in the linkable file.
Add a flag `onlyLinkable` to `getResolvedSymbolRec` which makes it skip
over unlinkable definitions. This flag is only set in `getDefsNew`. The
result of this function is ultimately used in
- DocParser::handleLinkedWord via resolveRef
- DocRef::DocRef via resolveLink
- DocLink::DocLink via resolveLink
- linkifyText via getDefs
All these users ignore unlinkable definitions.
Fixes doxygen#11560.1 parent 2604e3f commit d1666a6
3 files changed
+18
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
144 | 144 | | |
145 | 145 | | |
146 | 146 | | |
| 147 | + | |
147 | 148 | | |
148 | 149 | | |
149 | 150 | | |
| |||
393 | 394 | | |
394 | 395 | | |
395 | 396 | | |
| 397 | + | |
396 | 398 | | |
397 | 399 | | |
398 | 400 | | |
| |||
523 | 525 | | |
524 | 526 | | |
525 | 527 | | |
526 | | - | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
| 532 | + | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
| 536 | + | |
527 | 537 | | |
528 | 538 | | |
529 | 539 | | |
| |||
1658 | 1668 | | |
1659 | 1669 | | |
1660 | 1670 | | |
1661 | | - | |
| 1671 | + | |
| 1672 | + | |
1662 | 1673 | | |
1663 | 1674 | | |
1664 | 1675 | | |
1665 | 1676 | | |
1666 | 1677 | | |
1667 | 1678 | | |
1668 | | - | |
| 1679 | + | |
1669 | 1680 | | |
1670 | 1681 | | |
1671 | 1682 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
| 71 | + | |
71 | 72 | | |
72 | 73 | | |
73 | 74 | | |
74 | 75 | | |
75 | 76 | | |
76 | | - | |
| 77 | + | |
| 78 | + | |
77 | 79 | | |
78 | 80 | | |
79 | 81 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2289 | 2289 | | |
2290 | 2290 | | |
2291 | 2291 | | |
2292 | | - | |
| 2292 | + | |
2293 | 2293 | | |
2294 | 2294 | | |
2295 | 2295 | | |
| |||
0 commit comments