DevTools: improve SCSS parser to correctly handle variable expansions

third_party/WebKit/Source/devtools/front_end/sass/SASSSupport.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 WebInspector.SASSSupport = {}
 
 /**
  * @param {!WebInspector.CSSParserService} cssParserService
  * @param {string} url
  * @param {string} text
@@ skipping 52 matching lines @@
 
 /** @enum {string} */
 WebInspector.SASSSupport.SCSSParserStates = {
     Initial: "Initial",
     PropertyName: "PropertyName",
     PropertyValue: "PropertyValue",
     VariableName: "VariableName",
     VariableValue: "VariableValue",
     MixinName: "MixinName",
     MixinValue: "MixinValue",
-    Media: "Media",
+    Media: "Media"
 }
 
 /**
  * @param {!WebInspector.SASSSupport.ASTDocument} document
  * @param {!WebInspector.TokenizerFactory} tokenizerFactory
  * @return {!{variables: !Array<!WebInspector.SASSSupport.Property>, properties: !Array<!WebInspector.SASSSupport.Property>, mixins: !Array<!WebInspector.SASSSupport.Property>}}
  */
 WebInspector.SASSSupport._innerParseSCSS = function(document, tokenizerFactory)
 {
     var lines = document.text.split("\n");
@@ skipping 48 matching lines @@
                     var value = new WebInspector.SASSSupport.TextNode(document, disabledProperty.value.text, valueRange);
                     var range = new WebInspector.TextRange(lineNumber, column, lineNumber, newColumn);
                     var property = new WebInspector.SASSSupport.Property(document, name, value, range, true);
                     properties.push(property);
                 }
             } else if (tokenType["css-def"] && tokenValue === "@media") {
                 state = States.Media;
             }
             break;
         case States.VariableName:
-            if (tokenValue === ")" && tokenType === UndefTokenType) {
+            if (tokenValue === "}" && tokenType === UndefTokenType) {
+                state = States.Initial;
+            } else if (tokenValue === ")" && tokenType === UndefTokenType) {
                 state = States.Initial;
             } else if (tokenValue === ":" && tokenType === UndefTokenType) {
                 state = States.VariableValue;
                 variableValue = new WebInspector.SASSSupport.TextNode(document, "", WebInspector.TextRange.createFromLocation(lineNumber, newColumn));
             } else if (tokenType !== UndefTokenType) {
                 state = States.Initial;
             }
             break;
         case States.VariableValue:
             if (tokenValue === ";" && tokenType === UndefTokenType) {
@@ skipping 533 matching lines @@
         mapping.set(oldProperty.name, newProperty.name);
         mapping.set(oldProperty.value, newProperty.value);
         if (oldProperty.name.text.trim() !== newProperty.name.text.trim())
             addChange(T.NameChanged, oldRule, newRule, oldPropertyIndex, newPropertyIndex);
         if (oldProperty.value.text.trim() !== newProperty.value.text.trim())
             addChange(T.ValueChanged, oldRule, newRule, oldPropertyIndex, newPropertyIndex);
         if (oldProperty.disabled !== newProperty.disabled)
             addChange(T.PropertyToggled, oldRule, newRule, oldPropertyIndex, newPropertyIndex);
     }
 }