sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 00:38:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[241458] fixed problem with NPE when opening editor

Browse source
This commit is contained in:
bkolb 2008-07-21 10:57:07 +00:00
parent 6867b65017
commit 2394f1b6a1
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/impl/ParsetreeUtil.java
View file

@ -21,8 +21,11 @@ import org.eclipse.xtext.parsetree.SyntaxError;
/**
*
* @author koehnlein
* @author bkolb
*/
public class ParsetreeUtil {
private static final char[] separator = System.getProperty( "line.separator" ).toCharArray();
private static void checkArgument(AbstractNodeImpl abstractParserNode) {
int classifierID = abstractParserNode.eClass().getClassifierID();
@ -36,15 +39,11 @@ public class ParsetreeUtil {
checkArgument(_this);
AbstractNode rootContainer = (AbstractNode) EcoreUtil.getRootContainer(_this);
EList<LeafNode> leafNodes = rootContainer.getLeafNodes(_this);
// TODO JK: Why is line set here to 1 instead of 0? (BK)
int line = 1;
for (LeafNode leafNode : leafNodes) {
String text = leafNode.getText();
char[] charArray = text.toCharArray();
for (char c : charArray) {
// TODO handle os specific newlines
if (c == '\n' || c == '\r')
line++;
}
line += countLines(text);
}
return line;
}
@ -52,11 +51,27 @@ public class ParsetreeUtil {
public static int endLine(AbstractNodeImpl _this) {
int line = _this.getLine();
String text = _this.serialize();
line += countLines(text);
return line;
}
private static int countLines(String text) {
int line = 0;
char[] charArray = text.toCharArray();
for (char c : charArray) {
// TODO handle os specific newlines
if (c == '\n' || c == '\r')
line++;
if ( separator.length == 1) {
for (int i = 0; i<charArray.length; i++) {
if (charArray[i] == separator[0]) {
line++;
}
}
} else if(separator.length==2){
for (int i = 0; i<charArray.length; i++) {
if (charArray[i] == separator[0] && charArray.length>=i+1 && charArray[i+1]==separator[1]) {
line++;
}
}
} else {
throw new IllegalArgumentException("Separators with more than two characters are unexpected");
}
return line;
}