Merge pull request #3841 from Polymer/apply-shim-var-better-fix

Do not insert semicolon when fixing var() syntax

Author: kevinpschaaf

src/lib/apply-shim.html

@@ -219,10 +219,10 @@
   }
 
   // fix shim'd var syntax
-  // var(--a, --b) -> var(--a, var(--b));
+  // var(--a, --b) -> var(--a,var(--b))
   function fixVars(matchText, varA, varB) {
     // if fallback doesn't exist, or isn't a broken variable, abort
-    return 'var(' + varA + ',' + 'var(' + varB + '));';
+    return 'var(' + varA + ',' + 'var(' + varB + '))';
   }
 
   // produce variable consumption at the site of mixin consumption

test/unit/styling-cross-scope-var.html

@@ -502,6 +502,9 @@
         #badFallback {
           border: var(--undefined, --default1);
         }
+        #funkyFallback {
+          color: var(--undefined, var(--undefined, --primary-color));
+        }
       </style>
       <div id="me">x-scope</div>
       <x-keyframes id="keyframes"></x-keyframes>
@@ -535,6 +538,7 @@
       <div id="doubleNestedFallback"></div>
       <div id="cornerFallback"></div>
       <div id="badFallback"></div>
+      <div id="funkyFallback"></div>
     </template>
     <script>
     HTMLImports.whenReady(function() {
@@ -1197,6 +1201,7 @@
 
   test('bad fallback syntax `var(--a, --b)` is corrected', function() {
     assertComputed(styled.$.badFallback, '6px');
+    assertComputed(styled.$.funkyFallback, 'rgb(128, 128, 128)', null, 'color');
   });
 
   test('invalid @media rules do not match', function() {