tools/grit/grit/format/html_inline.py - Issue 2615953002: Fix grit's <if> not to strip trailing or preceding whitespace

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/grit/grit/format/html_inline.py

Issue 2615953002: Fix grit's <if> not to strip trailing or preceding whitespace (Closed)

Patch Set: indent tweak and comment fixes for thakis@ Created 3 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: tools/grit/grit/format/html_inline.py

diff --git a/tools/grit/grit/format/html_inline.py b/tools/grit/grit/format/html_inline.py

index e8cf22d1e45b20aff35592cdb21b956da140bd7a..9e5ec6a81e436e145d9d42a9be6baedc2fb38518 100755

--- a/tools/grit/grit/format/html_inline.py

+++ b/tools/grit/grit/format/html_inline.py

@@ -32,12 +32,12 @@ DIST_DEFAULT = 'chromium'

DIST_ENV_VAR = 'CHROMIUM_BUILD'

DIST_SUBSTR = '%DISTRIBUTION%'

-# Matches beginning of an "if" block with trailing spaces.

+# Matches beginning of an "if" block.

_BEGIN_IF_BLOCK = lazy_re.compile(

- '<if [^>]*?expr=("(?P<expr1>[^">]*)"|\'(?P<expr2>[^\'>]*)\')[^>]*?>\s*')

+ '<if [^>]*?expr=("(?P<expr1>[^">]*)"|\'(?P<expr2>[^\'>]*)\')[^>]*?>')

-# Matches ending of an "if" block with preceding spaces.

-_END_IF_BLOCK = lazy_re.compile('\s*</if>')

+# Matches ending of an "if" block.

+_END_IF_BLOCK = lazy_re.compile('</if>')

# Used by DoInline to replace various links with inline content.

_STYLESHEET_RE = lazy_re.compile(

« no previous file with comments | « no previous file | tools/grit/grit/format/html_inline_unittest.py » ('j') | no next file with comments »