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

Highlight color values also within rule sets

Browse Source 
This also removes an extraneous newline for an empty inline styles block (by accident)
This commit is contained in:
Isaiah Odhner 2023-06-09 21:02:28 -04:00
parent 675cee043f
commit dfcdd33a7a
1 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/textual_paint/inspector.py
View File

@ -705,10 +705,11 @@ class NodeInfo(Container):
# css_lines = dom_node.styles.inline.css_lines # css_lines = dom_node.styles.inline.css_lines
# But we need to associate the snake_cased/hyphenated/shorthand CSS property names, # But we need to associate the snake_cased/hyphenated/shorthand CSS property names,
# in order to provide links to the source code. # in order to provide links to the source code.
inline_styles = dom_node.styles.inline
inline_rules = inline_styles.get_rules() def format_style_line(rule: str, styles: Styles, rules: RulesMap, inline: bool) -> Text:
def format_inline_style_line(rule: str) -> Text:
"""Formats a single CSS line for display, with a link to open the source code.""" """Formats a single CSS line for display, with a link to open the source code."""
# TODO: probably refactor arguments to take simpler data (!important flag bool etc....)
# Ugly hack for creating a string from a single rule, # Ugly hack for creating a string from a single rule,
# while associating the snake_cased/hyphenated/shorthand CSS property names. # while associating the snake_cased/hyphenated/shorthand CSS property names.
# TODO: display as shorthand properties when possible, as css_lines does # TODO: display as shorthand properties when possible, as css_lines does
@ -718,24 +719,27 @@ class NodeInfo(Container):
# (The stacks are captured for individual properties, not shorthands.) # (The stacks are captured for individual properties, not shorthands.)
# This could be cleaned up a lot with some API changes in `Styles`. # This could be cleaned up a lot with some API changes in `Styles`.
single_rule_rules_map = RulesMap() single_rule_rules_map = RulesMap()
single_rule_rules_map[rule] = inline_rules[rule] single_rule_rules_map[rule] = rules[rule]
important: set[str] = set() important: set[str] = set()
if rule in inline_styles.important: if rule in styles.important:
important.add(rule) important.add(rule)
single_rule_styles = Styles( single_rule_styles = Styles(
node=inline_styles.node, node=styles.node,
_rules=single_rule_rules_map, _rules=single_rule_rules_map,
important=important important=important
) )
css_line = single_rule_styles.css_lines[0] try:
css_line = single_rule_styles.css_lines[0]
except IndexError:
# This happens for properties not part of the CSS API, like `auto_scrollbar_color`.
return Text("")
rule_hyphenated, value_and_semicolon = css_line.split(":", 1) rule_hyphenated, value_and_semicolon = css_line.split(":", 1)
rule_hyphenated = rule_hyphenated.strip() rule_hyphenated = rule_hyphenated.strip()
value_and_semicolon = value_and_semicolon.strip() value_and_semicolon = value_and_semicolon.strip()
value_text: Text | str = value_and_semicolon[:-1].strip() value_text: Text | str = value_and_semicolon[:-1].strip()
value: Any = inline_rules[rule] value: Any = rules[rule]
# TODO: apply color highlighting to border values that are a border style followed by a color # TODO: apply color highlighting to border values that are a border style followed by a color
# and apply it to non-inline styles too
if isinstance(value, Color): if isinstance(value, Color):
value_text = Text.styled(value_text, Style(bgcolor=value.rich_color, color=value.get_contrast_text().rich_color)) value_text = Text.styled(value_text, Style(bgcolor=value.rich_color, color=value.get_contrast_text().rich_color))
return Text.assemble( return Text.assemble(
@ -743,17 +747,31 @@ class NodeInfo(Container):
rule_hyphenated, rule_hyphenated,
": ", ": ",
value_text, value_text,
"; ", *(
format_location_info(trace_inline_style(rule)), ["; ", format_location_info(trace_inline_style(rule)),]
if inline
else [";"]
),
"\n",
) )
inline_style_text = Text.assemble( def format_styles_block(styles: Styles, name: Text | str, rule_set_location_info: Text | None) -> Text:
Text.styled("inline styles", "italic"), inline = rule_set_location_info is None
" {\n", rules = styles.get_rules()
Text("\n").join( return Text.assemble(
format_inline_style_line(rule) for rule in inline_rules name,
), " {",
"\n}", *(
) [" ", rule_set_location_info]
if rule_set_location_info is not None
else []
),
"\n",
Text().join(
format_style_line(rule, styles, rules, inline) for rule in rules
),
"}",
)
inline_style_text = format_styles_block(dom_node.styles.inline, Text.styled("inline styles", "italic"), None)
def format_rule_set(rule_set: RuleSet) -> Text: def format_rule_set(rule_set: RuleSet) -> Text:
"""Formats a CSS rule set for display, with a link to open the source code.""" """Formats a CSS rule set for display, with a link to open the source code."""
@ -785,14 +803,15 @@ class NodeInfo(Container):
line_number = i + 1 line_number = i + 1
# TODO: find the specific line number of the rule set # TODO: find the specific line number of the rule set
break break
css = rule_set.css return format_styles_block(rule_set.styles, rule_set.selectors, format_location_info((path, line_number) if path else None))
selectors, declarations_and_end_curly = css.split("{", 1) # css = rule_set.css
return Text.assemble( # selectors, declarations_and_end_curly = css.split("{", 1)
selectors, # return Text.assemble(
"{ ", # selectors,
format_location_info((path, line_number) if path else None), # "{ ",
declarations_and_end_curly, # format_location_info((path, line_number) if path else None),
) # declarations_and_end_curly,
# )
styles_text = Text.assemble( styles_text = Text.assemble(
inline_style_text, inline_style_text,