forks
/
dlangide
mirror of https://github.com/buggins/dlangide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes in brackets matching

This commit is contained in:
Vadim Lopatin 2015-02-12 11:13:52 +03:00
parent 31a6288225
commit f8ce6dad8f
1 changed files with 11 additions and 6 deletions
src/dlangide/ui
dsourceedit.d

17
src/dlangide/ui/dsourceedit.d
View File

@ -637,14 +637,13 @@ class SimpleDSyntaxHighlighter : SyntaxHighlighter {
//Log.d("Null token returned"); //Log.d("Null token returned");
break; break;
} }
if (token.type == TokenType.EOF) {
//Log.d("EOF token");
break;
}
uint newPos = token.pos - 1; uint newPos = token.pos - 1;
uint newLine = token.line - 1; uint newLine = token.line - 1;
//Log.d("", token.line, ":", token.pos, "\t", tokenLine + 1, ":", tokenPos + 1, "\t", token.toString); //Log.d("", tokenLine + 1, ":", tokenPos + 1, " \t", token.line, ":", token.pos, "\t", token.toString);
if (token.type == TokenType.EOF) {
//Log.d("EOF token");
}
// fill with category // fill with category
for (int i = tokenLine; i <= newLine; i++) { for (int i = tokenLine; i <= newLine; i++) {
@ -691,6 +690,9 @@ class SimpleDSyntaxHighlighter : SyntaxHighlighter {
case TokenType.COMMENT: case TokenType.COMMENT:
category = TokenCategory.Error_InvalidComment; category = TokenCategory.Error_InvalidComment;
break; break;
case TokenType.OP:
category = TokenCategory.Error_InvalidOp;
break;
case TokenType.FLOAT: case TokenType.FLOAT:
case TokenType.INTEGER: case TokenType.INTEGER:
category = TokenCategory.Error_InvalidNumber; category = TokenCategory.Error_InvalidNumber;
@ -707,6 +709,10 @@ class SimpleDSyntaxHighlighter : SyntaxHighlighter {
tokenPos = newPos; tokenPos = newPos;
tokenLine= newLine; tokenLine= newLine;
if (token.type == TokenType.EOF) {
//Log.d("EOF token");
break;
}
} }
} catch (Exception e) { } catch (Exception e) {
Log.e("exception while trying to parse D source", e); Log.e("exception while trying to parse D source", e);
@ -718,4 +724,3 @@ class SimpleDSyntaxHighlighter : SyntaxHighlighter {
Log.d("updateHighlight took ", elapsed, "ms"); Log.d("updateHighlight took ", elapsed, "ms");
} }
} }