MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

RUBY-9467: IndentationParser should be prepared for cases when we do not have EOL after indentation.

Browse Source 
#RUBY-9467 fixed
This commit is contained in:
Oleg Sukhodolsky
2012-05-25 17:08:21 +04:00
parent 568378b22d
commit a3d55029f3
1 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/indentation/IndentationParser.java
+30 -27
View File
@@ -40,43 +40,46 @@ public abstract class IndentationParser implements PsiParser {
// EOL
if (type == myEolTokenType) {
// Handle variant with several EOLs
if (startLineMarker == null){
if (startLineMarker == null) {
startLineMarker = builder.mark();
}
eolSeen = true;
} else
// Indent
{
if (type == myIndentTokenType){
}
else {
if (type == myIndentTokenType) {
//noinspection ConstantConditions
currentIndent = builder.getTokenText().length();
} else
if (eolSeen) {
if (startLineMarker != null){
startLineMarker.rollbackTo();
startLineMarker = null;
}
else {
if (!eolSeen && !stack.isEmpty() && currentIndent > 0 && currentIndent < stack.peek().first) {
// sometimes we do not have EOL between indents
eolSeen = true;
}
// Close indentation blocks
while (!stack.isEmpty() && currentIndent < stack.peek().first){
stack.pop().second.done(myBlockElementType);
}
if (!stack.isEmpty()) {
final Pair<Integer, PsiBuilder.Marker> pair = stack.peek();
if (currentIndent == pair.first) {
if (eolSeen) {
if (startLineMarker != null) {
startLineMarker.rollbackTo();
startLineMarker = null;
}
// Close indentation blocks
while (!stack.isEmpty() && currentIndent < stack.peek().first){
stack.pop().second.done(myBlockElementType);
passEOLsAndIndents(builder);
stack.push(Pair.create(currentIndent, builder.mark()));
}
if (currentIndent > pair.first) {
passEOLsAndIndents(builder);
stack.push(Pair.create(currentIndent, builder.mark()));
if (!stack.isEmpty()) {
final Pair<Integer, PsiBuilder.Marker> pair = stack.peek();
if (currentIndent == pair.first) {
stack.pop().second.done(myBlockElementType);
passEOLsAndIndents(builder);
stack.push(Pair.create(currentIndent, builder.mark()));
}
if (currentIndent > pair.first) {
passEOLsAndIndents(builder);
stack.push(Pair.create(currentIndent, builder.mark()));
}
}
eolSeen = false;
currentIndent = 0;
}
eolSeen = false;
currentIndent = 0;
}
}
advanceLexer(builder);