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

Java: get rid of resolve in event thread in import optimizer (IDEA-305546)

Browse Source 
and produce more accurate message about imports added/removed

GitOrigin-RevId: acc8f196d10a5b82af025ade711a274cf6ef796e
This commit is contained in:
Bas Leijdekkers
2022-12-23 13:26:27 +00:00
committed by intellij-monorepo-bot
parent b1c4a99070
commit 5be155b243
1 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/lang/java/JavaImportOptimizer.java
+10 -28
View File
@@ -1,9 +1,6 @@
// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.lang.java;
import com.google.common.collect.HashMultiset;
import com.google.common.collect.Multiset;
import com.intellij.ide.scratch.ScratchUtil;
import com.intellij.java.JavaBundle;
import com.intellij.lang.ImportOptimizer;
@@ -18,15 +15,17 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.templateLanguages.TemplateLanguageUtil;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.SlowOperations;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
public class JavaImportOptimizer implements ImportOptimizer {
private static final Logger LOG = Logger.getInstance(JavaImportOptimizer.class);
@Override
@NotNull
public Runnable processFile(@NotNull final PsiFile file) {
public Runnable processFile(@NotNull PsiFile file) {
if (!(file instanceof PsiJavaFile)) {
return EmptyRunnable.getInstance();
}
@@ -40,10 +39,6 @@ public class JavaImportOptimizer implements ImportOptimizer {
@Override
public void run() {
SlowOperations.allowSlowOperations(this::doRun);
}
private void doRun() {
try {
final PsiDocumentManager manager = PsiDocumentManager.getInstance(file.getProject());
final Document document = manager.getDocument(file);
@@ -52,30 +47,17 @@ public class JavaImportOptimizer implements ImportOptimizer {
}
final PsiImportList oldImportList = ((PsiJavaFile)file).getImportList();
assert oldImportList != null;
final Multiset<PsiElement> oldImports = HashMultiset.create();
for (PsiImportStatement statement : oldImportList.getImportStatements()) {
oldImports.add(statement.resolve());
final List<String> oldImports = new ArrayList<>();
for (PsiImportStatementBase statement : oldImportList.getAllImportStatements()) {
oldImports.add(statement.getText());
}
final Multiset<PsiElement> oldStaticImports = HashMultiset.create();
for (PsiImportStaticStatement statement : oldImportList.getImportStaticStatements()) {
oldStaticImports.add(statement.resolve());
}
oldImportList.replace(newImportList);
for (PsiImportStatement statement : newImportList.getImportStatements()) {
if (!oldImports.remove(statement.resolve())) {
for (PsiImportStatementBase statement : newImportList.getAllImportStatements()) {
if (!oldImports.remove(statement.getText())) {
myImportsAdded++;
}
}
myImportsRemoved += oldImports.size();
for (PsiImportStaticStatement statement : newImportList.getImportStaticStatements()) {
if (!oldStaticImports.remove(statement.resolve())) {
myImportsAdded++;
}
}
myImportsRemoved += oldStaticImports.size();
}
catch (IncorrectOperationException e) {
LOG.error(e);