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

IOOBE

Browse Source
This commit is contained in:
Alexey Kudravtsev
2012-01-26 13:24:51 +04:00
parent 50bffafe2b
commit 2a554d19e0
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/psi/impl/smartPointers/InjectedSelfElementInfo.java
+1 -2
View File
@@ -86,8 +86,7 @@ class InjectedSelfElementInfo extends SelfElementInfo {
PsiDocumentManager documentManager = PsiDocumentManager.getInstance(hostFile.getProject());
Document document = documentManager.getDocument(hostFile);
if (document != null && documentManager.isUncommited(document)) {
List<DocumentWindow> documents = InjectedLanguageUtil.getCachedInjectedDocuments(hostFile);
for (DocumentWindow documentWindow : documents) {
for (DocumentWindow documentWindow : InjectedLanguageUtil.getCachedInjectedDocuments(hostFile)) {
PsiFile injected = documentManager.getPsiFile(documentWindow);
if (injected != null) {
visitor.visit(injected, Collections.<PsiLanguageInjectionHost.Shred>emptyList());
platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java
+11 -7
View File
@@ -143,7 +143,9 @@ public class InjectedLanguageManagerImpl extends InjectedLanguageManager impleme
RangeMarker rangeMarker = documentWindow.getHostRanges()[0];
PsiElement element = rangeMarker.isValid() ? hostPsiFile.findElementAt(rangeMarker.getStartOffset()) : null;
if (element == null) {
injected.remove(documentWindow);
synchronized (PsiLock.LOCK) {
injected.remove(documentWindow);
}
return true;
}
final DocumentWindow[] stillInjectedDocument = {null};
@@ -155,12 +157,14 @@ public class InjectedLanguageManagerImpl extends InjectedLanguageManager impleme
PsiDocumentManagerImpl.checkConsistency(injectedPsi, stillInjectedDocument[0]);
}
});
if (stillInjectedDocument[0] == null) {
injected.remove(documentWindow);
}
else if (stillInjectedDocument[0] != documentWindow) {
injected.remove(documentWindow);
injected.add(stillInjectedDocument[0]);
synchronized (PsiLock.LOCK) {
if (stillInjectedDocument[0] == null) {
injected.remove(documentWindow);
}
else if (stillInjectedDocument[0] != documentWindow) {
injected.remove(documentWindow);
injected.add(stillInjectedDocument[0]);
}
}
return true;
platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/MultiHostRegistrarImpl.java
+1
View File
@@ -385,6 +385,7 @@ public class MultiHostRegistrarImpl implements MultiHostRegistrar, ModificationT
TreeUtil.clearCaches((TreeElement)parsedNode);
}
// under com.intellij.psi.PsiLock.LOCK
private static PsiFile registerDocument(final DocumentWindowImpl documentWindow,
final PsiFile injectedPsi,
final Place shreds,