Optimize imports to use "packages to import with *" setting
This commit is contained in:
@@ -170,6 +170,7 @@ public class KotlinImportOptimizer() : ImportOptimizer {
|
|||||||
val descriptors = descriptorsByPackages[packageName]
|
val descriptors = descriptorsByPackages[packageName]
|
||||||
val fqNames = descriptors.map { it.importableFqNameSafe }.toSet()
|
val fqNames = descriptors.map { it.importableFqNameSafe }.toSet()
|
||||||
val explicitImports = fqNames.size() < codeStyleSettings.NAME_COUNT_TO_USE_STAR_IMPORT
|
val explicitImports = fqNames.size() < codeStyleSettings.NAME_COUNT_TO_USE_STAR_IMPORT
|
||||||
|
&& packageName.asString() !in codeStyleSettings.PACKAGES_TO_USE_STAR_IMPORTS
|
||||||
if (explicitImports) {
|
if (explicitImports) {
|
||||||
for (fqName in fqNames) {
|
for (fqName in fqNames) {
|
||||||
if (!isImportedByDefault(fqName)) {
|
if (!isImportedByDefault(fqName)) {
|
||||||
|
|||||||
+11
@@ -0,0 +1,11 @@
|
|||||||
|
// PACKAGE_TO_USE_STAR_IMPORTS: java
|
||||||
|
// PACKAGE_TO_USE_STAR_IMPORTS: java.io
|
||||||
|
// PACKAGES_TO_USE_STAR_IMPORTS: java.util.concurrent
|
||||||
|
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean
|
||||||
|
import java.io.File
|
||||||
|
import java.util.ArrayList
|
||||||
|
|
||||||
|
val v1: File
|
||||||
|
val v2: AtomicBoolean
|
||||||
|
val v3: ArrayList<String>
|
||||||
+11
@@ -0,0 +1,11 @@
|
|||||||
|
// PACKAGE_TO_USE_STAR_IMPORTS: java
|
||||||
|
// PACKAGE_TO_USE_STAR_IMPORTS: java.io
|
||||||
|
// PACKAGES_TO_USE_STAR_IMPORTS: java.util.concurrent
|
||||||
|
|
||||||
|
import java.io.*
|
||||||
|
import java.util.ArrayList
|
||||||
|
import java.util.concurrent.atomic.*
|
||||||
|
|
||||||
|
val v1: File
|
||||||
|
val v2: AtomicBoolean
|
||||||
|
val v3: ArrayList<String>
|
||||||
@@ -253,6 +253,12 @@ public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest {
|
|||||||
doTest(fileName);
|
doTest(fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("PackagesToUseStarImport.kt")
|
||||||
|
public void testPackagesToUseStarImport() throws Exception {
|
||||||
|
String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/PackagesToUseStarImport.kt");
|
||||||
|
doTest(fileName);
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("Simple.kt")
|
@TestMetadata("Simple.kt")
|
||||||
public void testSimple() throws Exception {
|
public void testSimple() throws Exception {
|
||||||
String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/Simple.kt");
|
String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/Simple.kt");
|
||||||
|
|||||||
Reference in New Issue
Block a user