fixtoolkit errors

Author: rli

plugins/amazonq/codewhisperer/jetbrains-ultimate/src-241-243/compat/com/intellij/lang/javascript/JavascriptLanguage.kt renamed to plugins/core/jetbrains-ultimate/src-241-243/compat/com/intellij/lang/javascript/JavascriptLanguage.kt

@@ -24,9 +24,9 @@ import com.intellij.openapi.util.Disposer
 import com.intellij.remoteDev.downloader.CodeWithMeClientDownloader
 import com.intellij.ui.components.JBTabbedPane
 import com.intellij.ui.dsl.builder.Align
+import com.intellij.ui.dsl.builder.AlignX
+import com.intellij.ui.dsl.builder.AlignY
 import com.intellij.ui.dsl.builder.panel
-import com.intellij.ui.dsl.gridLayout.HorizontalAlign
-import com.intellij.ui.dsl.gridLayout.VerticalAlign
 import com.intellij.util.ui.JBFont
 import com.jetbrains.gateway.api.ConnectionRequestor
 import com.jetbrains.gateway.api.GatewayConnectionHandle
@@ -325,7 +325,7 @@ class CawsConnectionProvider : GatewayConnectionProvider {
                                         setCenterPanel(
                                             panel {
                                                 row {
-                                                    icon(AllIcons.General.ErrorDialog).verticalAlign(VerticalAlign.TOP)
+                                                    icon(AllIcons.General.ErrorDialog).align(AlignY.TOP)
 
                                                     panel {
                                                         row {
@@ -344,7 +344,7 @@ class CawsConnectionProvider : GatewayConnectionProvider {
                                                     collapsibleGroup(message("general.logs"), false) {
                                                         row {
                                                             cell(view)
-                                                                .horizontalAlign(HorizontalAlign.FILL)
+                                                                .align(AlignX.FILL)
                                                         }
                                                     }.expanded = false
                                                     // TODO: can't seem to reliably force a terminal redraw on initial expand

plugins/amazonq/codewhisperer/jetbrains-ultimate/src-251+/compat/com/intellij/lang/javascript/JavascriptLanguage.kt renamed to plugins/core/jetbrains-ultimate/src-251+/compat/com/intellij/lang/javascript/JavascriptLanguage.kt

@@ -10,14 +10,14 @@ import com.intellij.execution.process.ProcessEvent
 import com.intellij.execution.runners.ExecutionEnvironment
 import com.intellij.javascript.debugger.LocalFileSystemFileFinder
 import com.intellij.javascript.debugger.RemoteDebuggingFileFinder
-import com.intellij.lang.javascript.JavascriptLanguage
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.xdebugger.XDebugProcess
 import com.intellij.xdebugger.XDebugProcessStarter
 import com.intellij.xdebugger.XDebugSession
 import com.jetbrains.debugger.wip.WipLocalVmConnection
 import com.jetbrains.nodeJs.NodeChromeDebugProcess
+import compat.com.intellij.lang.javascript.JavascriptLanguage
 import org.jetbrains.io.LocalFileFinder
 import software.aws.toolkits.core.lambda.LambdaRuntime
 import software.aws.toolkits.jetbrains.services.PathMapping
@@ -39,7 +39,7 @@ class NodeJsRuntimeDebugSupport : RuntimeDebugSupport {
 
 abstract class NodeJsImageDebugSupport : ImageDebugSupport {
     override fun supportsPathMappings(): Boolean = true
-    override val languageId = JavascriptLanguage.INSTANCE.id
+    override val languageId = JavascriptLanguage.id
     override suspend fun createDebugProcess(
         context: Context,
         environment: ExecutionEnvironment,

plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsConnectionProvider.kt

@@ -5,20 +5,20 @@ package software.aws.toolkits.jetbrains.services.lambda.nodejs
 
 import com.intellij.javascript.nodejs.interpreter.NodeJsInterpreterManager
 import com.intellij.lang.javascript.JavaScriptSupportLoader
-import com.intellij.lang.javascript.JavascriptLanguage
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleType
 import com.intellij.openapi.module.WebModuleTypeBase
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.projectRoots.Sdk
+import compat.com.intellij.lang.javascript.JavascriptLanguage
 import software.aws.toolkits.core.lambda.LambdaRuntime
 import software.aws.toolkits.jetbrains.services.lambda.BuiltInRuntimeGroups
 import software.aws.toolkits.jetbrains.services.lambda.SdkBasedRuntimeGroup
 
 class NodeJsRuntimeGroup : SdkBasedRuntimeGroup() {
     override val id: String = BuiltInRuntimeGroups.NodeJs
     override val languageIds: Set<String> = setOf(
-        JavascriptLanguage.INSTANCE.id,
+        JavascriptLanguage.id,
         JavaScriptSupportLoader.ECMA_SCRIPT_6.id
     )
     override val supportsPathMappings: Boolean = true