Merge pull request #2285 from mgreter/bugfix/issue-2081

mgreter · web-flow · commit 01074d80eb82 · 2017-01-05T09:08:27.000+01:00
Fix error case with superfluous data in interpolates
diff --git a/src/parser.cpp b/src/parser.cpp
@@ -1644,8 +1644,9 @@ namespace Sass {
         }
         ex->is_interpolant(true);
         schema->append(ex);
-        // ToDo: no error check here?
-        lex < exactly < rbrace > >();
+        if (!lex < exactly < rbrace > >()) {
+          css_error("Invalid CSS", " after ", ": expected \"}\", was ");
+        }
       }
       // lex some string constants or other valid token
       // Note: [-+] chars are left over from i.e. `#{3}+3`

Original file line number	Diff line number	Diff line change
`@@ -1644,8 +1644,9 @@ namespace Sass {`
`1644`	`1644`	`}`
`1645`	`1645`	`ex->is_interpolant(true);`
`1646`	`1646`	`schema->append(ex);`
`1647`		`- // ToDo: no error check here?`
`1648`		`- lex < exactly < rbrace > >();`
	`1647`	`+ if (!lex < exactly < rbrace > >()) {`
	`1648`	`+ css_error("Invalid CSS", " after ", ": expected \"}\", was ");`
	`1649`	`+ }`
`1649`	`1650`	`}`
`1650`	`1651`	`// lex some string constants or other valid token`
`1651`	`1652`	// Note: [-+] chars are left over from i.e. `#{3}+3`