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

do not try to merge stubs if version changed: take three, NPE fix

Browse Source
This commit is contained in:
Dmitry Avdeev
2013-11-29 14:06:32 +04:00
parent c2b9a6ecb3
commit 52f086744b
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java
+8 -4
View File
@@ -34,6 +34,7 @@ import com.intellij.util.io.DataExternalizer;
import com.intellij.util.io.IntInlineKeyDescriptor;
import com.intellij.util.io.KeyDescriptor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.*;
import java.util.*;
@@ -301,7 +302,7 @@ public class StubUpdatingIndex extends CustomImplementationFileBasedIndexExtensi
protected void updateWithMap(final int inputId,
@NotNull final Map<Integer, SerializedStubTree> newData,
@NotNull Callable<Collection<Integer>> oldKeysGetter,
FileContent content)
@Nullable FileContent content)
throws StorageException {
checkNameStorage();
@@ -324,9 +325,12 @@ public class StubUpdatingIndex extends CustomImplementationFileBasedIndexExtensi
try {
getWriteLock().lock();
VirtualFile file = content.getFile();
ID stubId = IndexInfrastructure.getStubId(INDEX_ID, file.getFileType());
IndexingStamp.State state = IndexingStamp.getIndexingState(file, stubId);
IndexingStamp.State state = IndexingStamp.State.FILE_CONTENT_CHANGED;
if (content != null) {
VirtualFile file = content.getFile();
ID stubId = IndexInfrastructure.getStubId(INDEX_ID, file.getFileType());
state = IndexingStamp.getIndexingState(file, stubId);
}
final Map<Integer, SerializedStubTree> oldData;
if (state == IndexingStamp.State.INDEX_VERSION_CHANGED) {