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

PsiCachedValue: improve readability

Browse Source
This commit is contained in:
peter
2018-10-10 06:44:56 +02:00
parent 2095ffaa11
commit f33d3ddd9a
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/psi/impl/PsiCachedValue.java
+9 -5
View File
@@ -18,7 +18,6 @@ package com.intellij.psi.impl;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectRootModificationTracker;
import com.intellij.openapi.util.Condition;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
@@ -46,12 +45,17 @@ public abstract class PsiCachedValue<T> extends CachedValueBase<T> {
}
private static boolean hasOnlyPhysicalPsiDependencies(@Nullable Object[] dependencies) {
return dependencies != null && dependencies.length > 0 && ContainerUtil.and(dependencies, o -> o instanceof PsiElement && ((PsiElement)o).isValid() && ((PsiElement)o).isPhysical() ||
o instanceof ProjectRootModificationTracker ||
o instanceof PsiModificationTracker ||
return dependencies != null && dependencies.length > 0 &&
ContainerUtil.and(dependencies, PsiCachedValue::anyChangeImpliesPsiCounterChange);
}
private static boolean anyChangeImpliesPsiCounterChange(Object o) {
return o instanceof PsiElement && ((PsiElement)o).isValid() && ((PsiElement)o).isPhysical() ||
o instanceof ProjectRootModificationTracker ||
o instanceof PsiModificationTracker ||
o == PsiModificationTracker.MODIFICATION_COUNT ||
o == PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT ||
o == PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
o == PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT;
}
@Nullable