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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Dmitry Trofimov
2014-08-04 19:14:49 +02:00
parent 57a4278389 b65689baa1
commit 013c98d705
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java
Vendored
+1 -1
View File
@@ -149,7 +149,7 @@ public class IdTableBuilding {
}
private int convertToMask(final WordOccurrence.Kind kind) {
if (kind == null) return UsageSearchContext.ANY;
if (kind == null) return UsageSearchContext.IN_PLAIN_TEXT;
if (kind == WordOccurrence.Kind.CODE) return UsageSearchContext.IN_CODE;
if (kind == WordOccurrence.Kind.COMMENTS) return UsageSearchContext.IN_COMMENTS;
if (kind == WordOccurrence.Kind.LITERALS) return UsageSearchContext.IN_STRINGS;
platform/lang-impl/src/com/intellij/util/indexing/IndexingStamp.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class IndexingStamp {
private static final long UNINDEXED_STAMP = -1L; // we don't store trivial "absent" state
private static final long INDEX_DATA_OUTDATED_STAMP = -2L;
private static final int VERSION = 12;
private static final int VERSION = 13;
private static final ConcurrentHashMap<ID<?, ?>, Long> ourIndexIdToCreationStamp = new ConcurrentHashMap<ID<?, ?>, Long>();
private static volatile long ourLastStamp; // ensure any file index stamp increases