Merge remote-tracking branch 'origin/feature/q-lsp' into lodogga/overrideLSPArtifacts

Author: LokeshDogga13

buildspec/linuxUiTests.yml

@@ -47,7 +47,7 @@ phases:
       - chmod +x gradlew
 
       - ffmpeg -loglevel quiet -nostdin -f x11grab -video_size ${SCREEN_WIDTH}x${SCREEN_HEIGHT} -i ${DISPLAY} -codec:v libx264 -pix_fmt yuv420p -vf drawtext="fontsize=48:box=1:[email protected]:boxborderw=5:fontcolor=white:x=0:y=h-text_h:text='%{gmtime\:%H\\\\\:%M\\\\\:%S}'" -framerate 12 -g 12 /tmp/screen_recording.mp4 &
-      - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :ui-tests-starter:test coverageReport --console plain --info
+      - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :ui-tests-starter:uiTest coverageReport --console plain --info
 
   post_build:
     commands:

gradle/libs.versions.toml

@@ -106,6 +106,7 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
 kotlin-stdLibJdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
+mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
 mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockitoKotlin" }
 mockk = { module = "io.mockk:mockk", version.ref="mockk" }
 nimbus-jose-jwt = {module = "com.nimbusds:nimbus-jose-jwt", version.ref = "nimbus-jose-jwt"}
@@ -121,7 +122,7 @@ zjsonpatch = { module = "com.flipkart.zjsonpatch:zjsonpatch", version.ref = "zjs
 [bundles]
 jackson = ["jackson-datetime", "jackson-kotlin", "jackson-yaml", "jackson-xml"]
 kotlin = ["kotlin-stdLibJdk8", "kotlin-reflect"]
-mockito = ["mockito-core", "mockito-kotlin"]
+mockito = ["mockito-core", "mockito-junit-jupiter", "mockito-kotlin"]
 sshd = ["sshd-core", "sshd-scp", "sshd-sftp"]
 
 [plugins]

noop/build.gradle.kts

@@ -3,3 +3,4 @@
 
 // project that does nothing
 tasks.register("test")
+tasks.register("uiTest")

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

@@ -37,7 +37,6 @@ import org.eclipse.lsp4j.InitializedParams
 import org.eclipse.lsp4j.SynchronizationCapabilities
 import org.eclipse.lsp4j.TextDocumentClientCapabilities
 import org.eclipse.lsp4j.WorkspaceClientCapabilities
-import org.eclipse.lsp4j.WorkspaceFolder
 import org.eclipse.lsp4j.jsonrpc.Launcher
 import org.eclipse.lsp4j.launch.LSPLauncher
 import org.slf4j.event.Level
@@ -48,14 +47,15 @@ import software.aws.toolkits.jetbrains.isDeveloperMode
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.auth.DefaultAuthCredentialsService
 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.util.WorkspaceFolderUtil.createWorkspaceFolders
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.workspace.WorkspaceServiceHandler
 import software.aws.toolkits.jetbrains.services.telemetry.ClientMetadata
 import java.io.IOException
 import java.io.OutputStreamWriter
 import java.io.PipedInputStream
 import java.io.PipedOutputStream
 import java.io.PrintWriter
 import java.io.StringWriter
-import java.net.URI
 import java.nio.charset.StandardCharsets
 import java.util.concurrent.Future
 import kotlin.time.Duration.Companion.seconds
@@ -211,21 +211,11 @@ private class AmazonQServerInstance(private val project: Project, private val cs
                 fileOperations = FileOperationsWorkspaceCapabilities().apply {
                     didCreate = true
                     didDelete = true
+                    didRename = true
                 }
             }
         }
 
-    // needs case handling when project's base path is null: default projects/unit tests
-    private fun createWorkspaceFolders(): List<WorkspaceFolder> =
-        project.basePath?.let { basePath ->
-            listOf(
-                WorkspaceFolder(
-                    URI("file://$basePath").toString(),
-                    project.name
-                )
-            )
-        }.orEmpty() // no folders to report or workspace not folder based
-
     private fun createClientInfo(): ClientInfo {
         val metadata = ClientMetadata.getDefault()
         return ClientInfo().apply {
@@ -239,7 +229,7 @@ private class AmazonQServerInstance(private val project: Project, private val cs
             processId = ProcessHandle.current().pid().toInt()
             capabilities = createClientCapabilities()
             clientInfo = createClientInfo()
-            workspaceFolders = createWorkspaceFolders()
+            workspaceFolders = createWorkspaceFolders(project)
             initializationOptions = createExtendedClientMetadata()
         }
 
@@ -306,6 +296,7 @@ private class AmazonQServerInstance(private val project: Project, private val cs
         }
 
         DefaultAuthCredentialsService(project, encryptionManager, this)
+        WorkspaceServiceHandler(project, this)
     }
 
     override fun dispose() {

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

@@ -112,7 +112,7 @@ class ArtifactHelper(private val lspArtifactsPath: Path = DEFAULT_ARTIFACT_PATH,
             logger.info { "Attempt ${currentAttempt.get()} of $maxDownloadAttempts to download LSP artifacts" }
 
             try {
-                withBackgroundProgress(
+                return withBackgroundProgress(
                     project,
                     AwsCoreBundle.message("amazonqFeatureDev.placeholder.downloading_and_extracting_lsp_artifacts"),
                     cancellable = true
@@ -123,9 +123,12 @@ class ArtifactHelper(private val lspArtifactsPath: Path = DEFAULT_ARTIFACT_PATH,
                             .mapNotNull { it.filename }
                             .forEach { filename -> extractZipFile(downloadPath.resolve(filename), downloadPath) }
                         logger.info { "Successfully downloaded and moved LSP artifacts to $downloadPath" }
+
+                        return@withBackgroundProgress downloadPath
                     }
+
+                    return@withBackgroundProgress null
                 }
-                return downloadPath
             } catch (e: Exception) {
                 when (e) {
                     is CancellationException -> {

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

@@ -19,7 +19,7 @@ import java.nio.file.Path
 class ManifestFetcher(
     private val lspManifestUrl: String = DEFAULT_MANIFEST_URL,
     private val manifestManager: ManifestManager = ManifestManager(),
-    private val lspManifestFilePath: Path = DEFAULT_MANIFEST_PATH,
+    private val manifestPath: Path = DEFAULT_MANIFEST_PATH,
 ) {
     companion object {
         private val logger = getLogger<ManifestFetcher>()
@@ -34,6 +34,10 @@ class ManifestFetcher(
             .resolve("jetbrains-lsp-manifest.json")
     }
 
+    @get:VisibleForTesting
+    internal val lspManifestFilePath: Path
+        get() = manifestPath
+
     /**
      * Method which will be used to fetch latest manifest.
      * */

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

@@ -0,0 +1,42 @@
+// 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.util
+
+import com.intellij.openapi.vfs.VfsUtilCore
+import com.intellij.openapi.vfs.VirtualFile
+import software.aws.toolkits.core.utils.getLogger
+import software.aws.toolkits.core.utils.warn
+import java.io.File
+import java.net.URI
+import java.net.URISyntaxException
+
+object FileUriUtil {
+
+    fun toUriString(virtualFile: VirtualFile): String? {
+        val protocol = virtualFile.fileSystem.protocol
+        val uri = when (protocol) {
+            "jar" -> VfsUtilCore.convertToURL(virtualFile.url)?.toExternalForm()
+            "jrt" -> virtualFile.url
+            else -> toUri(VfsUtilCore.virtualToIoFile(virtualFile)).toASCIIString()
+        } ?: return null
+
+        return if (virtualFile.isDirectory) {
+            uri.trimEnd('/', '\\')
+        } else {
+            uri
+        }
+    }
+
+    private fun toUri(file: File): URI {
+        try {
+            // URI scheme specified by language server protocol
+            return URI("file", "", file.absoluteFile.toURI().path, null)
+        } catch (e: URISyntaxException) {
+            LOG.warn { "${e.localizedMessage}: $e" }
+            return file.absoluteFile.toURI()
+        }
+    }
+
+    private val LOG = getLogger<FileUriUtil>()
+}

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

@@ -0,0 +1,22 @@
+// 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.util
+
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.roots.ProjectRootManager
+import org.eclipse.lsp4j.WorkspaceFolder
+
+object WorkspaceFolderUtil {
+    fun createWorkspaceFolders(project: Project): List<WorkspaceFolder> =
+        if (project.isDefault) {
+            emptyList()
+        } else {
+            ProjectRootManager.getInstance(project).contentRoots.map { contentRoot ->
+                WorkspaceFolder().apply {
+                    name = contentRoot.name
+                    this.uri = contentRoot.url
+                }
+            }
+        }
+}