Merge pull request #1512 from mgreter/bugfix/fixup-error-reporting

Fix error reporting regression

Author: mgreter

src/parser.cpp

@@ -996,7 +996,7 @@ namespace Sass {
       prop->is_delayed(true);
     }
     else {
-      error("invalid property name", pstate);
+      css_error("Invalid CSS", " after ", ": expected \"}\", was ");
     }
     bool is_indented = true;
     const std::string property(lexed);
@@ -2417,34 +2417,48 @@ namespace Sass {
   {
     int max_len = 14;
     const char* pos = peek < optional_spaces >();
+
+    const char* last_pos(pos - 1);
     // backup position to last significant char
-    while (!*pos || Prelexer::is_space(*pos)) -- pos;
+    while ((!*last_pos || Prelexer::is_space(*last_pos)) && last_pos > source) -- last_pos;
+
     bool ellipsis_left = false;
-    const char* pos_left(pos + 1);
-    if (pos_left < source) pos_left = source;
-    while (*pos_left && pos_left > source) {
-      if (pos - pos_left > max_len) {
+    const char* pos_left(last_pos);
+    const char* end_left(last_pos);
+    std::cerr << "we have " << int(*pos_left) << "\n";
+    while (pos_left > source) {
+      if (end_left - pos_left > max_len) {
         ellipsis_left = true;
         break;
       }
+    std::cerr << "back up\n";
+
       const char* prev = pos_left - 1;
       if (*prev == '\r') break;
       if (*prev == '\n') break;
       pos_left = prev;
     }
+    if (pos_left < source) {
+      std::cerr << "NOW RESET\n";
+      pos_left = source;
+    }
+
     bool ellipsis_right = false;
-    const char* pos_right(pos + 1);
-    while (*pos_right && pos_right <= end) {
-      if (pos_right - pos > max_len) {
+    const char* end_right(pos);
+    const char* pos_right(pos);
+    while (end_right <= end) {
+      if (end_right - pos_right > max_len) {
         ellipsis_right = true;
         break;
       }
-      if (*pos_right == '\r') break;
-      if (*pos_right == '\n') break;
-      ++ pos_right;
+      if (*end_right == '\r') break;
+      if (*end_right == '\n') break;
+      ++ end_right;
     }
-    std::string left(pos_left, pos + 1);
-    std::string right(pos + 1, pos_right);
+    if (end_right > end) end_right = end;
+
+    std::string left(pos_left, end_left);
+    std::string right(pos_right, end_right);
     if (ellipsis_left) left = ellipsis + left;
     if (ellipsis_right) right = right + ellipsis;
     // now pass new message to the more generic error function

src/util.cpp

@@ -430,7 +430,7 @@ namespace Sass {
 
       int cp = utf8::next(it, end);
 
-      if (cp == 10) {
+      if (cp == '\n') {
         quoted.push_back('\\');
         quoted.push_back('a');
         // we hope we can remove this flag once we figure out