azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed JetFoldingBuilder to make it able to fold templates in any position.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-02-01 16:16:22 +04:00
parent 7880ff4b61
commit 8d67d794b3
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java
+25 -12
View File
@@ -1,11 +1,12 @@
package org.jetbrains.jet.plugin; package org.jetbrains.jet.plugin;
import com.intellij.lang.ASTNode; import com.intellij.lang.ASTNode;
import com.intellij.lang.folding.FoldingBuilder; import com.intellij.lang.folding.FoldingBuilderEx;
import com.intellij.lang.folding.FoldingDescriptor; import com.intellij.lang.folding.FoldingDescriptor;
import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Document;
import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.jet.JetNodeTypes;
@@ -18,24 +19,29 @@ import java.util.List;
/** /**
* @author yole * @author yole
*/ */
public class JetFoldingBuilder implements FoldingBuilder, DumbAware { public class JetFoldingBuilder extends FoldingBuilderEx implements DumbAware {
@NotNull @NotNull
@Override @Override
public FoldingDescriptor[] buildFoldRegions(@NotNull ASTNode node, @NotNull Document document) { public FoldingDescriptor[] buildFoldRegions(@NotNull PsiElement root, @NotNull Document document, boolean quick) {
List<FoldingDescriptor> descriptors = new ArrayList<FoldingDescriptor>(); List<FoldingDescriptor> descriptors = new ArrayList<FoldingDescriptor>();
appendDescriptors(node, document, descriptors); appendDescriptors(root.getNode(), document, descriptors);
return descriptors.toArray(new FoldingDescriptor[descriptors.size()]); return descriptors.toArray(new FoldingDescriptor[descriptors.size()]);
} }
private void appendDescriptors(ASTNode node, Document document, List<FoldingDescriptor> descriptors) { private static void appendDescriptors(ASTNode node, Document document, List<FoldingDescriptor> descriptors) {
TextRange textRange = node.getTextRange(); TextRange textRange = node.getTextRange();
IElementType type = node.getElementType(); IElementType type = node.getElementType();
if ((type == JetNodeTypes.BLOCK || type == JetNodeTypes.CLASS_BODY) && if ((type == JetNodeTypes.BLOCK || type == JetNodeTypes.CLASS_BODY) &&
!isOneLine(textRange, document)) { !isOneLine(textRange, document)) {
descriptors.add(new FoldingDescriptor(node, textRange)); descriptors.add(new FoldingDescriptor(node, textRange));
} else if (type == JetNodeTypes.PARENTHESIZED && node.getFirstChildNode().getElementType() == JetTokens.IDE_TEMPLATE_START) { } else if (node.getElementType() == JetTokens.IDE_TEMPLATE_START) {
if (node.getTreeParent().getTextLength() > 0) { ASTNode next = node.getTreeNext();
descriptors.add(new FoldingDescriptor(node, textRange, null, Collections.<Object>emptySet(), true)); if (next != null) {
ASTNode nextNext = next.getTreeNext();
if (nextNext.getElementType() == JetTokens.IDE_TEMPLATE_END) {
TextRange range = new TextRange(node.getStartOffset(), nextNext.getStartOffset() + nextNext.getTextLength());
descriptors.add(new FoldingDescriptor(next, range, null, Collections.<Object>emptySet(), true));
}
} }
} }
ASTNode child = node.getFirstChildNode(); ASTNode child = node.getFirstChildNode();
@@ -50,14 +56,21 @@ public class JetFoldingBuilder implements FoldingBuilder, DumbAware {
} }
@Override @Override
public String getPlaceholderText(@NotNull ASTNode astNode) { public String getPlaceholderText(@NotNull ASTNode astNode, @NotNull TextRange range) {
if (astNode.getElementType() == JetNodeTypes.PARENTHESIZED && astNode.getFirstChildNode().getElementType() == JetTokens.IDE_TEMPLATE_START) { ASTNode prev = astNode.getTreePrev();
ASTNode placeholderExpression = astNode.getFirstChildNode().getTreeNext(); ASTNode next = astNode.getTreeNext();
return placeholderExpression.getText(); if (prev != null && next != null && prev.getElementType() == JetTokens.IDE_TEMPLATE_START
&& next.getElementType() == JetTokens.IDE_TEMPLATE_END) {
return astNode.getText();
} }
return "{...}"; return "{...}";
} }
@Override
public String getPlaceholderText(@NotNull ASTNode node) {
return "{...}";
}
@Override @Override
public boolean isCollapsedByDefault(@NotNull ASTNode astNode) { public boolean isCollapsedByDefault(@NotNull ASTNode astNode) {
return false; return false;