Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct syntax error ranges

Browse Source
This commit is contained in:
BoykoAlex
2016-09-27 15:37:17 -04:00
parent d50d59c9b6
commit 0ef54104be
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/properties/antlr/parser/AntlrParser.java
View File

@@ -132,12 +132,22 @@ public class AntlrParser implements Parser {
@Override
public int getOffset() {
return token.getStartIndex();
if (token.getStartIndex() >= token.getStopIndex()) {
// No range? Make error span the whole line then
return token.getStartIndex() - token.getCharPositionInLine();
} else {
return token.getStartIndex();
}
}
@Override
public int getLength() {
return token.getStopIndex() - token.getStartIndex();
if (token.getStartIndex() >= token.getStopIndex()) {
// No range? Make error span the whole line then
return token.getCharPositionInLine();
} else {
return token.getStopIndex() - token.getStartIndex();
}
}
};

9
vscode-extensions/commons/java-properties/src/test/java/org/springframework/ide/vscode/properties/parser/test/PropertiesAntlrParserTest.java
View File

@@ -191,7 +191,8 @@ public class PropertiesAntlrParserTest {
assertEquals(1, results.ast.getAllNodes().size());
Problem syntaxError = results.syntaxErrors.get(0);
assertEquals(text.length(), syntaxError.getOffset());
assertEquals(0, syntaxError.getOffset());
assertEquals(text.length(), syntaxError.getLength());
}
@Test
@@ -214,9 +215,11 @@ public class PropertiesAntlrParserTest {
// Test errors
Problem syntaxError1 = results.syntaxErrors.get(0);
assertEquals(11, syntaxError1.getOffset());
assertEquals(0, syntaxError1.getOffset());
assertEquals(11, syntaxError1.getLength());
Problem syntaxError2 = results.syntaxErrors.get(1);
assertEquals(text.length(), syntaxError2.getOffset());
assertEquals(22, syntaxError2.getOffset());
assertEquals(6, syntaxError2.getLength());
}
}