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

Refactoring: common functionality moved from HAML|Slim parsers to IndentationParser

Browse Source
This commit is contained in:
Oleg Sukhodolsky
2012-07-12 15:01:41 +04:00
parent 726e76f7e9
commit 7fbb8ad044
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/indentation/IndentationParser.java
+19 -14
View File
@@ -12,21 +12,31 @@ import org.jetbrains.annotations.NotNull;
* @author oleg
*/
public abstract class IndentationParser implements PsiParser {
@NotNull
private final IElementType myEolTokenType;
@NotNull
private final IElementType myIndentTokenType;
@NotNull
private final IElementType myBlockElementType;
@NotNull
private final IElementType myDocumentType;
public IndentationParser(final IElementType blockElementType,
final IElementType eolTokenType,
final IElementType indentTokenType) {
public IndentationParser(
@NotNull IElementType documentType,
@NotNull final IElementType blockElementType,
@NotNull final IElementType eolTokenType,
@NotNull final IElementType indentTokenType)
{
myDocumentType = documentType;
myBlockElementType = blockElementType;
myEolTokenType = eolTokenType;
myIndentTokenType = indentTokenType;
}
@NotNull
public ASTNode parse(final IElementType root, final PsiBuilder builder) {
public final ASTNode parse(final IElementType root, final PsiBuilder builder) {
final PsiBuilder.Marker fileMarker = builder.mark();
final PsiBuilder.Marker documentMarker = builder.mark();
final Stack<Pair<Integer, PsiBuilder.Marker>> stack = new Stack<Pair<Integer, PsiBuilder.Marker>>();
stack.push(Pair.create(0, builder.mark()));
@@ -61,7 +71,7 @@ public abstract class IndentationParser implements PsiParser {
startLineMarker = null;
}
// Close indentation blocks
while (!stack.isEmpty() && currentIndent < stack.peek().first){
while (!stack.isEmpty() && currentIndent < stack.peek().first) {
stack.pop().second.done(myBlockElementType);
}
@@ -93,23 +103,18 @@ public abstract class IndentationParser implements PsiParser {
stack.pop().second.done(myBlockElementType);
}
return buildTree(fileMarker, builder, root);
}
protected ASTNode buildTree(final PsiBuilder.Marker fileMarker,
final PsiBuilder builder,
final IElementType root) {
documentMarker.done(myDocumentType);
fileMarker.done(root);
return builder.getTreeBuilt();
}
protected void advanceLexer(PsiBuilder builder) {
protected void advanceLexer(@NotNull PsiBuilder builder) {
builder.advanceLexer();
}
private void passEOLsAndIndents(final PsiBuilder builder) {
private void passEOLsAndIndents(@NotNull final PsiBuilder builder) {
IElementType tokenType = builder.getTokenType();
while (tokenType == myEolTokenType || tokenType == myIndentTokenType){
while (tokenType == myEolTokenType || tokenType == myIndentTokenType) {
builder.advanceLexer();
tokenType = builder.getTokenType();
}