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

when retrieving injected smart pointer's file, use faster getPsiRange (and last committed document window) instead of getRange

Browse Source
This commit is contained in:
peter
2015-09-11 13:21:17 +02:00
parent c84211ed0c
commit 2358fa76ea
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/psi/impl/smartPointers/InjectedSelfElementInfo.java
+9 -6
View File
@@ -122,15 +122,18 @@ class InjectedSelfElementInfo extends SmartPointerElementInfo {
private PsiFile getInjectedFileIn(@NotNull final PsiElement hostContext,
@NotNull final PsiFile hostFile,
@NotNull final TextRange rangeInHostFile) {
final InjectedLanguageManager manager = InjectedLanguageManager.getInstance(getProject());
final PsiDocumentManagerBase docManager = (PsiDocumentManagerBase)PsiDocumentManager.getInstance(getProject());
final PsiFile[] result = {null};
final PsiLanguageInjectionHost.InjectedPsiVisitor visitor = new PsiLanguageInjectionHost.InjectedPsiVisitor() {
@Override
public void visit(@NotNull PsiFile injectedPsi, @NotNull List<PsiLanguageInjectionHost.Shred> places) {
TextRange hostRange = manager.injectedToHost(injectedPsi, new TextRange(0, injectedPsi.getTextLength()));
Document document = PsiDocumentManager.getInstance(getProject()).getDocument(injectedPsi);
if (hostRange.contains(rangeInHostFile) && document instanceof DocumentWindow) {
result[0] = injectedPsi;
Document document = docManager.getDocument(injectedPsi);
if (document instanceof DocumentWindow) {
DocumentWindow window = (DocumentWindow)docManager.getLastCommittedDocument(document);
TextRange hostRange = window.injectedToHost(new TextRange(0, injectedPsi.getTextLength()));
if (hostRange.contains(rangeInHostFile)) {
result[0] = injectedPsi;
}
}
}
};
@@ -175,7 +178,7 @@ class InjectedSelfElementInfo extends SmartPointerElementInfo {
PsiElement hostContext = myHostContext.getElement();
if (hostContext == null) return null;
Segment segment = myInjectedFileRangeInHostFile.getRange();
Segment segment = myInjectedFileRangeInHostFile.getPsiRange();
if (segment == null) return null;
final TextRange rangeInHostFile = TextRange.create(segment);
return getInjectedFileIn(hostContext, hostFile, rangeInHostFile);