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

IDEA-61275 Editor: the folded class comment should not be auto-expanded on class declaration editing

Browse Source 
Restricting refinement of PSI element  derived from invalid class header
This commit is contained in:
Denis Zhdanov
2010-11-19 10:48:08 +03:00
parent db06278796
commit 0ac2d5e5ba
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilder.java
+13 -1
View File
@@ -32,6 +32,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
import com.intellij.psi.impl.source.PsiClassReferenceType;
import com.intellij.psi.impl.source.SourceTreeToPsiMap;
import com.intellij.psi.impl.source.jsp.jspJava.JspHolderMethod;
import com.intellij.psi.impl.source.tree.JavaDocElementType;
import com.intellij.psi.javadoc.PsiDocComment;
import com.intellij.psi.util.PropertyUtil;
import com.intellij.psi.util.PsiTreeUtil;
@@ -79,8 +80,19 @@ public class JavaFoldingBuilder extends FoldingBuilderEx implements DumbAware {
if (range != null && range.getLength() > 1 && document.getLineNumber(range.getEndOffset()) > document.getLineNumber(range.getStartOffset())) {
PsiElement anchorElementToUse = file;
PsiElement candidate = file.getFirstChild();
// There experienced the following problem situation:
// 1. There is a collapsed class-level javadoc;
// 2. User starts typing at class definition line (e.g. we had definition like 'public class Test' and user starts
// typing 'abstract' between 'public' and 'class');
// 3. Collapsed class-level javadoc automatically expanded. That happened because PSI structure became invalid (because
// class definition line at start looks like 'public aclass Test');
// So, our point is to preserve fold descriptor referencing javadoc PSI element.
if (candidate != null && candidate.getTextRange().equals(range)) {
anchorElementToUse = candidate;
ASTNode node = candidate.getNode();
if (node != null && node.getElementType() == JavaDocElementType.DOC_COMMENT) {
anchorElementToUse = candidate;
}
}
result.add(new FoldingDescriptor(anchorElementToUse, range));
}