Fixing file path for saving new files from chat in windows

jetbrains/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentClient.kt

@@ -232,9 +232,15 @@ class CodyAgentClient(private val project: Project, private val webview: NativeW
     var fileName = "Untitled.$ext".removeSuffix(".")
     var outputDir: VirtualFile? =
         if (params.defaultUri != null) {
-          val defaultUriPath = Paths.get(params.defaultUri)
-          fileName = defaultUriPath.fileName.toString()
-          VfsUtil.findFile(defaultUriPath.parent, true)
+            try {
+                val defaultUriPath = Paths.get(params.defaultUri)
+                fileName = defaultUriPath.fileName.toString()
+                val parentDir = VfsUtil.findFile(defaultUriPath.parent, true)
+                parentDir
+            } catch (e: Exception) {
+                logger.error("code222: Error processing defaultUri", e)
+                null
+            }
         } else {
           project.guessProjectDir()
         }
@@ -248,9 +254,14 @@ class CodyAgentClient(private val project: Project, private val webview: NativeW
 
     val saveFileFuture = CompletableFuture<String>()
     runInEdt {
-      val dialog = FileChooserFactory.getInstance().createSaveFileDialog(descriptor, project)
-      val result = dialog.save(outputDir, fileName)
-      saveFileFuture.complete(result?.file?.path)
+        try {
+            val dialog = FileChooserFactory.getInstance().createSaveFileDialog(descriptor, project)
+            val result = dialog.save(outputDir, fileName)
+            saveFileFuture.complete(result?.file?.path)
+        } catch (e: Exception) {
+            logger.error("code222: Error in save dialog", e)
+            saveFileFuture.completeExceptionally(e)
+        }
     }
 
     return saveFileFuture

jetbrains/src/main/kotlin/com/sourcegraph/utils/CodyEditorUtil.kt

@@ -197,19 +197,26 @@ object CodyEditorUtil {
 
   fun findFileOrScratch(project: Project, uriString: String): VirtualFile? {
     try {
-      val uri = URI.create(uriString)
-
+      val normalizedUri = if (uriString.matches(Regex("^[A-Za-z]:.+"))) {
+        "file:///" + uriString.replace('\\', '/')
+      } else {
+        uriString
+      }
+      val uri = URI.create(normalizedUri)
       if (ConfigUtil.isIntegrationTestModeEnabled()) {
         return TempFileSystem.getInstance().refreshAndFindFileByPath(uri.path)
       } else {
-        val fixedUri = if (uriString.startsWith("untitled")) uri.withScheme("file") else uri
-        return LocalFileSystem.getInstance().refreshAndFindFileByNioFile(fixedUri.toPath())
+        val fixedUri = if (uriString.startsWith("untitled")) {
+        uri.withScheme("file")
+      } else uri
+        val path = fixedUri.toPath()
+        return LocalFileSystem.getInstance().refreshAndFindFileByNioFile(path)
       }
     } catch (e: URISyntaxException) {
       // Let's try scratch files
       val fileName = uriString.substringAfterLast(':').trimStart('/', '\\')
       return ScratchRootType.getInstance()
-          .findFile(project, fileName, ScratchFileService.Option.existing_only)
+        .findFile(project, fileName, ScratchFileService.Option.existing_only)
     }
   }
 
@@ -219,7 +226,12 @@ object CodyEditorUtil {
       content: String? = null
   ): VirtualFile? {
     try {
-      val uri = URI.create(uriString)
+      val normalizedUri = if (uriString.matches(Regex("^[A-Za-z]:.+"))) {
+        "file:///" + uriString.replace('\\', '/')
+      } else {
+        uriString
+      }
+      val uri = URI.create(normalizedUri)
 
       val fileUri = uri.withScheme("file")
       if (!fileUri.toPath().exists()) {

jetbrains/src/main/kotlin/com/sourcegraph/utils/CodyUriUtil.kt

@@ -0,0 +1,37 @@
+package com.sourcegraph.utils
+
+import java.io.File
+import java.net.URI
+import java.nio.file.Path
+import java.nio.file.Paths
+
+object CodyUriUtil {
+    /**
+     * Normalizes a URI string to a consistent format across platforms.
+     */
+    @JvmStatic
+    fun normalizeUri(uriString: String): URI {
+        if (uriString.isBlank()) {
+            throw IllegalArgumentException("URI string cannot be empty")
+        }
+
+        return when {
+            uriString.contains("://") -> URI.create(uriString)
+            uriString.startsWith("untitled:") -> URI.create(uriString).withScheme("file")
+            File(uriString).isAbsolute -> File(uriString).toURI()
+            else -> Paths.get(uriString).toUri()
+        }
+    }
+
+    @JvmStatic
+    fun toPath(uriString: String): Path = 
+        Paths.get(normalizeUri(uriString))
+
+    @JvmStatic
+    fun areEquivalent(uri1: String, uri2: String): Boolean =
+        normalizeUri(uri1).normalize() == normalizeUri(uri2).normalize()
+
+    @JvmStatic
+    fun toNormalizedString(uriString: String): String =
+        normalizeUri(uriString).toString()
+}

jetbrains/src/test/kotlin/utils/CodyUriUtilTest.kt

@@ -0,0 +1,130 @@
+package com.sourcegraph.utils
+
+import org.junit.Assert.*
+import org.junit.Test
+import java.io.File
+import java.net.URI
+
+class CodyUriUtilTest {
+
+    @Test
+    fun `test standard file URIs`() {
+        val expected = "file:///path/to/file.txt"
+        val inputs = listOf(
+            "/path/to/file.txt",
+            "file:///path/to/file.txt",
+            File("/path/to/file.txt").absolutePath
+        )
+
+        inputs.forEach { input ->
+            val result = CodyUriUtil.normalizeUri(input)
+            assertEquals(expected, result.toString())
+        }
+    }
+
+    @Test
+    fun `test Windows paths`() {
+        val inputs = mapOf(
+            "C:\\Users\\test\\file.txt" to "file:///C:/Users/test/file.txt",
+            "C:/Users/test/file.txt" to "file:///C:/Users/test/file.txt",
+            "file:///C:/Users/test/file.txt" to "file:///C:/Users/test/file.txt"
+        )
+
+        inputs.forEach { (input, expected) ->
+            val result = CodyUriUtil.normalizeUri(input)
+            assertEquals(expected, result.toString())
+        }
+    }
+
+    @Test
+    fun `test WSL paths`() {
+        val inputs = mapOf(
+            "\\\\wsl\$\\Ubuntu\\home\\user\\file.txt" to "file:////wsl$/Ubuntu/home/user/file.txt",
+            "//wsl$/Ubuntu/home/user/file.txt" to "file:////wsl$/Ubuntu/home/user/file.txt"
+        )
+
+        inputs.forEach { (input, expected) ->
+            val result = CodyUriUtil.normalizeUri(input)
+            assertEquals(expected, result.toString())
+        }
+    }
+
+    @Test
+    fun `test untitled URIs`() {
+        val input = "untitled:Untitled-1"
+        val result = CodyUriUtil.normalizeUri(input)
+        assertEquals("file:Untitled-1", result.toString())
+    }
+
+    @Test
+    fun `test network paths`() {
+        val inputs = mapOf(
+            "\\\\server\\share\\file.txt" to "file:////server/share/file.txt",
+            "//server/share/file.txt" to "file:////server/share/file.txt"
+        )
+
+        inputs.forEach { (input, expected) ->
+            val result = CodyUriUtil.normalizeUri(input)
+            assertEquals(expected, result.toString())
+        }
+    }
+
+    @Test
+    fun `test URI equivalence`() {
+        val equivalentPairs = listOf(
+            Pair("C:\\Users\\test\\file.txt", "file:///C:/Users/test/file.txt"),
+            Pair("/path/to/file.txt", "file:///path/to/file.txt"),
+            Pair("\\\\server\\share\\file.txt", "file:////server/share/file.txt")
+        )
+
+        equivalentPairs.forEach { (uri1, uri2) ->
+            assertTrue(CodyUriUtil.areEquivalent(uri1, uri2))
+        }
+    }
+
+    @Test
+    fun `test path conversion`() {
+        val inputs = mapOf(
+            "file:///path/to/file.txt" to "/path/to/file.txt",
+            "file:///C:/Users/test/file.txt" to "C:\\Users\\test\\file.txt"
+        )
+
+        inputs.forEach { (input, expected) ->
+            val result = CodyUriUtil.toPath(input)
+            assertEquals(File(expected).absolutePath, result.toFile().absolutePath)
+        }
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun `test empty URI string`() {
+        CodyUriUtil.normalizeUri("")
+    }
+
+    @Test
+    fun `test special characters in paths`() {
+        val inputs = mapOf(
+            "/path/with spaces/file.txt" to "file:///path/with%20spaces/file.txt",
+            "/path/with#hash/file.txt" to "file:///path/with%23hash/file.txt",
+            "/path/with?question/file.txt" to "file:///path/with%3Fquestion/file.txt"
+        )
+
+        inputs.forEach { (input, expected) ->
+            val result = CodyUriUtil.normalizeUri(input)
+            assertEquals(expected, result.toString())
+        }
+    }
+
+    @Test
+    fun `test remote URIs`() {
+        val inputs = listOf(
+            "http://example.com/file.txt",
+            "https://example.com/file.txt",
+            "ftp://example.com/file.txt"
+        )
+
+        inputs.forEach { input ->
+            val result = CodyUriUtil.normalizeUri(input)
+            assertEquals(input, result.toString())
+        }
+    }
+}