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-103406 Folding: Correct processing for multi-root files

Browse Source 
Checking not only base psi file
This commit is contained in:
Denis.Zhdanov
2013-03-19 12:00:18 +04:00
parent 7aadd5876d
commit c574ec0ca3
1 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/folding/impl/OffsetsElementSignatureProvider.java
+25 -21
View File
@@ -16,6 +16,7 @@
package com.intellij.codeInsight.folding.impl;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.FileViewProvider;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
@@ -76,29 +77,32 @@ public class OffsetsElementSignatureProvider extends AbstractElementSignaturePro
}
PsiElement result = null;
PsiElement element = file.findElementAt(start);
if (element != null) {
result = findElement(start, end, index, element, processingInfoStorage);
if (result == null && processingInfoStorage != null) {
processingInfoStorage.append(String.format(
"Failed to find an element by the given offsets. Started by the element '%s' (%s)", element, element.getText()
));
FileViewProvider viewProvider = file.getViewProvider();
for (PsiFile psiFile : viewProvider.getAllFiles()) {
PsiElement element = viewProvider.findElementAt(start, psiFile.getLanguage());
if (element != null) {
result = findElement(start, end, index, element, processingInfoStorage);
if (result != null) {
break;
}
else if (processingInfoStorage != null) {
processingInfoStorage.append(String.format(
"Failed to find an element by the given offsets for language %s. Started by the element '%s' (%s)",
psiFile.getLanguage(), element, element.getText()
));
}
final PsiElement injectedStartElement = InjectedLanguageUtil.findElementAtNoCommit(psiFile, start);
if (processingInfoStorage != null) {
processingInfoStorage.append(String.format(
"Trying to find injected element starting from the '%s'%s%n",
injectedStartElement, injectedStartElement == null ? "" : String.format("(%s)", injectedStartElement.getText())
));
}
if (injectedStartElement != null && injectedStartElement != element) {
result = findElement(start, end, index, injectedStartElement, processingInfoStorage);
}
}
}
if (result == null) {
final PsiElement injectedStartElement = InjectedLanguageUtil.findElementAtNoCommit(file, start);
if (processingInfoStorage != null) {
processingInfoStorage.append(String.format(
"Trying to find injected element starting from the '%s'%s%n",
injectedStartElement, injectedStartElement == null ? "" : String.format("(%s)", injectedStartElement.getText())
));
}
if (injectedStartElement != null && injectedStartElement != element) {
result = findElement(start, end, index, injectedStartElement, processingInfoStorage);
}
}
return result;
}