Implementation of the function to optimize imports for java code

build.gradle.kts

@@ -65,7 +65,6 @@ val spacePassword = getLocalProperty("spacePassword")
 
 configure(subprojects) {
     apply(plugin = "maven-publish")
-    apply(plugin = "java")
 
     val subprojectName = this.name
 

gradle.properties

@@ -3,6 +3,6 @@ kotlin.code.style=official
 pluginName = Kotlin Test Framework With IJ
 platformType = IC
 platformVersion = 2022.2.5
-platformPlugins = Kotlin, com.intellij.java
+platformPlugins = Kotlin, java
 
 org.gradle.jvmargs = -XX:MaxMetaspaceSize=1g

ij/build.gradle.kts

@@ -7,11 +7,15 @@ plugins {
 
 fun properties(key: String) = providers.gradleProperty(key)
 
-intellij {
-    pluginName = properties("pluginName")
-    version = properties("platformVersion")
-    type = properties("platformType")
+allprojects {
+    apply(plugin = "org.jetbrains.intellij")
 
-    // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
-    plugins = properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) }
+    intellij {
+        pluginName = properties("pluginName")
+        version = properties("platformVersion")
+        type = properties("platformType")
+
+        // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
+        plugins = properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) }
+    }
 }

ij/common/build.gradle.kts

@@ -1,18 +1,2 @@
 group = rootProject.group
 version = rootProject.version
-
-plugins {
-    id("org.jetbrains.intellij") version "1.15.0"
-    id("java")
-}
-
-fun properties(key: String) = providers.gradleProperty(key)
-
-intellij {
-    pluginName = properties("pluginName")
-    version = properties("platformVersion")
-    type = properties("platformType")
-
-    // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
-    plugins = properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) }
-}

ij/common/src/main/kotlin/org/jetbrains/academy/test/system/inspections/InspectionsUtil.kt

@@ -1,3 +1,5 @@
+@file:Suppress("ForbiddenComment")
+
 package org.jetbrains.academy.test.system.inspections
 
 import com.intellij.codeInsight.daemon.impl.DaemonProgressIndicator
@@ -32,6 +34,7 @@ fun PsiFile.applyLocalInspections(inspections: List<LocalInspectionTool>): List<
 }
 
 fun PsiFile.applyGlobalInspections(inspections: List<GlobalSimpleInspectionTool>): Boolean {
+    // TODO: `checkFile` doesn't work due to `resolve` doesn't work
     val inspectionManager = InspectionManager.getInstance(project)
     val problemDescriptionsProcessor = MyProblemDescriptionsProcessor()
     val globalContext = GlobalInspectionContextBase(project)

ij/java-psi/build.gradle.kts

@@ -1,22 +1,6 @@
 group = rootProject.group
 version = rootProject.version
 
-plugins {
-    id("org.jetbrains.intellij") version "1.15.0"
-    id("java")
-}
-
 dependencies {
     implementation(project(":ij:common"))
 }
-
-fun properties(key: String) = providers.gradleProperty(key)
-
-intellij {
-    pluginName = properties("pluginName")
-    version = properties("platformVersion")
-    type = properties("platformType")
-
-    // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
-    plugins = properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) }
-}

ij/java-psi/src/main/kotlin/org/jetbrains/academy/test/system/java/ij/formatting/UnusedImportsUtil.kt

@@ -1,11 +1,17 @@
 package org.jetbrains.academy.test.system.java.ij.formatting
 
 import com.intellij.psi.PsiFile
-import com.intellij.codeInspection.unusedImport.UnusedImportInspection
-import org.jetbrains.academy.test.system.inspections.applyGlobalInspections
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.command.WriteCommandAction
+import com.intellij.psi.codeStyle.JavaCodeStyleManager
 
 fun PsiFile.checkIfOptimizeImportsWereApplied() {
-    assert(applyGlobalInspections(listOf(UnusedImportInspection()))) {
+    val originalCode = ApplicationManager.getApplication().runReadAction<String> { text }
+    WriteCommandAction.runWriteCommandAction(project) {
+        JavaCodeStyleManager.getInstance(project).optimizeImports(this)
+    }
+    val optimizedCode = ApplicationManager.getApplication().runReadAction<String> { text }
+    assert(originalCode.trimIndent() == optimizedCode.trimIndent()) {
         "Please, apply \"Optimize import\" option when formatting code."
     }
 }

ij/kotlin-psi/build.gradle.kts

@@ -1,21 +1,6 @@
 group = rootProject.group
 version = rootProject.version
 
-plugins {
-    id("org.jetbrains.intellij") version "1.15.0"
-}
-
 dependencies {
     implementation(project(":ij:common"))
 }
-
-fun properties(key: String) = providers.gradleProperty(key)
-
-intellij {
-    pluginName = properties("pluginName")
-    version = properties("platformVersion")
-    type = properties("platformType")
-
-    // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
-    plugins = properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) }
-}