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

execute index update in non-cancellable section (fixing notAClass exception)

Browse Source
This commit is contained in:
Eugene Zhuravlev
2009-10-30 14:46:40 +03:00
parent 8982cb360f
commit 9d73ebc991
1 changed files with 73 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java
+73 -44
View File
@@ -1038,51 +1038,66 @@ public class FileBasedIndex implements ApplicationComponent {
}
}
// returns false if doc was not indexed because the file does not fit in scope
private boolean indexUnsavedDocument(final Document document, final ID<?, ?> requestedIndexId, Project project, GlobalSearchScope filter) throws StorageException {
final VirtualFile vFile = myFileDocumentManager.getFile(document);
if (!(vFile instanceof VirtualFileWithId) || !vFile.isValid()) {
return true;
}
if (filter != null && !filter.accept(vFile)) {
return false;
}
final PsiFile dominantContentFile = findDominantPsiForDocument(document, project);
DocumentContent content;
if (dominantContentFile != null && dominantContentFile.getModificationStamp() != document.getModificationStamp()) {
content = new PsiContent(document, dominantContentFile);
}
else {
content = new AuthenticContent(document);
}
final long currentDocStamp = content.getModificationStamp();
if (currentDocStamp != myLastIndexedDocStamps.getAndSet(document, requestedIndexId, currentDocStamp).longValue()) {
final FileContent newFc = new FileContent(vFile, content.getText(), vFile.getCharset());
if (dominantContentFile != null) {
dominantContentFile.putUserData(PsiFileImpl.BUILDING_STUB, true);
newFc.putUserData(PSI_FILE, dominantContentFile);
}
if (content instanceof AuthenticContent) {
newFc.putUserData(EDITOR_HIGHLIGHTER, document instanceof DocumentImpl
? ((DocumentImpl)document).getEditorHighlighterForCachesBuilding() : null);
}
if (getInputFilter(requestedIndexId).acceptInput(vFile)) {
newFc.putUserData(PROJECT, project);
final int inputId = Math.abs(getFileId(vFile));
getIndex(requestedIndexId).update(inputId, newFc);
}
if (dominantContentFile != null) {
dominantContentFile.putUserData(PsiFileImpl.BUILDING_STUB, null);
}
}
// returns false if doc was not indexed because the file does not fit in scope
private boolean indexUnsavedDocument(final Document document, final ID<?, ?> requestedIndexId, final Project project,
GlobalSearchScope filter) throws StorageException {
final VirtualFile vFile = myFileDocumentManager.getFile(document);
if (!(vFile instanceof VirtualFileWithId) || !vFile.isValid()) {
return true;
}
if (filter != null && !filter.accept(vFile)) {
return false;
}
final PsiFile dominantContentFile = findDominantPsiForDocument(document, project);
final DocumentContent content;
if (dominantContentFile != null && dominantContentFile.getModificationStamp() != document.getModificationStamp()) {
content = new PsiContent(document, dominantContentFile);
}
else {
content = new AuthenticContent(document);
}
final long currentDocStamp = content.getModificationStamp();
if (currentDocStamp != myLastIndexedDocStamps.getAndSet(document, requestedIndexId, currentDocStamp).longValue()) {
final Ref<StorageException> exRef = new Ref<StorageException>(null);
ProgressManager.getInstance().executeNonCancelableSection(new Runnable() {
public void run() {
try {
final FileContent newFc = new FileContent(vFile, content.getText(), vFile.getCharset());
if (dominantContentFile != null) {
dominantContentFile.putUserData(PsiFileImpl.BUILDING_STUB, true);
newFc.putUserData(PSI_FILE, dominantContentFile);
}
if (content instanceof AuthenticContent) {
newFc.putUserData(EDITOR_HIGHLIGHTER, document instanceof DocumentImpl
? ((DocumentImpl)document).getEditorHighlighterForCachesBuilding() : null);
}
if (getInputFilter(requestedIndexId).acceptInput(vFile)) {
newFc.putUserData(PROJECT, project);
final int inputId = Math.abs(getFileId(vFile));
getIndex(requestedIndexId).update(inputId, newFc);
}
if (dominantContentFile != null) {
dominantContentFile.putUserData(PsiFileImpl.BUILDING_STUB, null);
}
}
catch (StorageException e) {
exRef.set(e);
}
}
});
final StorageException storageException = exRef.get();
if (storageException != null) {
throw storageException;
}
}
return true;
}
public static final Key<PsiFile> PSI_FILE = new Key<PsiFile>("PSI for stubs");
public static final Key<EditorHighlighter> EDITOR_HIGHLIGHTER = new Key<EditorHighlighter>("Editor");
@@ -1257,7 +1272,21 @@ public class FileBasedIndex implements ApplicationComponent {
final UpdatableIndex<?, ?, FileContent> index = getIndex(indexId);
assert index != null;
index.update(inputId, currentFC);
final Ref<StorageException> exRef = new Ref<StorageException>(null);
ProgressManager.getInstance().executeNonCancelableSection(new Runnable() {
public void run() {
try {
index.update(inputId, currentFC);
}
catch (StorageException e) {
exRef.set(e);
}
}
});
final StorageException storageException = exRef.get();
if (storageException != null) {
throw storageException;
}
ApplicationManager.getApplication().runReadAction(new Runnable() {
public void run() {
if (file.isValid()) {