Skip to content

Import Rust visualizer script even if lldb_commands is missing #1395

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

Open
Walnut356 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Import Rust visualizer script even if lldb_commands is missing #1395

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lang_support/rust.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def __lldb_init_module(debugger, internal_dict): # pyright: ignore
log.info(f'Rust formatters dir: {formatters}')
lldb_lookup = path.join(formatters, 'lldb_lookup.py')
lldb_commands = path.join(formatters, 'lldb_commands')
if not path.isfile(lldb_lookup) or not path.isfile(lldb_commands):
if not path.isfile(lldb_lookup):
message = 'Could not find LLDB data formatters in your Rust toolchain.'
if sysroot and '-msvc' in sysroot:
message += ' For more information, please visit https://github.com/vadimcn/codelldb/wiki/Windows'
Expand All @@ -56,6 +56,10 @@ def __lldb_init_module(debugger, internal_dict): # pyright: ignore

codelldb.debugger_message('Loading Rust formatters from {}'.format(formatters))
debugger.HandleCommand("command script import '{}'".format(lldb_lookup))

if not path.isfile(lldb_commands):
return

with open(lldb_commands, 'rt') as f:
for line in f:
line = line.strip()
Expand Down
Loading