mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
IDEA-72522: Namespace renaming fails in jspx ans tagx files: jspx lexer fixed
This commit is contained in:
@@ -184,6 +184,7 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
|
||||
|
||||
myLexer.start(myText);
|
||||
int i = 0;
|
||||
int offset = 0;
|
||||
while (true) {
|
||||
ProgressManager.checkCanceled();
|
||||
IElementType type = myLexer.getTokenType();
|
||||
@@ -192,7 +193,11 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
|
||||
if (i >= myLexTypes.length - 1) {
|
||||
resizeLexemes(i * 3 / 2);
|
||||
}
|
||||
myLexStarts[i] = myLexer.getTokenStart();
|
||||
int tokenStart = myLexer.getTokenStart();
|
||||
if (tokenStart < offset) {
|
||||
LOG.error("Token sequence broken: '" + myLexer.getTokenText() + "'");
|
||||
}
|
||||
myLexStarts[i] = offset = tokenStart;
|
||||
myLexTypes[i] = type;
|
||||
i++;
|
||||
myLexer.advance();
|
||||
@@ -1456,6 +1461,7 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
|
||||
catch(NoSuchFieldException e) {
|
||||
// IBM J9 does not have the field
|
||||
f = null;
|
||||
|
||||
}
|
||||
ourElementDataField = f;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user