forked from llvm/llvm-project
-
Notifications
You must be signed in to change notification settings - Fork 341
[Syntax Highlighting] Add name and parameters syntax highlighting in Swift backtraces #10710
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.
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
Open
charles-zablit
wants to merge
7
commits into
swiftlang:swift/release/6.2
Choose a base branch
from
charles-zablit:charles-zablit/lldb/swift-mangling
base: swift/release/6.2
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
ffff0b7
add function name syntax highlighting in Swift backtraces
charles-zablit 1664713
add unit tests
charles-zablit ab98bc5
remove redundant check
charles-zablit 1a1468e
refactor tests
charles-zablit 554852f
sync with new API
charles-zablit 77eafcd
remove redundant initialization
charles-zablit 3967962
restore formatting in LanguageSwiftProperties.td
charles-zablit File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -353,8 +353,17 @@ ConstString Mangled::GetDemangledNameImpl(bool force, // BEGIN SWIFT | |||||||||||||
const char *mangled_name = m_mangled.GetCString(); | ||||||||||||||
Log *log = GetLog(LLDBLog::Demangle); | ||||||||||||||
LLDB_LOGF(log, "demangle swift: %s", mangled_name); | ||||||||||||||
std::string demangled(SwiftLanguageRuntime::DemangleSymbolAsString( | ||||||||||||||
mangled_name, SwiftLanguageRuntime::eTypeName, sc)); | ||||||||||||||
auto demangled_data = SwiftLanguageRuntime::TrackedDemangleSymbolAsString( | ||||||||||||||
mangled_name, SwiftLanguageRuntime::eSimplified, sc); | ||||||||||||||
std::string demangled = demangled_data.first; | ||||||||||||||
DemangledNameInfo info = demangled_data.second; | ||||||||||||||
Comment on lines
+356
to
+359
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||
info.PrefixRange.second = | ||||||||||||||
std::min(info.BasenameRange.first, info.ArgumentsRange.first); | ||||||||||||||
info.SuffixRange.first = | ||||||||||||||
std::max(info.BasenameRange.second, info.ArgumentsRange.second); | ||||||||||||||
info.SuffixRange.second = demangled.length(); | ||||||||||||||
m_demangled_info.emplace(info); | ||||||||||||||
|
||||||||||||||
// Don't cache the demangled name the function isn't available yet. | ||||||||||||||
if (!sc || !sc->function) { | ||||||||||||||
LLDB_LOGF(log, "demangle swift: %s -> \"%s\" (not cached)", mangled_name, | ||||||||||||||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
lldb/source/Plugins/Language/Swift/LanguageSwiftProperties.td
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
include "../../../../include/lldb/Core/PropertiesBase.td" | ||
Michael137 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
let Definition = "language_swift" in { | ||
def FunctionNameFormat: Property<"function-name-format", "FormatEntity">, | ||
Global, | ||
DefaultStringValue<"${function.prefix}${ansi.fg.yellow}${function.basename}${ansi.normal}${function.formatted-arguments}${function.suffix}">, | ||
Desc<"Swift specific frame format string to use when displaying stack frame information for threads.">; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.