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-88640 - assert: FileDocumentManagerImpl.getDocument

Browse Source
This commit is contained in:
Egor.Ushakov
2016-09-21 15:43:33 +03:00
parent c2d7f4eb12
commit e73588bde4
1 changed files with 45 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java
+45 -51
View File
@@ -153,7 +153,7 @@ public abstract class SourcePosition implements Navigatable{
updateData();
PsiElement element = myPsiElementRef != null ? myPsiElementRef.get() : null;
if (element == null) {
element = calcPsiElement();
element = ApplicationManager.getApplication().runReadAction((Computable<PsiElement>)this::calcPsiElement);
myPsiElementRef = new WeakReference<>(element);
return element;
}
@@ -211,70 +211,64 @@ public abstract class SourcePosition implements Navigatable{
protected PsiElement calcPsiElement() {
// currently PsiDocumentManager does not store documents for mirror file, so we store original file
PsiFile psiFile = getFile();
if (!psiFile.isValid()) {
return null;
}
int lineNumber = getLine();
if(lineNumber < 0) {
if (lineNumber < 0) {
return psiFile;
}
final Document document = getDocument(getFile());
Document document = getDocument(psiFile);
if (document == null) {
return null;
}
if (lineNumber >= document.getLineCount()) {
return psiFile;
}
final int startOffset = document.getLineStartOffset(lineNumber);
if(startOffset == -1) {
int startOffset = document.getLineStartOffset(lineNumber);
if (startOffset == -1) {
return null;
}
return ApplicationManager.getApplication().runReadAction(new Computable<PsiElement>() {
@Override
public PsiElement compute() {
PsiElement rootElement = psiFile;
if (!psiFile.isValid()) {
return null;
PsiElement rootElement = psiFile;
List<PsiFile> allFiles = psiFile.getViewProvider().getAllFiles();
if (allFiles.size() > 1) { // jsp & gsp
PsiClassOwner owner = ContainerUtil.findInstance(allFiles, PsiClassOwner.class);
if (owner != null) {
PsiClass[] classes = owner.getClasses();
if (classes.length == 1 && classes[0] instanceof SyntheticElement) {
rootElement = classes[0];
}
List<PsiFile> allFiles = psiFile.getViewProvider().getAllFiles();
if (allFiles.size() > 1) { // jsp & gsp
PsiClassOwner owner = ContainerUtil.findInstance(allFiles, PsiClassOwner.class);
if (owner != null) {
PsiClass[] classes = owner.getClasses();
if (classes.length == 1 && classes[0] instanceof SyntheticElement) {
rootElement = classes[0];
}
}
}
PsiElement element = null;
int offset = getOffset();
while (true) {
final CharSequence charsSequence = document.getCharsSequence();
for (; offset < charsSequence.length(); offset++) {
char c = charsSequence.charAt(offset);
if (c != ' ' && c != '\t') {
break;
}
}
if (offset >= charsSequence.length()) break;
element = rootElement.findElementAt(offset);
if (element instanceof PsiComment) {
offset = element.getTextRange().getEndOffset() + 1;
}
else {
break;
}
}
if (element != null && element.getParent() instanceof PsiForStatement) {
return ((PsiForStatement)element.getParent()).getInitialization();
}
return element;
}
});
}
PsiElement element = null;
int offset = getOffset();
while (true) {
final CharSequence charsSequence = document.getCharsSequence();
for (; offset < charsSequence.length(); offset++) {
char c = charsSequence.charAt(offset);
if (c != ' ' && c != '\t') {
break;
}
}
if (offset >= charsSequence.length()) break;
element = rootElement.findElementAt(offset);
if (element instanceof PsiComment) {
offset = element.getTextRange().getEndOffset() + 1;
}
else {
break;
}
}
if (element != null && element.getParent() instanceof PsiForStatement) {
return ((PsiForStatement)element.getParent()).getInitialization();
}
return element;
}
}
@@ -332,7 +326,7 @@ public abstract class SourcePosition implements Navigatable{
return new SourcePositionCache(psiFile) {
@Override
protected PsiElement calcPsiElement() {
return ApplicationManager.getApplication().runReadAction((Computable<PsiElement>)pointer::getElement);
return pointer.getElement();
}
@Override