From 6e9d9c597b7800f0cff385ddc4cfb7ebacb4e8a7 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 1 Sep 2017 09:50:19 +0200 Subject: [PATCH] PsiFileImpl.mayReloadStub: do cheaper checks first --- .../src/com/intellij/psi/impl/source/PsiFileImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java index 9524ced4bb6d..e00c11fc7a63 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java +++ b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java @@ -763,11 +763,14 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF } private boolean mayReloadStub() { + if (getTreeElement() != null || useStrongRefs()) { + return false; + } StubTreeLoader loader = StubTreeLoader.getInstance(); if (loader != null && loader.isStubReloadingProhibited()) { return false; } - return getTreeElement() == null && !useStrongRefs() && !hasUnbindableCachedPsi(); + return !hasUnbindableCachedPsi(); } private boolean hasUnbindableCachedPsi() {