Merge pull request aymerick#2 from alexsaveliev/master

Emitting proper locations for comma-separated declarations

Author: chris-ramon

css/rule.go

@@ -30,6 +30,10 @@ type Selector struct {
 	Column int
 }
 
+func (selector Selector) String() string {
+	return fmt.Sprintf("Selector: %s (%d, %d)", selector.Value, selector.Line, selector.Column)
+}
+
 // Rule represents a parsed CSS rule
 type Rule struct {
 	Kind RuleKind

parser/parser.go

@@ -293,16 +293,45 @@ func (parser *Parser) parseQualifiedRule() (*css.Rule, error) {
 		}
 	}
 
-	for i, s := range strings.Split(result.Prelude, ",") {
-		result.Selectors = append(result.Selectors, &css.Selector{
-			Value:  s,
-			Line:   preludeTokens[i].Line,
-			Column: preludeTokens[i].Column,
-		})
-	}
-	for i, sel := range result.Sel() {
-		result.Selectors[i].Value = strings.TrimSpace(sel)
+	selectorValue := ""
+	selectorStart := true
+	var line int
+	var col int
+
+	for _, tok := range preludeTokens {
+		switch {
+		case tok.Value == ",":
+			{
+				result.Selectors = append(result.Selectors, &css.Selector{
+					Value:  strings.TrimSpace(selectorValue),
+					Line:   line,
+					Column: col,
+				})
+				selectorStart = true
+				selectorValue = ""
+			}
+		case tok.Type != scanner.TokenS:
+			{
+				selectorValue += tok.Value
+				if selectorStart {
+					line = tok.Line
+					col = tok.Column
+					selectorStart = false
+				}
+			}
+		case tok.Type == scanner.TokenS:
+			{
+				if !selectorStart {
+					selectorValue += tok.Value
+				}
+			}
+		}
 	}
+	result.Selectors = append(result.Selectors, &css.Selector{
+		Value:  strings.TrimSpace(selectorValue),
+		Line:   line,
+		Column: col,
+	})
 
 	// log.Printf("[parsed] Rule: %s", result.String())
 

parser/parser_test.go

@@ -151,12 +151,12 @@ body,
 			&css.Selector{
 				Value:  "tr",
 				Line:   1,
-				Column: 6,
+				Column: 8,
 			},
 			&css.Selector{
 				Value:  "td",
 				Line:   1,
-				Column: 7,
+				Column: 12,
 			},
 		},
 		Declarations: []*css.Declaration{
@@ -180,21 +180,22 @@ body,
 			},
 			&css.Selector{
 				Value:  "h1",
-				Line:   5,
-				Column: 5,
+				Line:   6,
+				Column: 3,
 			},
 			&css.Selector{
 				Value:  "h2",
-				Line:   5,
-				Column: 6,
+				Line:   6,
+				Column: 9,
 			},
 			&css.Selector{
 				Value:  "h3",
-				Line:   6,
-				Column: 3,
+				Line:   7,
+				Column: 5,
 			},
 		},
 
+
 		Declarations: []*css.Declaration{
 			{
 				Property: "color",
@@ -715,3 +716,60 @@ func TestParseDeclarations(t *testing.T) {
 		}
 	}
 }
+
+func TestMultipleDeclarations(t *testing.T) {
+	input := `.btn:focus,
+.btn:active:focus,
+.btn.active:focus,
+.btn.focus,
+.btn:active.focus,
+.btn.active.focus {
+}`
+	expectedRule := &css.Rule{
+		Kind:    css.QualifiedRule,
+		Prelude: `.btn:focus,
+.btn:active:focus,
+.btn.active:focus,
+.btn.focus,
+.btn:active.focus,
+.btn.active.focus`,
+		Selectors: []*css.Selector{
+			&css.Selector{
+				Value:  ".btn:focus",
+				Line:   1,
+				Column: 1,
+			},
+			&css.Selector{
+				Value:  ".btn:active:focus",
+				Line:   2,
+				Column: 1,
+			},
+			&css.Selector{
+				Value:  ".btn.active:focus",
+				Line:   3,
+				Column: 1,
+			},
+			&css.Selector{
+				Value:  ".btn.focus",
+				Line:   4,
+				Column: 1,
+			},
+			&css.Selector{
+				Value:  ".btn:active.focus",
+				Line:   5,
+				Column: 1,
+			},
+			&css.Selector{
+				Value:  ".btn.active.focus",
+				Line:   6,
+				Column: 1,
+			},
+		},
+		Declarations: []*css.Declaration{},
+	}
+
+	stylesheet := MustParse(t, input, 1)
+	rule := stylesheet.Rules[0]
+
+	MustEqualRule(t, rule, expectedRule)
+}