Merge branch 'feature/q-lsp' into samgst/q-lsp-supported-filetypes

Author: samgst-amazon

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt

@@ -72,11 +72,11 @@ class CodeWhispererConfigurable(private val project: Project) :
 
                 textFieldWithBrowseButton(fileChooserDescriptor = fileChooserDescriptor)
                     .bindText(
-                        { LspSettings.getInstance().getArtifactPath() },
-                        { LspSettings.getInstance().setArtifactPath(it.takeIf { v -> v.isNotBlank() }) }
+                        { LspSettings.getInstance().getArtifactPath().orEmpty() },
+                        { LspSettings.getInstance().setArtifactPath(it) }
                     )
                     .applyToComponent {
-                        emptyText.text = "Choose a file to upload"
+                        emptyText.text = message("executableCommon.auto_managed")
                     }
                     .resizableColumn()
                     .align(Align.FILL)

plugins/amazonq/shared/jetbrains-community/resources/META-INF/module-amazonq.xml

@@ -9,4 +9,5 @@
     <extensions defaultExtensionNs="com.intellij">
         <applicationService serviceImplementation="migration.software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager"/>
     </extensions>
+
 </idea-plugin>

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageServer.kt

@@ -8,13 +8,17 @@ import org.eclipse.lsp4j.jsonrpc.services.JsonNotification
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest
 import org.eclipse.lsp4j.services.LanguageServer
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.UpdateCredentialsPayload
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.dependencies.SyncModuleDependenciesParams
 import java.util.concurrent.CompletableFuture
 
 /**
  * Remote interface exposed by the Amazon Q language server
  */
 @Suppress("unused")
 interface AmazonQLanguageServer : LanguageServer {
+    @JsonNotification("aws/syncModuleDependencies")
+    fun syncModuleDependencies(params: SyncModuleDependenciesParams): CompletableFuture<Unit>
+
     @JsonRequest("aws/credentials/token/update")
     fun updateTokenCredentials(payload: UpdateCredentialsPayload): CompletableFuture<ResponseMessage>
 

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt

@@ -18,11 +18,13 @@ import com.intellij.openapi.components.serviceIfCreated
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.Key
+import com.intellij.openapi.util.SystemInfo
 import com.intellij.util.io.await
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -44,13 +46,16 @@ import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.isDeveloperMode
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.artifacts.ArtifactManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.auth.DefaultAuthCredentialsService
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies.DefaultModuleDependenciesService
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.encryption.JwtEncryptionManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.createExtendedClientMetadata
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.textdocument.TextDocumentServiceHandler
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.WorkspaceFolderUtil.createWorkspaceFolders
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.workspace.WorkspaceServiceHandler
 import software.aws.toolkits.jetbrains.services.telemetry.ClientMetadata
+import software.aws.toolkits.jetbrains.settings.LspSettings
 import java.io.IOException
 import java.io.OutputStreamWriter
 import java.io.PipedInputStream
@@ -243,8 +248,12 @@ private class AmazonQServerInstance(private val project: Project, private val cs
         }
 
     init {
+        // will cause slow service init, but maybe fine for now. will not block UI since fetch/extract will be under background progress
+        val artifact = runBlocking { ArtifactManager(project, manifestRange = null).fetchArtifact() }.toAbsolutePath()
+        val node = if (SystemInfo.isWindows) "node.exe" else "node"
         val cmd = GeneralCommandLine(
-            "amazon-q-lsp",
+            artifact.resolve(node).toString(),
+            LspSettings.getInstance().getArtifactPath() ?: artifact.resolve("aws-lsp-codewhisperer.js").toString(),
             "--stdio",
             "--set-credentials-encryption-key",
         )
@@ -310,6 +319,9 @@ private class AmazonQServerInstance(private val project: Project, private val cs
         DefaultAuthCredentialsService(project, encryptionManager, this)
         TextDocumentServiceHandler(project, this)
         WorkspaceServiceHandler(project, initializeResult, this)
+        cs.launch {
+            DefaultModuleDependenciesService(project, this@AmazonQServerInstance)
+        }
     }
 
     override fun dispose() {

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/LspUtils.kt

@@ -7,16 +7,18 @@ import com.intellij.openapi.util.SystemInfo
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.util.io.DigestUtil
 import com.intellij.util.system.CpuArch
+import software.aws.toolkits.core.utils.ZIP_PROPERTY_POSIX
 import software.aws.toolkits.core.utils.createParentDirectories
 import software.aws.toolkits.core.utils.exists
+import software.aws.toolkits.core.utils.hasPosixFilePermissions
 import java.io.FileNotFoundException
-import java.io.FileOutputStream
+import java.net.URI
+import java.nio.file.FileSystems
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.nio.file.StandardCopyOption
 import java.security.MessageDigest
-import java.util.zip.ZipFile
 import kotlin.io.path.isDirectory
 import kotlin.io.path.listDirectoryEntries
 
@@ -78,17 +80,20 @@ fun extractZipFile(zipFilePath: Path, destDir: Path) {
     }
 
     try {
-        ZipFile(zipFilePath.toFile()).use { zipFile ->
-            zipFile.entries()
-                .asSequence()
-                .filterNot { it.isDirectory }
-                .map { zipEntry ->
-                    val destPath = destDir.resolve(zipEntry.name)
-                    destPath.createParentDirectories()
-                    FileOutputStream(destPath.toFile()).use { targetFile ->
-                        zipFile.getInputStream(zipEntry).copyTo(targetFile)
+        FileSystems.newFileSystem(
+            // jar prefix due to potentially ambiguous resolution to wrong fs impl for zipfs on windows
+            URI("jar:${zipFilePath.toUri()}"),
+            mapOf(ZIP_PROPERTY_POSIX to destDir.hasPosixFilePermissions())
+        ).use { zipfs ->
+            Files.walk(zipfs.getPath("/")).use { paths ->
+                paths
+                    .filter { !it.isDirectory() }
+                    .forEach { zipEntry ->
+                        val destPath = Paths.get(destDir.toString(), zipEntry.toString())
+                        destPath.createParentDirectories()
+                        Files.copy(zipEntry, destPath, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES)
                     }
-                }.toList()
+            }
         }
     } catch (e: Exception) {
         throw LspException("Failed to extract zip file: ${e.message}", LspException.ErrorCode.UNZIP_FAILED, cause = e)

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/DefaultModuleDependenciesService.kt

@@ -0,0 +1,52 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies
+
+import com.intellij.openapi.Disposable
+import com.intellij.openapi.module.ModuleManager
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.roots.ModuleRootEvent
+import com.intellij.openapi.roots.ModuleRootListener
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies.ModuleDependencyProvider.Companion.EP_NAME
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.dependencies.SyncModuleDependenciesParams
+import java.util.concurrent.CompletableFuture
+
+class DefaultModuleDependenciesService(
+    private val project: Project,
+    serverInstance: Disposable,
+) : ModuleDependenciesService,
+    ModuleRootListener {
+
+    init {
+        project.messageBus.connect(serverInstance).subscribe(
+            ModuleRootListener.TOPIC,
+            this
+        )
+        // project initiation with initial list of dependencies
+        syncAllModules()
+    }
+
+    override fun rootsChanged(event: ModuleRootEvent) {
+        if (event.isCausedByFileTypesChange) return
+        // call on change with updated dependencies
+        syncAllModules()
+    }
+
+    override fun syncModuleDependencies(params: SyncModuleDependenciesParams): CompletableFuture<Unit> =
+        AmazonQLspService.executeIfRunning(project) { languageServer ->
+            languageServer.syncModuleDependencies(params)
+        }?.toCompletableFuture() ?: CompletableFuture.failedFuture(IllegalStateException("LSP Server not running"))
+
+    private fun syncAllModules() {
+        ModuleManager.getInstance(project).modules.forEach { module ->
+            EP_NAME.forEachExtensionSafe {
+                if (it.isApplicable(module)) {
+                    syncModuleDependencies(it.createParams(module))
+                    return@forEachExtensionSafe
+                }
+            }
+        }
+    }
+}

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/ModuleDependenciesService.kt

@@ -0,0 +1,11 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies
+
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.dependencies.SyncModuleDependenciesParams
+import java.util.concurrent.CompletableFuture
+
+interface ModuleDependenciesService {
+    fun syncModuleDependencies(params: SyncModuleDependenciesParams): CompletableFuture<Unit>
+}

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/ModuleDependencyProvider.kt

@@ -0,0 +1,17 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies
+
+import com.intellij.openapi.extensions.ExtensionPointName
+import com.intellij.openapi.module.Module
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.dependencies.SyncModuleDependenciesParams
+
+interface ModuleDependencyProvider {
+    companion object {
+        val EP_NAME = ExtensionPointName<ModuleDependencyProvider>("software.aws.toolkits.jetbrains.moduleDependencyProvider")
+    }
+
+    fun isApplicable(module: Module): Boolean
+    fun createParams(module: Module): SyncModuleDependenciesParams
+}

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/providers/JavaModuleDependencyProvider.kt

@@ -0,0 +1,46 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies.providers
+
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.projectRoots.JavaSdkType
+import com.intellij.openapi.roots.ModuleRootManager
+import com.intellij.openapi.roots.OrderRootType
+import com.intellij.openapi.vfs.VfsUtil
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies.ModuleDependencyProvider
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.dependencies.SyncModuleDependenciesParams
+
+internal class JavaModuleDependencyProvider : ModuleDependencyProvider {
+    override fun isApplicable(module: Module): Boolean =
+        ModuleRootManager.getInstance(module).sdk?.sdkType is JavaSdkType
+
+    override fun createParams(module: Module): SyncModuleDependenciesParams {
+        val sourceRoots = getSourceRoots(module)
+        val dependencies = mutableListOf<String>()
+
+        ModuleRootManager.getInstance(module).orderEntries().forEachLibrary { library ->
+            library.getUrls(OrderRootType.CLASSES).forEach { url ->
+                dependencies.add(VfsUtil.urlToPath(url))
+            }
+            true
+        }
+
+        return SyncModuleDependenciesParams(
+            moduleName = module.name,
+            programmingLanguage = "Java",
+            files = sourceRoots,
+            dirs = dependencies,
+            includePatterns = emptyList(),
+            excludePatterns = emptyList()
+        )
+    }
+
+    private fun getSourceRoots(module: Module): List<String> =
+        ModuleRootManager.getInstance(module).contentEntries
+            .flatMap { contentEntry ->
+                contentEntry.sourceFolders
+                    .filter { !it.isTestSource }
+                    .mapNotNull { it.file?.path }
+            }
+}

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/providers/PythonModuleDependencyProvider.kt

@@ -0,0 +1,45 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies.providers
+
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.roots.ModuleRootManager
+import com.jetbrains.python.packaging.management.PythonPackageManager
+import com.jetbrains.python.sdk.PythonSdkUtil
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies.ModuleDependencyProvider
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.dependencies.SyncModuleDependenciesParams
+
+internal class PythonModuleDependencyProvider : ModuleDependencyProvider {
+    override fun isApplicable(module: Module): Boolean =
+        PythonSdkUtil.findPythonSdk(module) != null
+
+    override fun createParams(module: Module): SyncModuleDependenciesParams {
+        val sourceRoots = getSourceRoots(module)
+        val dependencies = mutableListOf<String>()
+
+        PythonSdkUtil.findPythonSdk(module)?.let { sdk ->
+            val packageManager = PythonPackageManager.forSdk(module.project, sdk)
+            packageManager.installedPackages.forEach { pkg ->
+                dependencies.add(pkg.name)
+            }
+        }
+
+        return SyncModuleDependenciesParams(
+            moduleName = module.name,
+            programmingLanguage = "Python",
+            files = sourceRoots,
+            dirs = dependencies,
+            includePatterns = emptyList(),
+            excludePatterns = emptyList()
+        )
+    }
+
+    private fun getSourceRoots(module: Module): List<String> =
+        ModuleRootManager.getInstance(module).contentEntries
+            .flatMap { contentEntry ->
+                contentEntry.sourceFolders
+                    .filter { !it.isTestSource }
+                    .mapNotNull { it.file?.path }
+            }
+}

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/dependencies/SyncModuleDependenciesParams.kt

@@ -0,0 +1,13 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.dependencies
+
+class SyncModuleDependenciesParams(
+    val moduleName: String,
+    val programmingLanguage: String,
+    val files: List<String>,
+    val dirs: List<String>,
+    val includePatterns: List<String>,
+    val excludePatterns: List<String>,
+)

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/settings/LspSettings.kt

@@ -10,7 +10,7 @@ import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
 import com.intellij.openapi.components.service
-import com.intellij.util.xmlb.annotations.Property
+import com.intellij.util.text.nullize
 
 @Service
 @State(name = "lspSettings", storages = [Storage("aws.xml", roamingType = RoamingType.DISABLED)])
@@ -26,11 +26,7 @@ class LspSettings : PersistentStateComponent<LspConfiguration> {
     fun getArtifactPath() = state.artifactPath
 
     fun setArtifactPath(artifactPath: String?) {
-        if (artifactPath == null) {
-            state.artifactPath = ""
-        } else {
-            state.artifactPath = artifactPath
-        }
+        state.artifactPath = artifactPath.nullize(nullizeSpaces = true)
     }
 
     companion object {
@@ -39,6 +35,5 @@ class LspSettings : PersistentStateComponent<LspConfiguration> {
 }
 
 class LspConfiguration : BaseState() {
-    @get:Property
-    var artifactPath: String = ""
+    var artifactPath by string()
 }