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

fix tokenizer keyword detection - #269

This commit is contained in:
Vadim Lopatin 2017-09-11 13:35:19 +03:00
parent 1b4718cf14
commit b20e12a326
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ddc/lexer/tokenizer.d
View File

@ -883,7 +883,8 @@ public Keyword findKeyword(Keyword start, Keyword end, dchar * name, int len, re
}
}
if (found) {
if (s.length == len - 1 || !isIdentMiddleChar(name[s.length - 1])) {
//if (s.length == len - 1 || !isIdentMiddleChar(name[s.length - 1])) {
if (s.length == len + 1 || !isIdentMiddleChar(name[s.length - 1])) {
pos += s.length - 1;
return i;
}
@ -3439,5 +3440,8 @@ TEST"
checkReal(25.67e-5f, 0),
checkEOF()
]);
// strange keyword detection: `fork;` or `ind;` keyword in beginning of ident is highlighted
testTokenizer("fork;", [checkIdent("fork"),checkOp(OpCode.SEMICOLON),checkEOF()]);
}