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

ensure that smart pointers to empty PSI can be restored

Browse Source
This commit is contained in:
peter
2018-01-04 22:49:55 +01:00
parent f24d6d8e0d
commit b4b95184c2
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/psi/impl/smartPointers/SmartPsiElementPointersTest.java
+8
View File
@@ -1066,4 +1066,12 @@ public class SmartPsiElementPointersTest extends CodeInsightTestCase {
}
}
public void testCanRestoreErrorElementsAtSameOffset() throws Exception {
PsiFile file = createFile("a.java", "class Foo { void foo() { if(IdeaLogger.ourErrorsOccurred != null) try(hrow IdeaLogger.ourErrorsOccurred; } }");
for (PsiElement element : SyntaxTraverser.psiTraverser(file)) {
SmartPointerEx<PsiElement> pointer = createPointer(element);
assertEquals(element, pointer.getElement());
}
}
}
platform/core-impl/src/com/intellij/psi/impl/smartPointers/SmartPsiElementPointerImpl.java
+5 -6
View File
@@ -30,9 +30,7 @@ import com.intellij.psi.impl.FreeThreadedFileViewProvider;
import com.intellij.psi.impl.PsiDocumentManagerBase;
import com.intellij.psi.impl.PsiManagerEx;
import com.intellij.psi.impl.source.PsiFileImpl;
import com.intellij.psi.impl.source.tree.ForeignLeafPsiElement;
import com.intellij.psi.tree.IStubFileElementType;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -201,14 +199,15 @@ class SmartPsiElementPointerImpl<E extends PsiElement> implements SmartPointerEx
if (elementRange == null) {
return new HardElementInfo(project, element);
}
if (elementRange.isEmpty() && PsiTreeUtil.findChildOfType(element, ForeignLeafPsiElement.class) != null) {
// PSI built on C-style macro expansions. It has empty ranges, no text, but complicated structure. It can't be reliably
Identikit.ByType identikit = Identikit.fromPsi(element, LanguageUtil.getRootLanguage(element));
if (elementRange.isEmpty() &&
identikit.findPsiElement(containingFile, elementRange.getStartOffset(), elementRange.getEndOffset()) != element) {
// PSI has empty range, no text, but complicated structure (e.g. PSI built on C-style macro expansions). It can't be reliably
// restored by just one offset in a file, so hold it on a hard reference
return new HardElementInfo(project, element);
}
ProperTextRange proper = ProperTextRange.create(elementRange);
return new SelfElementInfo(project, proper, Identikit.fromPsi(element, LanguageUtil.getRootLanguage(element)), containingFile, forInjected);
return new SelfElementInfo(project, proper, identikit, containingFile, forInjected);
}
@Nullable