inline replaceSimpleVariable()

Author: volker

src/main/java/com/inet/sass/parser/LexicalUnitImpl.java

@@ -646,7 +646,7 @@ public static LexicalUnitImpl createOr( String uri, int line, int column ) {
     }
 
     @Override
-    public SassListItem replaceVariables(ScssContext context) {
+    public SassListItem replaceVariables( ScssContext context ) {
         // replace function parameters (if any)
         LexicalUnitImpl lui;
         ActualArgumentList params = this.params;
@@ -660,15 +660,21 @@ public SassListItem replaceVariables(ScssContext context) {
         // replace parameters in string value
         switch( type ) {
             case SCSS_VARIABLE:
-                return lui.replaceSimpleVariable(context);
+                String stringValue = lui.getStringValue();
+                Variable var = context.getVariable( stringValue );
+                if( var != null ) {
+                    return var.getExpr().replaceVariables( context );
+                }
+                varNotResolved = true;
+                break;
             case SCSS_PARENT:
                 BlockNode parentBlock = context.getParentBlock();
-                return parentBlock != null ? new StringItem( parentBlock.getSelectors() ): createNull( uri, line, column );
+                return parentBlock != null ? new StringItem( parentBlock.getSelectors() ) : createNull( uri, line, column );
             default:
                 StringInterpolationSequence s = this.s;
-                if( s!= null && s.containsInterpolation() ) {
-                    StringInterpolationSequence sis = s.replaceVariables(context);
-                    if (sis != s) {
+                if( s != null && s.containsInterpolation() ) {
+                    StringInterpolationSequence sis = s.replaceVariables( context );
+                    if( sis != s ) {
                         LexicalUnitImpl copy = lui.copy();
                         copy.s = sis;
                         return copy;
@@ -678,19 +684,6 @@ public SassListItem replaceVariables(ScssContext context) {
         return lui;
     }
 
-    private SassListItem replaceSimpleVariable(ScssContext context) {
-        if (type == LexicalUnitImpl.SCSS_VARIABLE) {
-            // replace simple variable
-            String stringValue = getStringValue();
-            Variable var = context.getVariable(stringValue);
-            if (var != null) {
-                return var.getExpr().replaceVariables(context);
-            }
-            varNotResolved = true;
-        }
-        return this;
-    }
-
     public boolean containsInterpolation() {
         return s != null && s.containsInterpolation();
     }