java: cleanup read actions in global references

GitOrigin-RevId: 6774854349186713bb18da82938bd2439d862afb
This commit is contained in:
Bas Leijdekkers
2024-04-25 13:49:32 +00:00
committed by intellij-monorepo-bot
parent 160233e5fc
commit a5ab84ef3d
7 changed files with 25 additions and 28 deletions
@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.reference;
import com.intellij.codeInsight.TestFrameworks;
@@ -6,7 +6,6 @@ import com.intellij.lang.Language;
import com.intellij.lang.jvm.JvmMetaLanguage;
import com.intellij.lang.jvm.JvmModifier;
import com.intellij.lang.jvm.util.JvmInheritanceUtil;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.psi.*;
@@ -312,8 +311,8 @@ public final class RefClassImpl extends RefJavaElementImpl implements RefClass {
@Override
public void accept(final @NotNull RefVisitor visitor) {
if (visitor instanceof RefJavaVisitor) {
ApplicationManager.getApplication().runReadAction(() -> ((RefJavaVisitor)visitor).visitClass(this));
if (visitor instanceof RefJavaVisitor javaVisitor) {
ReadAction.run(() -> javaVisitor.visitClass(this));
}
else {
super.accept(visitor);
@@ -1,7 +1,7 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.reference;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiField;
@@ -139,9 +139,10 @@ public final class RefFieldImpl extends RefJavaElementImpl implements RefField {
@Override
public void accept(@NotNull final RefVisitor visitor) {
if (visitor instanceof RefJavaVisitor) {
ApplicationManager.getApplication().runReadAction(() -> ((RefJavaVisitor)visitor).visitField(this));
} else {
if (visitor instanceof RefJavaVisitor javaVisitor) {
ReadAction.run(() -> javaVisitor.visitField(this));
}
else {
super.accept(visitor);
}
}
@@ -1,7 +1,7 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.reference;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.psi.LambdaUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod;
@@ -110,8 +110,8 @@ public final class RefFunctionalExpressionImpl extends RefJavaElementImpl implem
@Override
public void accept(@NotNull RefVisitor visitor) {
if (visitor instanceof RefJavaVisitor) {
ApplicationManager.getApplication().runReadAction(() -> ((RefJavaVisitor)visitor).visitFunctionalExpression(this));
if (visitor instanceof RefJavaVisitor javaVisitor) {
ReadAction.run(() -> javaVisitor.visitFunctionalExpression(this));
}
else {
super.accept(visitor);
@@ -1,9 +1,9 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.reference;
import com.intellij.codeInsight.daemon.impl.JavaServiceUtil;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -39,7 +39,7 @@ public final class RefJavaModuleImpl extends RefElementImpl implements RefJavaMo
@Override
public void accept(@NotNull RefVisitor visitor) {
if (visitor instanceof RefJavaVisitor javaVisitor) {
ApplicationManager.getApplication().runReadAction(() -> javaVisitor.visitJavaModule(this));
ReadAction.run(() -> javaVisitor.visitJavaModule(this));
}
else {
super.accept(visitor);
@@ -1,9 +1,8 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.reference;
import com.intellij.codeInsight.TestFrameworks;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.util.Predicates;
import com.intellij.openapi.util.text.Strings;
@@ -323,8 +322,8 @@ public sealed class RefMethodImpl extends RefJavaElementImpl implements RefMetho
@Override
public void accept(@NotNull final RefVisitor visitor) {
if (visitor instanceof RefJavaVisitor refJavaVisitor) {
ApplicationManager.getApplication().runReadAction(() -> refJavaVisitor.visitMethod(this));
if (visitor instanceof RefJavaVisitor javaVisitor) {
ReadAction.run(() -> javaVisitor.visitMethod(this));
}
else {
super.accept(visitor);
@@ -1,8 +1,7 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.reference;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.ui.IconManager;
import com.intellij.ui.PlatformIcons;
import org.jetbrains.annotations.NotNull;
@@ -16,8 +15,8 @@ public final class RefPackageImpl extends RefEntityImpl implements RefPackage {
@Override
public void accept(@NotNull final RefVisitor visitor) {
if (visitor instanceof RefJavaVisitor) {
ApplicationManager.getApplication().runReadAction(() -> ((RefJavaVisitor)visitor).visitPackage(this));
if (visitor instanceof RefJavaVisitor javaVisitor) {
ReadAction.run(() -> javaVisitor.visitPackage(this));
} else {
super.accept(visitor);
}
@@ -1,7 +1,6 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.reference;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.text.StringUtil;
@@ -81,8 +80,8 @@ public final class RefParameterImpl extends RefJavaElementImpl implements RefPar
@Override
public void accept(@NotNull final RefVisitor visitor) {
if (visitor instanceof RefJavaVisitor) {
ApplicationManager.getApplication().runReadAction(() -> ((RefJavaVisitor)visitor).visitParameter(this));
if (visitor instanceof RefJavaVisitor javaVisitor) {
ReadAction.run(() -> javaVisitor.visitParameter(this));
}
else {
super.accept(visitor);