1j01/textual-paint
1
1
Fork 0
mirror of https://github.com/1j01/textual-paint.git synced 2024-12-23 14:51:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: prefer Text.styled() in most cases

Browse Source
This commit is contained in:
Isaiah Odhner 2023-06-04 16:17:21 -04:00
parent c525ff3e26
commit f727a3c08d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/textual_paint/inspector.py
View File

@ -438,7 +438,7 @@ class PropertiesTree(Tree[object]):
def with_name(text: Text) -> Text: def with_name(text: Text) -> Text:
"""Formats a key=value line.""" """Formats a key=value line."""
return Text.assemble( return Text.assemble(
Text.from_markup(f"[b]{escape(name)}[/b]="), text Text.styled(name, "bold"), "=", text
) )
if exception is not None: if exception is not None:
@ -456,11 +456,11 @@ class PropertiesTree(Tree[object]):
# with_name(PropertiesTree.highlighter(repr(data))), # with_name(PropertiesTree.highlighter(repr(data))),
# Text.from_markup(f" [#808080]({length})[/#808080]"), # Text.from_markup(f" [#808080]({length})[/#808080]"),
# )) # ))
# In the middle I think is best, although it's the most complicated: # In the middle I think is best, although it's a little more complex:
node.set_label(Text.assemble( node.set_label(Text.assemble(
Text.from_markup(f"[b]{escape(name)}[/b]"), Text.styled(name, "bold"),
Text.from_markup(f"[#808080]({length})[/#808080]"), Text.styled(f"({length})", "#808080"),
Text("="), "=",
PropertiesTree.highlighter(repr(data)) # type: ignore PropertiesTree.highlighter(repr(data)) # type: ignore
)) ))
# Can I perhaps DRY with with_name() with with_name taking a length parameter? In other words: # Can I perhaps DRY with with_name() with with_name taking a length parameter? In other words:
@ -611,10 +611,13 @@ class NodeInfo(Container):
line_number = inspect.getsourcelines(obj)[1] line_number = inspect.getsourcelines(obj)[1]
file = inspect.getsourcefile(obj) file = inspect.getsourcefile(obj)
if file is None: if file is None:
return Text.from_markup(f"[#808080](unknown location)[/#808080]") return Text.styled(f"(unknown location)", "#808080")
else: else:
action = f"open_file({file!r}, {line_number})" action = f"open_file({file!r}, {line_number})"
return Text.from_markup(f"{escape(file)}:{line_number} [@click={action}](Open)[/@click]") return Text.assemble(
Text(f"{file}:{line_number} "),
Text.from_markup(f"[@click={action}](Open)[/@click]"),
)
except OSError as e: except OSError as e:
return Text.from_markup(f"[#808080](error getting location: [red]{escape(repr(e))}[/red])[/#808080]") return Text.from_markup(f"[#808080](error getting location: [red]{escape(repr(e))}[/red])[/#808080]")
@ -640,7 +643,7 @@ class NodeInfo(Container):
defining_class = handler.__self__.__class__ defining_class = handler.__self__.__class__
def_location = location_info(handler) def_location = location_info(handler)
# Note: css_path_nodes is just like ancestors_with_self, but reversed; it's still DOM nodes # Note: css_path_nodes is just like ancestors_with_self, but reversed; it's still DOM nodes
descendant_arrow = Text.from_markup("[#808080] > [/#808080]") descendant_arrow = Text.styled(" > ", "#808080")
dom_path = descendant_arrow.join([css_path_node.css_identifier_styled for css_path_node in ancestor.css_path_nodes]) dom_path = descendant_arrow.join([css_path_node.css_identifier_styled for css_path_node in ancestor.css_path_nodes])
link_id = self._link_id_counter link_id = self._link_id_counter
self._link_id_counter += 1 self._link_id_counter += 1