Allow and better handle single quotes in GRIT's <include> and <if>

Allow and better handle single quotes in GRIT's <include> and <if>

I'm starting to run clang-format on things, and it's miraculously
not blowing up on <if> or <include> in .js files.  It IS, however,
changing " to ', as JavaScript generally prefers '.

This helps handle that.

R=thakis@chromium.org
BUG=567770
Committed: https://crrev.com/e89e068d8d527239f9de0d7c8350e338ba0db5c1
Cr-Commit-Position: refs/heads/master@{#441292}

[Dan Beam, 2016-12-22 01:48:59]

Description was changed from

==========
Allow <include src=''> and <if expr=''> because clang-format converts " to '

R=thakis@chromium.org
BUG=567770
==========

to

==========
Allow and better handle single quotes in GRIT's <include> and <if>

I'm starting to run clang-format on things, and it's miraculously
not blowing up on <if> or <include> in .js files.  It IS, however,
changing " to ', as JavaScript generally prefers '.

This helps handle that.

R=thakis@chromium.org
BUG=567770
==========

[Dan Beam, 2016-12-22 02:00:39]

Patchset #2 (id:20001) has been deleted

[Dan Beam, 2016-12-22 02:00:43]

Patchset #1 (id:1) has been deleted

[Dan Beam, 2017-01-03 21:49:27]

ping when you get back

[Nico, 2017-01-03 22:29:57]

Generally looks cool; one question:

https://codereview.chromium.org/2598863002/diff/40001/tools/grit/grit/format/...
File tools/grit/grit/format/html_inline.py (right):

https://codereview.chromium.org/2598863002/diff/40001/tools/grit/grit/format/...
tools/grit/grit/format/html_inline.py:47:
'<include[^>]+?src=["\'](?P<filename>[^\'"]*)["\'].*?>(\s*</include>)?',
doesn't this match `src='foo"`? or does something else reject that elsewhere?

(basically i'm confused why this is different from BEGIN_IF_BLOCK)

[Dan Beam, 2017-01-04 01:14:05]

https://codereview.chromium.org/2598863002/diff/40001/tools/grit/grit/format/...
File tools/grit/grit/format/html_inline.py (right):

https://codereview.chromium.org/2598863002/diff/40001/tools/grit/grit/format/...
tools/grit/grit/format/html_inline.py:47:
'<include[^>]+?src=["\'](?P<filename>[^\'"]*)["\'].*?>(\s*</include>)?',
On 2017/01/03 22:29:57, Nico (ooo sick) wrote:
> doesn't this match `src='foo"`? or does something else reject that elsewhere?
> 
> (basically i'm confused why this is different from BEGIN_IF_BLOCK)

made them similar

[Dan Beam, 2017-01-04 01:14:14]

The CQ bit was checked by dbeam@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-04 01:14:34]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-04 01:23:53]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-04 01:23:54]

Dry run: This issue passed the CQ dry run.

[Nico, 2017-01-04 01:35:33]

lgtm

https://codereview.chromium.org/2598863002/diff/60001/tools/grit/grit/format/...
File tools/grit/grit/format/html_inline_unittest.py (right):

https://codereview.chromium.org/2598863002/diff/60001/tools/grit/grit/format/...
tools/grit/grit/format/html_inline_unittest.py:403: <include
src='single-double-quotes.html"></include>
Does the file single-double-quotes.html exist? (not sure if it matters if it
does or if the test tests what you want it to test without it existing too. but
just in case you forgot to git add...)

[Dan Beam, 2017-01-04 01:40:59]

https://codereview.chromium.org/2598863002/diff/60001/tools/grit/grit/format/...
File tools/grit/grit/format/html_inline_unittest.py (right):

https://codereview.chromium.org/2598863002/diff/60001/tools/grit/grit/format/...
tools/grit/grit/format/html_inline_unittest.py:403: <include
src='single-double-quotes.html"></include>
On 2017/01/04 01:35:33, Nico (ooo sick) wrote:
> Does the file single-double-quotes.html exist? (not sure if it matters if it
> does or if the test tests what you want it to test without it existing too.
but
> just in case you forgot to git add...)

no, neither of these files exist.  if they're accidentally processed, the test
will throw.

this is why both includes are left over in the "expected_inlined" variable.

[Dan Beam, 2017-01-04 02:11:23]

The CQ bit was checked by dbeam@chromium.org

[commit-bot: I haz the power, 2017-01-04 02:11:56]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-04 02:16:08]

CQ is committing da patch.

Bot data: {"patchset_id": 60001, "attempt_start_ts": 1483495883768360,
"parent_rev": "73c586e81745710d210e0f3927105279981415b2", "commit_rev":
"2885225a276e7447c74cffe5a7cf0572fa199b2a"}

[commit-bot: I haz the power, 2017-01-04 02:16:39]

Description was changed from

==========
Allow and better handle single quotes in GRIT's <include> and <if>

I'm starting to run clang-format on things, and it's miraculously
not blowing up on <if> or <include> in .js files.  It IS, however,
changing " to ', as JavaScript generally prefers '.

This helps handle that.

R=thakis@chromium.org
BUG=567770
==========

to

==========
Allow and better handle single quotes in GRIT's <include> and <if>

I'm starting to run clang-format on things, and it's miraculously
not blowing up on <if> or <include> in .js files.  It IS, however,
changing " to ', as JavaScript generally prefers '.

This helps handle that.

R=thakis@chromium.org
BUG=567770

Review-Url: https://codereview.chromium.org/2598863002
==========

[commit-bot: I haz the power, 2017-01-04 02:16:40]

Committed patchset #2 (id:60001)

[commit-bot: I haz the power, 2017-01-04 02:21:08]

Description was changed from

==========
Allow and better handle single quotes in GRIT's <include> and <if>

I'm starting to run clang-format on things, and it's miraculously
not blowing up on <if> or <include> in .js files.  It IS, however,
changing " to ', as JavaScript generally prefers '.

This helps handle that.

R=thakis@chromium.org
BUG=567770

Review-Url: https://codereview.chromium.org/2598863002
==========

to

==========
Allow and better handle single quotes in GRIT's <include> and <if>

I'm starting to run clang-format on things, and it's miraculously
not blowing up on <if> or <include> in .js files.  It IS, however,
changing " to ', as JavaScript generally prefers '.

This helps handle that.

R=thakis@chromium.org
BUG=567770

Committed: https://crrev.com/e89e068d8d527239f9de0d7c8350e338ba0db5c1
Cr-Commit-Position: refs/heads/master@{#441292}
==========

[commit-bot: I haz the power, 2017-01-04 02:21:09]

Patchset 2 (id:??) landed as
https://crrev.com/e89e068d8d527239f9de0d7c8350e338ba0db5c1
Cr-Commit-Position: refs/heads/master@{#441292}