Fix caret position for "unexpected indent"

msimacek · msimacek · commit b47b71a5a39c · 2020-06-18T11:12:09.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/Python3.g4 b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/Python3.g4
@@ -1807,7 +1807,7 @@ NEWLINE
            this.emit(createIndentError(Python3Parser.TAB_ERROR));
          }
          indents.push(indent);
-         emit(commonToken(Python3Parser.INDENT, getText()));
+         emit(commonToken(Python3Parser.INDENT, ""));
        }
        else {
          // Possibly emit more than 1 DEDENT token.
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/Python3Lexer.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/Python3Lexer.java
@@ -419,7 +419,7 @@ private void NEWLINE_action(RuleContext _localctx, int actionIndex) {
 			       }
 			       else if (indent > previous) {
 			         indents.push(indent);
-			         emit(commonToken(Python3Parser.INDENT, getText()));
+			         emit(commonToken(Python3Parser.INDENT, ""));
 			       }
 			       else {
 			         // Possibly emit more than 1 DEDENT token.

Original file line number	Diff line number	Diff line change
`@@ -1807,7 +1807,7 @@ NEWLINE`
`1807`	`1807`	`this.emit(createIndentError(Python3Parser.TAB_ERROR));`
`1808`	`1808`	`}`
`1809`	`1809`	`indents.push(indent);`
`1810`		`- emit(commonToken(Python3Parser.INDENT, getText()));`
	`1810`	`+ emit(commonToken(Python3Parser.INDENT, ""));`
`1811`	`1811`	`}`
`1812`	`1812`	`else {`
`1813`	`1813`	`// Possibly emit more than 1 DEDENT token.`
Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ private void NEWLINE_action(RuleContext _localctx, int actionIndex) {`
`419`	`419`	`}`
`420`	`420`	`else if (indent > previous) {`
`421`	`421`	`indents.push(indent);`
`422`		`- emit(commonToken(Python3Parser.INDENT, getText()));`
	`422`	`+ emit(commonToken(Python3Parser.INDENT, ""));`
`423`	`423`	`}`
`424`	`424`	`else {`
`425`	`425`	`// Possibly emit more than 1 DEDENT token.`