Merge pull request aymerick#3 from alexsaveliev/master

Dealing with CSS comments

Author: chris-ramon

css/declaration.go

@@ -18,25 +18,43 @@ func NewDeclaration() *Declaration {
 
 // Returns string representation of the Declaration
 func (decl *Declaration) String() string {
-	return decl.StringWithImportant(true)
+	return decl.Str(false)
+}
+
+// Returns string representation of the Declaration
+func (decl *Declaration) Str(diff bool) string {
+	return decl.stringWithImportant(true, diff)
 }
 
 // StringWithImportant returns string representation with optional !important part
 func (decl *Declaration) StringWithImportant(option bool) string {
+	return decl.stringWithImportant(option, false)
+}
+
+// StringWithImportant returns string representation with optional !important part
+func (decl *Declaration) stringWithImportant(option bool, diff bool) string {
 	result := fmt.Sprintf("%s: %s", decl.Property, decl.Value)
 
 	if option && decl.Important {
 		result += " !important"
 	}
 
-	result += ";"
+	if diff {
+		result += fmt.Sprintf(" (%d, %d)", decl.Line, decl.Column)
+	} else {
+		result += ";"
+	}
 
 	return result
 }
 
 // Equal returns true if both Declarations are equals
 func (decl *Declaration) Equal(other *Declaration) bool {
-	return (decl.Property == other.Property) && (decl.Value == other.Value) && (decl.Important == other.Important)
+	return decl.Property == other.Property &&
+		decl.Value == other.Value &&
+		decl.Important == other.Important &&
+		decl.Line == other.Line &&
+		decl.Column == other.Column
 }
 
 //

css/rule.go

@@ -31,7 +31,15 @@ type Selector struct {
 }
 
 func (selector Selector) String() string {
-	return fmt.Sprintf("Selector: %s (%d, %d)", selector.Value, selector.Line, selector.Column)
+	return selector.str(false)
+}
+
+func (selector Selector) str(diff bool) string {
+	if diff {
+		return fmt.Sprintf("Selector: %s (%d, %d)", selector.Value, selector.Line, selector.Column)
+	} else {
+		return selector.Value
+	}
 }
 
 // Rule represents a parsed CSS rule
@@ -147,7 +155,7 @@ func (rule *Rule) Diff(other *Rule) []string {
 	} else {
 		for i, sel := range rule.Selectors {
 			if sel != other.Selectors[i] {
-				result = append(result, fmt.Sprintf("Selector: \"%s\" | \"%s\"", sel, other.Selectors[i]))
+				result = append(result, fmt.Sprintf("Selector: \"%s\" | \"%s\"", sel.str(true), other.Selectors[i].str(true)))
 			}
 		}
 	}
@@ -157,7 +165,7 @@ func (rule *Rule) Diff(other *Rule) []string {
 	} else {
 		for i, decl := range rule.Declarations {
 			if !decl.Equal(other.Declarations[i]) {
-				result = append(result, fmt.Sprintf("Declaration: \"%s\" | \"%s\"", decl.String(), other.Declarations[i].String()))
+				result = append(result, fmt.Sprintf("Declaration: \"%s\" | \"%s\"", decl.Str(true), other.Declarations[i].Str(true)))
 			}
 		}
 	}
@@ -168,7 +176,7 @@ func (rule *Rule) Diff(other *Rule) []string {
 
 		for i, rule := range rule.Rules {
 			if !rule.Equal(other.Rules[i]) {
-				result = append(result, fmt.Sprintf("Rule: \"%s\" | \"%s\"", rule.String(), other.Rules[i].String()))
+				result = append(result, fmt.Sprintf("Rule: \"%s\" | \"%s\"", rule.str(true), other.Rules[i].str(true)))
 			}
 		}
 	}
@@ -178,6 +186,11 @@ func (rule *Rule) Diff(other *Rule) []string {
 
 // Returns the string representation of a rule
 func (rule *Rule) String() string {
+	return rule.str(false)
+}
+
+// Returns the string representation of a rule
+func (rule *Rule) str(diff bool) string {
 	result := ""
 
 	if rule.Kind == QualifiedRule {
@@ -206,11 +219,11 @@ func (rule *Rule) String() string {
 
 		if rule.EmbedsRules() {
 			for _, subRule := range rule.Rules {
-				result += fmt.Sprintf("%s%s\n", rule.indent(), subRule.String())
+				result += fmt.Sprintf("%s%s\n", rule.indent(), subRule.str(diff))
 			}
 		} else {
 			for _, decl := range rule.Declarations {
-				result += fmt.Sprintf("%s%s\n", rule.indent(), decl.String())
+				result += fmt.Sprintf("%s%s\n", rule.indent(), decl.Str(diff))
 			}
 		}
 
@@ -222,24 +235,12 @@ func (rule *Rule) String() string {
 
 // Returns identation spaces for declarations and rules
 func (rule *Rule) indent() string {
-	result := ""
-
-	for i := 0; i < ((rule.EmbedLevel + 1) * indentSpace); i++ {
-		result += " "
-	}
-
-	return result
+	return strings.Repeat(" ", (rule.EmbedLevel+1)*indentSpace)
 }
 
 // Returns identation spaces for end of block character
 func (rule *Rule) indentEndBlock() string {
-	result := ""
-
-	for i := 0; i < (rule.EmbedLevel * indentSpace); i++ {
-		result += " "
-	}
-
-	return result
+	return strings.Repeat(" ", rule.EmbedLevel*indentSpace)
 }
 
 func (rule *Rule) Sel() []string {

parser/parser.go

@@ -127,7 +127,6 @@ func (parser *Parser) ParseRule() (*css.Rule, error) {
 	if parser.tokenAtKeyword() {
 		return parser.parseAtRule()
 	}
-
 	return parser.parseQualifiedRule()
 }
 
@@ -195,11 +194,16 @@ func (parser *Parser) ParseDeclaration() (*css.Declaration, error) {
 
 			// finished
 			break
-		} else {
+		} else if !parser.tokenIgnorable() {
 			token := parser.shiftToken()
 			curValue += token.Value
 			curColumn = token.Column
 			curLine = token.Line
+		} else {
+			token := parser.shiftToken()
+			if token.Type != scanner.TokenComment {
+				curValue += token.Value
+			}
 		}
 	}
 
@@ -279,6 +283,10 @@ func (parser *Parser) parseQualifiedRule() (*css.Rule, error) {
 
 			result.Declarations = declarations
 
+			// finished
+			break
+		} else if parser.tokenChar(";") {
+			parser.shiftToken()
 			// finished
 			break
 		} else {
@@ -310,7 +318,7 @@ func (parser *Parser) parseQualifiedRule() (*css.Rule, error) {
 				selectorStart = true
 				selectorValue = ""
 			}
-		case tok.Type != scanner.TokenS:
+		case tok.Type != scanner.TokenS && tok.Type != scanner.TokenComment:
 			{
 				selectorValue += tok.Value
 				if selectorStart {