Merge pull request #4648 from Polymer/4643-kschaaf-binding-whitespace

Fix parsing for argument whitespace. Fixes #4643.
Polymer · Jun 9, 2017 · fdc0eff · fdc0eff
2 parents 07dd436 + a29d887
commit fdc0eff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/mixins/property-effects.html b/lib/mixins/property-effects.html
@@ -782,7 +782,7 @@
   const SQUOTE_STRING = '(?:' + '\'(?:[^\'\\\\]|\\\\.)*\'' + ')';
   const DQUOTE_STRING = '(?:' + '"(?:[^"\\\\]|\\\\.)*"' + ')';
   const STRING = '(?:' + SQUOTE_STRING + '|' + DQUOTE_STRING + ')';
-  const ARGUMENT = '(?:' + IDENT + '|' + NUMBER + '|' +  STRING + '\\s*' + ')';
+  const ARGUMENT = '(?:(' + IDENT + '|' + NUMBER + '|' +  STRING + ')\\s*' + ')';
   const ARGUMENTS = '(?:' + ARGUMENT + '(?:,\\s*' + ARGUMENT + ')*' + ')';
   const ARGUMENT_LIST = '(?:' + '\\(\\s*' +
                                 '(?:' + ARGUMENTS + '?' + ')' +

diff --git a/test/unit/property-effects-elements.html b/test/unit/property-effects-elements.html
@@ -20,7 +20,7 @@
       computed-inline="{{computeInline(value,add, divide)}}"
       computed-inline2="{{computeInline(value, add,divide)}}"
       computed-inline3="{{computeInline(value, add,
-                                        divide)}}"
+                                        divide )}}"
       computedattribute$="{{computeInline(value, add,divide)}}"
       computedattribute2$="{{computeInline(
                                value, add, divide)}}"