diff --git a/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandlerTest.kt b/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandlerTest.kt index bde4e2e989e..308f2149ade 100644 --- a/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandlerTest.kt +++ b/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandlerTest.kt @@ -365,12 +365,16 @@ class TextDocumentServiceHandlerTest { return uri } - if (uri.startsWith("file://C:/")) { - val path = uri.substringAfter("file://C:/") - return "file:///C:/$path" + if (uri.startsWith("file://$windowsDrive:/")) { + val path = uri.substringAfter("file://$windowsDrive:/") + return "file:///$windowsDrive:/$path" } val path = uri.substringAfter("file:///") - return "file:///C:/$path" + return "file:///$windowsDrive:/$path" } + + private val windowsDrive: String + get() = java.nio.file.Paths.get("").toAbsolutePath().root + ?.toString()?.firstOrNull()?.uppercaseChar()?.toString() ?: "C" } diff --git a/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/FileUriUtilTest.kt b/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/FileUriUtilTest.kt index abefcf9f152..a23c240e179 100644 --- a/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/FileUriUtilTest.kt +++ b/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/FileUriUtilTest.kt @@ -22,6 +22,10 @@ class FileUriUtilTest { every { isDirectory } returns mockIsDirectory } + private val windowsDrive: String + get() = java.nio.file.Paths.get("").toAbsolutePath().root + ?.toString()?.firstOrNull()?.uppercaseChar()?.toString() ?: "C" + private fun normalizeFileUri(uri: String): String { if (!System.getProperty("os.name").lowercase().contains("windows")) { return uri @@ -32,7 +36,7 @@ class FileUriUtilTest { } val path = uri.substringAfter("file:///") - return "file:///C:/$path" + return "file:///$windowsDrive:/$path" } @Test diff --git a/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/WorkspaceFolderUtilTest.kt b/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/WorkspaceFolderUtilTest.kt index 3ab9fd37c70..9e00a778daa 100644 --- a/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/WorkspaceFolderUtilTest.kt +++ b/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/WorkspaceFolderUtilTest.kt @@ -97,6 +97,10 @@ class WorkspaceFolderUtilTest { } // for windows unit tests + private val windowsDrive: String + get() = java.nio.file.Paths.get("").toAbsolutePath().root + ?.toString()?.firstOrNull()?.uppercaseChar()?.toString() ?: "C" + private fun normalizeFileUri(uri: String): String { if (!System.getProperty("os.name").lowercase().contains("windows")) { return uri @@ -105,6 +109,6 @@ class WorkspaceFolderUtilTest { return uri } val path = uri.substringAfter("file:///") - return "file:///C:/$path" + return "file:///$windowsDrive:/$path" } } diff --git a/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandlerTest.kt b/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandlerTest.kt index ee7bd0059d0..561c26c4ca6 100644 --- a/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandlerTest.kt +++ b/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandlerTest.kt @@ -819,6 +819,10 @@ class WorkspaceServiceHandlerTest { } // for windows unit tests + private val windowsDrive: String + get() = java.nio.file.Paths.get("").toAbsolutePath().root + ?.toString()?.firstOrNull()?.uppercaseChar()?.toString() ?: "C" + private fun normalizeFileUri(uri: String): String { if (!System.getProperty("os.name").lowercase().contains("windows")) { return uri @@ -829,6 +833,6 @@ class WorkspaceServiceHandlerTest { } val path = uri.substringAfter("file:///") - return "file:///C:/$path" + return "file:///$windowsDrive:/$path" } }