build

Author: rli

plugins/amazonq/codewhisperer/jetbrains-ultimate/build.gradle.kts

@@ -20,6 +20,7 @@ dependencies {
     compileOnly(project(":plugin-amazonq:shared:jetbrains-ultimate"))
 
     compileOnly(project(":plugin-core:jetbrains-ultimate"))
+    testCompileOnly(project(":plugin-core:jetbrains-ultimate"))
 
     testImplementation(testFixtures(project(":plugin-amazonq:codewhisperer:jetbrains-community")))
     testImplementation(project(path = ":plugin-toolkit:jetbrains-ultimate", configuration = "testArtifacts"))

plugins/amazonq/codewhisperer/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/codewhisperer/importadder/CodeWhispererJSImportAdderTest.kt

@@ -4,13 +4,13 @@
 package software.aws.toolkits.jetbrains.services.codewhisperer.importadder
 
 import com.intellij.lang.ecmascript6.psi.ES6ImportDeclaration
-import com.intellij.lang.javascript.JavascriptLanguage
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiFileFactory
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.testFramework.runInEdtAndGet
 import com.intellij.testFramework.runInEdtAndWait
+import compat.com.intellij.lang.javascript.JavascriptLanguage
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import software.aws.toolkits.jetbrains.utils.rules.NodeJsCodeInsightTestFixtureRule
@@ -242,7 +242,7 @@ class CodeWhispererJSImportAdderTest : CodeWhispererImportAdderTestBase(
     private fun createImport(statement: String): PsiElement =
         runInEdtAndGet {
             val fileFactory = PsiFileFactory.getInstance(projectRule.project)
-            val dummyFile = fileFactory.createFileFromText("dummy.js", JavascriptLanguage.INSTANCE, statement)
+            val dummyFile = fileFactory.createFileFromText("dummy.js", JavascriptLanguage, statement)
             val importDeclarations = PsiTreeUtil.getChildrenOfType(dummyFile, ES6ImportDeclaration::class.java)
             importDeclarations?.first() ?: fail()
         }

plugins/toolkit/jetbrains-rider/build.gradle.kts

@@ -373,8 +373,8 @@ tasks.integrationTest {
 // https://youtrack.jetbrains.com/issue/IJPL-180442
 tasks.withType<Test> {
     classpath -= classpath.filter {
-        (it.name.startsWith("localization-") && it.name.endsWith(".jar"))
-            || it.name == "cwm-plugin.jar"
+        (it.name.startsWith("localization-") && it.name.endsWith(".jar")) ||
+            it.name == "cwm-plugin.jar"
     }
 }