Skip to content

fix(amazonq): Fix for Test generation active file info path check on windows. #5242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 9, 2025
Merged

fix(amazonq): Fix for Test generation active file info path check on windows. #5242

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions ...ware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ import software.aws.toolkits.resources.message
import software.aws.toolkits.telemetry.AmazonqTelemetry
import software.aws.toolkits.telemetry.MetricResult
import software.aws.toolkits.telemetry.UiTelemetry
import java.io.File
import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.Paths
Expand Down Expand Up @@ -159,10 +160,6 @@ class CodeTestChatController(
// check if IDE has active file open, yes return (fileName and filePath) else return null
val project = context.project
val fileInfo = checkActiveFileInIDE(project, message) ?: return
val projectRoot = Path.of(
project.basePath ?: project.guessProjectDir()?.path
?: error("Cannot guess base directory for project ${project.name}")
)
session.programmingLanguage = fileInfo.fileLanguage
if (session.isGeneratingTests === true) {
return
Expand Down Expand Up @@ -190,8 +187,7 @@ class CodeTestChatController(
message.tabId,
false
)
val supported = fileInfo.filePath.startsWith(projectRoot.toString()) && isLanguageSupported(fileInfo.fileLanguage.languageId)
if (supported) {
if (fileInfo.fileInWorkspace && isLanguageSupported(fileInfo.fileLanguage.languageId)) {
// Send Capability card to chat
codeTestChatHelper.addNewMessage(
CodeTestChatMessageContent(informationCard = true, message = null, type = ChatMessageType.Answer, canBeVoted = false),
Expand Down Expand Up @@ -237,7 +233,7 @@ class CodeTestChatController(
}
.build()

val messageContent = if (fileInfo.filePath.startsWith(projectRoot.toString())) {
val messageContent = if (fileInfo.fileInWorkspace) {
"<span style=\"color: #EE9D28;\">&#9888;<b> ${fileInfo.fileLanguage.languageId} is not a " +
"language I support specialized unit test generation for at the moment.</b><br></span>The languages " +
"I support now are Python and Java. I can still provide examples, instructions and code suggestions."
Expand Down Expand Up @@ -300,7 +296,7 @@ class CodeTestChatController(
AmazonqTelemetry.utgGenerateTests(
cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
hasUserPromptSupplied = session.hasUserPromptSupplied,
isFileInWorkspace = fileInfo.filePath.startsWith(projectRoot.toString()),
isFileInWorkspace = fileInfo.fileInWorkspace,
isSupportedLanguage = isLanguageSupported(fileInfo.fileLanguage.languageId),
credentialStartUrl = getStartUrl(project),
result = MetricResult.Succeeded,
Expand Down Expand Up @@ -1129,6 +1125,7 @@ class CodeTestChatController(
val filePath: String,
val fileName: String,
val fileLanguage: CodeWhispererProgrammingLanguage,
val fileInWorkspace: Boolean = true,
)

private suspend fun updateUIState() {
Expand Down Expand Up @@ -1160,6 +1157,9 @@ class CodeTestChatController(
val fileEditorManager = FileEditorManager.getInstance(project)
val activeEditor = fileEditorManager.selectedEditor
val activeFile = fileEditorManager.selectedFiles.firstOrNull()
val projectRoot = project.basePath?.let { Path.of(it) }?.toFile()?.toVirtualFile() ?: run {
project.guessProjectDir() ?: error("Cannot guess base directory for project ${project.name}")
}

if (activeEditor == null || activeFile == null) {
handleInvalidFileState(message.tabId)
Expand All @@ -1174,6 +1174,7 @@ class CodeTestChatController(
filePath = activeFile.path,
fileName = activeFile.name,
fileLanguage = programmingLanguage,
fileInWorkspace = activeFile.path.startsWith(projectRoot.path)
)
} catch (e: Exception) {
LOG.debug { "Error checking active file: $e" }
Expand All @@ -1187,6 +1188,8 @@ class CodeTestChatController(
}
}

private fun File.toVirtualFile() = LocalFileSystem.getInstance().findFileByIoFile(this)

/* UTG Tab Chat input use cases:
* 1. If User exits the flow and want to start a new generate unit test cycle.
* 2. If User clicks on Modify build command option and can enter the build command from chat input
Expand Down
Loading