redhat impl

Author: samgst-amazon

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

@@ -3,17 +3,42 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.util
 
-import com.intellij.openapi.vfs.VfsUtil
-import com.intellij.openapi.vfs.VirtualFile
 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 file = VfsUtilCore.virtualToIoFile(virtualFile)
-        return VfsUtil.toUri(file).toString()
+    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/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/FileUriUtilTest.kt

@@ -1,8 +1,11 @@
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.util
 
 import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.testFramework.LightVirtualFile
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
+import io.mockk.every
+import io.mockk.mockk
 import org.junit.Test
 
 class FileUriUtilTest : BasePlatformTestCase() {
@@ -17,6 +20,13 @@ class FileUriUtilTest : BasePlatformTestCase() {
         assertEquals("file:///path/to/file.txt", uri)
     }
 
+    @Test
+    fun `test unix directory path`() {
+        val virtualFile = createMockVirtualFile("/path/to/directory/")
+        val uri = FileUriUtil.toUriString(virtualFile)
+        assertEquals("file:///path/to/directory", uri)
+    }
+
     @Test
     fun `test path with spaces`() {
         val virtualFile = createMockVirtualFile("/path/with spaces/file.txt")
@@ -31,6 +41,13 @@ class FileUriUtilTest : BasePlatformTestCase() {
         assertEquals("file:///C:/path/to/file.txt", uri)
     }
 
+    @Test
+    fun `test windows directory path`() {
+        val virtualFile = createMockVirtualFile("C:\\path\\to\\directory\\")
+        val uri = FileUriUtil.toUriString(virtualFile)
+        assertEquals("file:///C:/path/to/directory", uri)
+    }
+
     @Test
     fun `test root path`() {
         val virtualFile = createMockVirtualFile("/")
@@ -50,15 +67,104 @@ class FileUriUtilTest : BasePlatformTestCase() {
         val longPath = "/a".repeat(256) + "/file.txt"
         val virtualFile = createMockVirtualFile(longPath)
         val uri = FileUriUtil.toUriString(virtualFile)
-        assertTrue(uri.startsWith("file:///"))
-        assertTrue(uri.endsWith("/file.txt"))
+        if (uri != null) {
+            assertTrue(uri.startsWith("file:///"))
+            assertTrue(uri.endsWith("/file.txt"))
+        }
     }
 
     @Test
     fun `test relative path`() {
         val virtualFile = createMockVirtualFile("./relative/path/file.txt")
         val uri = FileUriUtil.toUriString(virtualFile)
-        assertTrue(uri.contains("file.txt"))
-        assertTrue(uri.startsWith("file:///"))
+        if (uri != null) {
+            assertTrue(uri.contains("file.txt"))
+            assertTrue(uri.startsWith("file:///"))
+        }
+    }
+
+    @Test
+    fun `test jar protocol conversion`() {
+
+        val virtualFile = mockk<VirtualFile> {
+            every { fileSystem } returns mockk {
+                every { protocol } returns "jar"
+            }
+            every { url } returns "jar:file:///path/to/archive.jar!/com/example/Test.class"
+            every { isDirectory } returns false
+        }
+
+        val result = FileUriUtil.toUriString(virtualFile)
+        assertEquals("jar:file:///path/to/archive.jar!/com/example/Test.class", result)
+    }
+
+    @Test
+    fun `test jrt protocol conversion`() {
+        val virtualFile = mockk<VirtualFile> {
+            every { fileSystem } returns mockk {
+                every { protocol } returns "jrt"
+            }
+            every { url } returns "jrt://java.base/java/lang/String.class"
+            every { isDirectory } returns false
+        }
+
+        val result = FileUriUtil.toUriString(virtualFile)
+        assertEquals("jrt://java.base/java/lang/String.class", result)
+    }
+
+    @Test
+    fun `test invalid jar url returns null`() {
+        val virtualFile = mockk<VirtualFile> {
+            every { fileSystem } returns mockk {
+                every { protocol } returns "jar"
+            }
+            every { url } returns "invalid:url:format"
+            every { isDirectory } returns false
+        }
+
+        val result = FileUriUtil.toUriString(virtualFile)
+        assertNull(result)
+    }
+
+    @Test
+    fun `test jar protocol with directory`() {
+        val virtualFile = mockk<VirtualFile> {
+            every { fileSystem } returns mockk {
+                every { protocol } returns "jar"
+            }
+            every { url } returns "jar:file:///path/to/archive.jar!/com/example/"
+            every { isDirectory } returns true
+        }
+
+        val result = FileUriUtil.toUriString(virtualFile)
+        assertEquals("jar:file:///path/to/archive.jar!/com/example", result)
+    }
+
+    @Test
+    fun `test null url in jar protocol`() {
+        val virtualFile = mockk<VirtualFile> {
+            every { fileSystem } returns mockk {
+                every { protocol } returns "jar"
+            }
+            every { url } returns ""
+            every { isDirectory } returns false
+        }
+
+        val result = FileUriUtil.toUriString(virtualFile)
+        assertNull(result)
+    }
+
+    @Test
+    fun `test empty url in jar protocol`() {
+        val virtualFile = mockk<VirtualFile> {
+            every { fileSystem } returns mockk {
+                every { protocol } returns "jar"
+            }
+            every { url } returns ""
+            every { isDirectory } returns false
+        }
+
+        val result = FileUriUtil.toUriString(virtualFile)
+        assertNull(result)
     }
 }