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

EA-14331

Browse Source
This commit is contained in:
Alexey Kudravtsev
2011-04-18 17:06:16 +04:00
parent 6ea3392196
commit 65ca67c7d7
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/lang/folding/FoldingDescriptor.java
+5
View File
@@ -147,4 +147,9 @@ public class FoldingDescriptor {
public boolean isNonExpandable() {
return myNeverExpands;
}
@Override
public String toString() {
return myRange + " for AST: " + myElement;
}
}
platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUpdate.java
+11 -1
View File
@@ -29,6 +29,7 @@ import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
import com.intellij.psi.util.CachedValueProvider;
@@ -147,13 +148,22 @@ public class FoldingUpdate {
};
}
private static void getFoldingsFor(PsiFile file, Document document, Map<PsiElement, FoldingDescriptor> elementsToFoldMap, boolean quick) {
private static void getFoldingsFor(@NotNull PsiFile file, @NotNull Document document, @NotNull Map<PsiElement, FoldingDescriptor> elementsToFoldMap, boolean quick) {
final FileViewProvider viewProvider = file.getViewProvider();
for (final Language language : viewProvider.getLanguages()) {
final PsiFile psi = viewProvider.getPsi(language);
final FoldingBuilder foldingBuilder = LanguageFolding.INSTANCE.forLanguage(language);
if (psi != null && foldingBuilder != null) {
TextRange docRange = TextRange.from(0, document.getTextLength());
for (FoldingDescriptor descriptor : LanguageFolding.buildFoldingDescriptors(foldingBuilder, psi, document, quick)) {
TextRange range = descriptor.getRange();
if (!docRange.contains(range)) {
LOG.error("Folding descriptor " + descriptor +
" made by " + foldingBuilder +
" for " +language +
" and called on file " + psi +
" is outside document range: " + docRange);
}
elementsToFoldMap.put(descriptor.getElement().getPsi(), descriptor);
}
}