Skip to content

[Cherry-pick into stable/20240723] [lldb] Fix a positioning bug in diagnostics output (#116711) #9630

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
Merged
merged 3 commits into from
Nov 19, 2024
Merged

[Cherry-pick into stable/20240723] [lldb] Fix a positioning bug in diagnostics output (#116711) #9630

merged 3 commits into from
Nov 19, 2024

Conversation

@adrian-prantl
Copy link

@adrian-prantl adrian-prantl commented Nov 19, 2024 

commit 8b2dff960d9d987c583c3a6d5729f01d101dc401
Author: Adrian Prantl <aprantl@apple.com>
Date:   Tue Nov 19 08:58:49 2024 -0800

    [lldb] Fix a positioning bug in diagnostics output (#116711)
    
    The old code did not take the indentation into account.

@adrian-prantl
Copy link
Author

adrian-prantl commented Nov 19, 2024

@swift-ci test

@adrian-prantl adrian-prantl force-pushed the cherry-pick-stable-20240723-lldb-Fix-a-positioning-bug-in-diagnostics-output-116711 branch from 7f088ea to 1660102 Compare November 19, 2024 17:14
@adrian-prantl
Copy link
Author

adrian-prantl commented Nov 19, 2024

@swift-ci test

@adrian-prantl
Copy link
Author

adrian-prantl commented Nov 19, 2024

@swift-ci test macOS

@adrian-prantl
[lldb] Fix a positioning bug in diagnostics output (llvm#116711)
3703aad 
The old code did not take the indentation into account.

(cherry picked from commit 8b2dff9)
@adrian-prantl
[lldb] Improve rendering of inline diagnostics on the same column (ll…
7e80550 
…vm#116727)

depends on llvm#116711

[lldb] Improve rendering of inline diagnostics on the same column by
fixing the indentation and printing these annotations in the original
order.

Before

    a+b+c;
    ^ ^ ^
    | | error: 3
    | |note: 2b
    | error: 2a
    error: 1

After

    a+b+c;
    ^ ^ ^
    | | error: 3
    | error: 2a
    | note: 2b
    error: 1

(cherry picked from commit 6b4f675)
@adrian-prantl
[lldb] Refactor helper by using iterators and in-place edits (NFC) (l…
a4b1912 
…lvm#116876)

Based on post-commit review feedback by Felipe Piovezan!

(cherry picked from commit 174899f)
@adrian-prantl adrian-prantl force-pushed the cherry-pick-stable-20240723-lldb-Fix-a-positioning-bug-in-diagnostics-output-116711 branch from 1660102 to a4b1912 Compare November 19, 2024 21:03
@adrian-prantl
Copy link
Author

adrian-prantl commented Nov 19, 2024

@swift-ci test

@adrian-prantl adrian-prantl merged commit 0f86f35 into swiftlang:stable/20240723 Nov 19, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JDevlieghere JDevlieghere Awaiting requested review from JDevlieghere

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@adrian-prantl