Fixed bug for bad line numbers

2 files changed, 11 insertions, 5 deletions

diff --git a/scss/src/block_locator.c b/scss/src/block_locator.c
index 86750fc..9fba3cf 100644
--- a/scss/src/block_locator.c
+++ b/scss/src/block_locator.c
@@ -29,9 +29,12 @@ int _strip(char *begin, char *end, int *lineno) {
 	while (begin < end) {
 		c = *begin;
 		if (c == '\0') {
-			if (line == NULL) {
-				line = first;
-				if (lineno) {
+			if (lineno && line == NULL) {
+				line = first - 1;
+				do {
+					c = *++line;
+				} while (c == ' ' || c == '\t' || c == '\n' || c == ';');
+				if (c != '\0') {
 					sscanf(line, "%d", lineno);
 				}
 			}
diff --git a/scss/src/block_locator.py b/scss/src/block_locator.py
index 6c63f22..da455d8 100755
--- a/scss/src/block_locator.py
+++ b/scss/src/block_locator.py
@@ -74,8 +74,11 @@ def _strip_selprop(selprop, lineno):
     # line numbers that might still be there (from multiline selectors)
     _lineno, _sep, selprop = selprop.partition(SEPARATOR)
     if _sep == SEPARATOR:
-        _lineno = _lineno.strip()
-        lineno = int(_lineno) if _lineno else 0
+        _lineno = _lineno.strip(' \t\n;')
+        try:
+            lineno = int(_lineno)
+        except ValueError:
+            pass
     else:
         selprop = _lineno
     selprop = _nl_num_re.sub('\n', selprop)