From eddbe4dc7ad818e9274efa5525487299695b3d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Thu, 25 Apr 2019 16:20:45 +0200 Subject: [PATCH] [devkit] optimize imports GitOrigin-RevId: dea0d90c5c65867670ded9c9061eaf7e25bdd6e4 --- plugins/devkit/devkit-core/src/dom/Action.java | 1 - .../devkit-core/src/dom/DependencyConfigFileConverter.java | 1 - .../devkit/devkit-core/src/dom/generator/NamespaceDesc.java | 2 +- .../src/dom/ide/PluginDescriptorEditorTabTitleProvider.kt | 1 - .../devkit-core/src/dom/impl/LanguageResolvingConverter.java | 1 - .../src/inspections/ComponentModuleRegistrationChecker.kt | 1 - .../src/inspections/DescriptionNotFoundInspectionBase.java | 2 +- .../src/inspections/UniqueToolbarIdInspection.java | 2 -- .../inspections/internal/UsePrimitiveTypesInspection.java | 1 - .../devkit-core/src/module/PluginDescriptorConstants.java | 2 +- .../devkit-core/src/navigation/LineMarkerInfoHelper.java | 1 - .../src/references/IconsReferencesContributor.java | 1 - .../src/testAssistant/TestDataHighlightingPassFactory.java | 1 - .../src/testAssistant/TestDataReferenceCollector.java | 1 - .../devkit/devkit-core/src/themes/ThemeEditorToolbar.java | 1 - plugins/devkit/devkit-core/src/util/ActionData.java | 2 +- .../IntentionDescriptionNotFoundInspectionTest.java | 1 - .../devkit/model/impl/JpsDevKitModelSerializerExtension.java | 5 ++--- 18 files changed, 6 insertions(+), 21 deletions(-) diff --git a/plugins/devkit/devkit-core/src/dom/Action.java b/plugins/devkit/devkit-core/src/dom/Action.java index 2ca43979223f..90dd6e8399bc 100644 --- a/plugins/devkit/devkit-core/src/dom/Action.java +++ b/plugins/devkit/devkit-core/src/dom/Action.java @@ -20,7 +20,6 @@ import com.intellij.ide.presentation.Presentation; import com.intellij.psi.PsiClass; import com.intellij.util.xml.*; import org.jetbrains.annotations.NotNull; -import org.jetbrains.idea.devkit.dom.impl.ActionOrGroupResolveConverter; import org.jetbrains.idea.devkit.dom.impl.PluginPsiClassConverter; import java.util.List; diff --git a/plugins/devkit/devkit-core/src/dom/DependencyConfigFileConverter.java b/plugins/devkit/devkit-core/src/dom/DependencyConfigFileConverter.java index d028e341b7e2..f9f510b52f5a 100644 --- a/plugins/devkit/devkit-core/src/dom/DependencyConfigFileConverter.java +++ b/plugins/devkit/devkit-core/src/dom/DependencyConfigFileConverter.java @@ -33,7 +33,6 @@ import com.intellij.psi.PsiReference; import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceSet; import com.intellij.psi.xml.XmlElement; import com.intellij.psi.xml.XmlFile; -import com.intellij.util.Processor; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.xml.ConvertContext; import com.intellij.util.xml.DomFileElement; diff --git a/plugins/devkit/devkit-core/src/dom/generator/NamespaceDesc.java b/plugins/devkit/devkit-core/src/dom/generator/NamespaceDesc.java index 36dd5622a62e..18b197c18ad3 100644 --- a/plugins/devkit/devkit-core/src/dom/generator/NamespaceDesc.java +++ b/plugins/devkit/devkit-core/src/dom/generator/NamespaceDesc.java @@ -22,8 +22,8 @@ */ package org.jetbrains.idea.devkit.dom.generator; -import java.util.Map; import java.util.HashMap; +import java.util.Map; /** * @author Konstantin Bulenkov diff --git a/plugins/devkit/devkit-core/src/dom/ide/PluginDescriptorEditorTabTitleProvider.kt b/plugins/devkit/devkit-core/src/dom/ide/PluginDescriptorEditorTabTitleProvider.kt index 8f04ceee6db5..8550c98931be 100644 --- a/plugins/devkit/devkit-core/src/dom/ide/PluginDescriptorEditorTabTitleProvider.kt +++ b/plugins/devkit/devkit-core/src/dom/ide/PluginDescriptorEditorTabTitleProvider.kt @@ -8,7 +8,6 @@ import com.intellij.psi.PsiManager import com.intellij.psi.xml.XmlFile import org.jetbrains.idea.devkit.module.PluginDescriptorConstants import org.jetbrains.idea.devkit.util.DescriptorUtil -import org.jetbrains.idea.devkit.util.PsiUtil class PluginDescriptorEditorTabTitleProvider : EditorTabTitleProvider { diff --git a/plugins/devkit/devkit-core/src/dom/impl/LanguageResolvingConverter.java b/plugins/devkit/devkit-core/src/dom/impl/LanguageResolvingConverter.java index 824ce85296ac..85be3eb94503 100644 --- a/plugins/devkit/devkit-core/src/dom/impl/LanguageResolvingConverter.java +++ b/plugins/devkit/devkit-core/src/dom/impl/LanguageResolvingConverter.java @@ -17,7 +17,6 @@ package org.jetbrains.idea.devkit.dom.impl; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementBuilder; -import com.intellij.openapi.util.Condition; import com.intellij.psi.PsiElement; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.xml.ConvertContext; diff --git a/plugins/devkit/devkit-core/src/inspections/ComponentModuleRegistrationChecker.kt b/plugins/devkit/devkit-core/src/inspections/ComponentModuleRegistrationChecker.kt index 0924591141f0..f8b566a728f4 100644 --- a/plugins/devkit/devkit-core/src/inspections/ComponentModuleRegistrationChecker.kt +++ b/plugins/devkit/devkit-core/src/inspections/ComponentModuleRegistrationChecker.kt @@ -8,7 +8,6 @@ import com.intellij.codeInspection.ProblemDescriptor import com.intellij.codeInspection.ProblemHighlightType import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.extensions.ExtensionPointName -import com.intellij.openapi.fileTypes.FileTypeExtensionPoint import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.module.ModuleUtilCore diff --git a/plugins/devkit/devkit-core/src/inspections/DescriptionNotFoundInspectionBase.java b/plugins/devkit/devkit-core/src/inspections/DescriptionNotFoundInspectionBase.java index bd92c0d60e16..52a2f5efdbf6 100644 --- a/plugins/devkit/devkit-core/src/inspections/DescriptionNotFoundInspectionBase.java +++ b/plugins/devkit/devkit-core/src/inspections/DescriptionNotFoundInspectionBase.java @@ -27,7 +27,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.devkit.inspections.quickfix.CreateHtmlDescriptionFix; -import org.jetbrains.idea.devkit.util.*; +import org.jetbrains.idea.devkit.util.PsiUtil; abstract class DescriptionNotFoundInspectionBase extends DevKitInspectionBase { diff --git a/plugins/devkit/devkit-core/src/inspections/UniqueToolbarIdInspection.java b/plugins/devkit/devkit-core/src/inspections/UniqueToolbarIdInspection.java index e86eb26ad62b..56ef54399ff8 100644 --- a/plugins/devkit/devkit-core/src/inspections/UniqueToolbarIdInspection.java +++ b/plugins/devkit/devkit-core/src/inspections/UniqueToolbarIdInspection.java @@ -18,9 +18,7 @@ package org.jetbrains.idea.devkit.inspections; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; -import com.intellij.psi.util.PsiTypesUtil; import org.jetbrains.annotations.NotNull; /** diff --git a/plugins/devkit/devkit-core/src/inspections/internal/UsePrimitiveTypesInspection.java b/plugins/devkit/devkit-core/src/inspections/internal/UsePrimitiveTypesInspection.java index 939d01289f86..c6f481efc096 100644 --- a/plugins/devkit/devkit-core/src/inspections/internal/UsePrimitiveTypesInspection.java +++ b/plugins/devkit/devkit-core/src/inspections/internal/UsePrimitiveTypesInspection.java @@ -6,7 +6,6 @@ package org.jetbrains.idea.devkit.inspections.internal; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.lang.jvm.JvmModifier; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; diff --git a/plugins/devkit/devkit-core/src/module/PluginDescriptorConstants.java b/plugins/devkit/devkit-core/src/module/PluginDescriptorConstants.java index 08b70ab68508..1d9370ebdea9 100644 --- a/plugins/devkit/devkit-core/src/module/PluginDescriptorConstants.java +++ b/plugins/devkit/devkit-core/src/module/PluginDescriptorConstants.java @@ -15,8 +15,8 @@ */ package org.jetbrains.idea.devkit.module; -import com.intellij.util.descriptors.ConfigFileVersion; import com.intellij.util.descriptors.ConfigFileMetaData; +import com.intellij.util.descriptors.ConfigFileVersion; import org.jetbrains.annotations.NonNls; import org.jetbrains.idea.devkit.DevKitBundle; diff --git a/plugins/devkit/devkit-core/src/navigation/LineMarkerInfoHelper.java b/plugins/devkit/devkit-core/src/navigation/LineMarkerInfoHelper.java index 7a4951bf3f81..348b07c22f9b 100644 --- a/plugins/devkit/devkit-core/src/navigation/LineMarkerInfoHelper.java +++ b/plugins/devkit/devkit-core/src/navigation/LineMarkerInfoHelper.java @@ -23,7 +23,6 @@ import org.jetbrains.idea.devkit.util.PointableCandidate; import java.text.MessageFormat; import java.util.Collection; -import java.util.Collections; import java.util.List; class LineMarkerInfoHelper { diff --git a/plugins/devkit/devkit-core/src/references/IconsReferencesContributor.java b/plugins/devkit/devkit-core/src/references/IconsReferencesContributor.java index d2eb8df59cc1..3d952f6e3531 100644 --- a/plugins/devkit/devkit-core/src/references/IconsReferencesContributor.java +++ b/plugins/devkit/devkit-core/src/references/IconsReferencesContributor.java @@ -44,7 +44,6 @@ import org.jetbrains.uast.UElement; import org.jetbrains.uast.UastContextKt; import org.jetbrains.uast.UastLiteralUtils; -import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.function.Function; diff --git a/plugins/devkit/devkit-core/src/testAssistant/TestDataHighlightingPassFactory.java b/plugins/devkit/devkit-core/src/testAssistant/TestDataHighlightingPassFactory.java index 635559cb2706..4280a15df28a 100644 --- a/plugins/devkit/devkit-core/src/testAssistant/TestDataHighlightingPassFactory.java +++ b/plugins/devkit/devkit-core/src/testAssistant/TestDataHighlightingPassFactory.java @@ -17,7 +17,6 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/plugins/devkit/devkit-core/src/testAssistant/TestDataReferenceCollector.java b/plugins/devkit/devkit-core/src/testAssistant/TestDataReferenceCollector.java index e34d31023d8b..28fb6f424fdd 100644 --- a/plugins/devkit/devkit-core/src/testAssistant/TestDataReferenceCollector.java +++ b/plugins/devkit/devkit-core/src/testAssistant/TestDataReferenceCollector.java @@ -6,7 +6,6 @@ import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.NullableComputable; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.testFramework.PlatformTestUtil; import org.jetbrains.annotations.NotNull; diff --git a/plugins/devkit/devkit-core/src/themes/ThemeEditorToolbar.java b/plugins/devkit/devkit-core/src/themes/ThemeEditorToolbar.java index fb62b33b1238..908b826de9b1 100644 --- a/plugins/devkit/devkit-core/src/themes/ThemeEditorToolbar.java +++ b/plugins/devkit/devkit-core/src/themes/ThemeEditorToolbar.java @@ -9,7 +9,6 @@ import com.intellij.openapi.fileEditor.FileEditor; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; -import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.EditorNotificationPanel; import com.intellij.ui.EditorNotifications; diff --git a/plugins/devkit/devkit-core/src/util/ActionData.java b/plugins/devkit/devkit-core/src/util/ActionData.java index 445fc936befb..f04bc460d79f 100644 --- a/plugins/devkit/devkit-core/src/util/ActionData.java +++ b/plugins/devkit/devkit-core/src/util/ActionData.java @@ -15,8 +15,8 @@ */ package org.jetbrains.idea.devkit.util; -import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * @author swr diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/IntentionDescriptionNotFoundInspectionTest.java b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/IntentionDescriptionNotFoundInspectionTest.java index c22f2816308a..451119d7ad99 100644 --- a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/IntentionDescriptionNotFoundInspectionTest.java +++ b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/IntentionDescriptionNotFoundInspectionTest.java @@ -18,7 +18,6 @@ package org.jetbrains.idea.devkit.inspections; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.intention.IntentionActionBean; import com.intellij.codeInspection.LocalInspectionEP; -import com.intellij.lang.LanguageExtensionPoint; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; diff --git a/plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/model/impl/JpsDevKitModelSerializerExtension.java b/plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/model/impl/JpsDevKitModelSerializerExtension.java index f87f8deb6932..787d65aa7df3 100644 --- a/plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/model/impl/JpsDevKitModelSerializerExtension.java +++ b/plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/model/impl/JpsDevKitModelSerializerExtension.java @@ -11,11 +11,10 @@ import org.jetbrains.jps.devkit.model.JpsPluginModuleProperties; import org.jetbrains.jps.devkit.model.JpsPluginModuleType; import org.jetbrains.jps.model.JpsElementFactory; import org.jetbrains.jps.model.JpsSimpleElement; -import org.jetbrains.jps.model.serialization.*; -import org.jetbrains.jps.model.serialization.module.JpsModulePropertiesSerializer; +import org.jetbrains.jps.model.serialization.JpsModelSerializerExtension; import org.jetbrains.jps.model.serialization.library.JpsSdkPropertiesSerializer; +import org.jetbrains.jps.model.serialization.module.JpsModulePropertiesSerializer; -import java.util.Arrays; import java.util.Collections; import java.util.List;