-
-
| ${message("codewhisperer.codescan.cwe_label")} | -${message("codewhisperer.codescan.fix_available_label")} | -${message("codewhisperer.codescan.detector_library_label")} | -
|---|---|---|
| $cweLinks | -${if (suggestedFix != null) "Yes" else "No"} | -$detectorLibraryLink | -
- •$explainButton -
- """.trimIndent() - - val suggestedFixSection = suggestedFix?.let { - val isFixDescriptionAvailable = it.description.isNotBlank() && - it.description.trim() != "Suggested remediation:" - """ - |
- |
- | - |## ${message("codewhisperer.codescan.suggested_fix_label")} - | - |```diff - |${it.code} - |``` - | - |${ - if (isFixDescriptionAvailable) { - "|### ${ - message( - "codewhisperer.codescan.suggested_fix_description" - ) - }\n${it.description}" - } else { - "" - } - } - """.trimMargin() - } - - return convertMarkdownToHTML( - """ - |$linksSection - | - |${issue.recommendation.text} - | - |$detectorSection - | - |${suggestedFixSection.orEmpty()} - """.trimMargin() - ) - } - - private fun getSeverityIcon(issue: CodeWhispererCodeScanIssue): Icon? = when (issue.severity) { - "Info" -> AwsIcons.Resources.CodeWhisperer.SEVERITY_INFO - "Low" -> AwsIcons.Resources.CodeWhisperer.SEVERITY_LOW - "Medium" -> AwsIcons.Resources.CodeWhisperer.SEVERITY_MEDIUM - "High" -> AwsIcons.Resources.CodeWhisperer.SEVERITY_HIGH - "Critical" -> AwsIcons.Resources.CodeWhisperer.SEVERITY_CRITICAL - else -> null - } private fun showPopup(issues: List
+
+
| ${message("codewhisperer.codescan.cwe_label")} | +${message("codewhisperer.codescan.detector_library_label")} | +
|---|---|
| $cweLinks | +$detectorLibraryLink | +
| ${message("codewhisperer.codescan.file_path_label")} | +
|---|
| $fileLink | +
+ Your settings do not allow code generation with references.
+
+ """.trimIndent()
+ }
+
+ val fixLoadingSection = """
+
+
+ ...
+
+
+ """.trimIndent()
+
+ val fixFailureSection = """
+
+
+
Amazon Q failed to generate fix. Please try again
+ +
+ """.trimIndent()
+
+ val commonContent = """
+ |${issue.recommendation.text}
+ |
+ |$detectorSection
+ |
+ |${when (fixGenerationState) {
+ CodeWhispererConstants.FixGenerationState.COMPLETED -> suggestedFixSection.orEmpty()
+ CodeWhispererConstants.FixGenerationState.GENERATING -> fixLoadingSection
+ CodeWhispererConstants.FixGenerationState.FAILED -> fixFailureSection
+ }}
+ """.trimMargin()
+
+ if (display == CodeScanIssueDetailsDisplayType.EditorPopup) {
+ return convertMarkdownToHTML(
+ """
+ |$commonContent
+ """.trimMargin()
+ )
+ }
+
+ return convertMarkdownToHTML(commonContent)
+}
+
+private fun createSuggestedFixSection(issue: CodeWhispererCodeScanIssue, suggestedFix: SuggestedFix?, isCopied: Boolean = false): String? = suggestedFix?.let {
+ val isFixDescriptionAvailable = it.description.isNotBlank() &&
+ it.description.trim() != "Suggested remediation:"
+ """
+ |Amazon Q failed to generate fix. Please try again
+ +
+ | + |### ${message("codewhisperer.codescan.suggested_fix_label")} + | + |
+ | + |
+ |
+ |
+ |${
+ if (isFixDescriptionAvailable) {
+ "|### ${
+ message(
+ "codewhisperer.codescan.suggested_fix_description"
+ )
+ }\n${it.description}"
+ } else {
+ ""
+ }
+ }
+ """.trimMargin()
+}
+
+fun explainIssue(issue: CodeWhispererCodeScanIssue) {
+ val explainIssueContext = mutableMapOf(
+ "title" to issue.title,
+ "description" to issue.description.markdown,
+ "code" to issue.codeText
+ )
+ val actionEvent = AnActionEvent.createFromInputEvent(
+ null,
+ ToolkitPlaces.EDITOR_PSI_REFERENCE,
+ null,
+ SimpleDataContext.builder().add(explainIssueDataKey, explainIssueContext).add(CommonDataKeys.PROJECT, issue.project).build()
+ )
+ ActionManager.getInstance().getAction("aws.amazonq.explainCodeScanIssue").actionPerformed(actionEvent)
+}
+
+fun openDiff(issue: CodeWhispererCodeScanIssue) {
+ val diffContentFactory = DiffContentFactory.getInstance()
+ val document = FileDocumentManager.getInstance().getDocument(issue.file)
+ document?.text?.let { documentContent ->
+ val updatedContent = applyPatch(issue.suggestedFixes[0].code, documentContent, issue.file.name)
+ val (originalContent, suggestedContent) = try {
+ diffContentFactory.create(documentContent) to
+ diffContentFactory.create(updatedContent)
+ } catch (e: Exception) {
+ ApplicationManager.getApplication().executeOnPooledThread {
+ CodeWhispererTelemetryService.getInstance().sendCodeScanIssueApplyFixEvent(
+ issue,
+ Result.Failed,
+ e.message,
+ codeFixAction = CodeFixAction.OpenDiff
+ )
+ }
+ return@let null
+ }
+
+ val request = SimpleDiffRequest(
+ "Amazon Q Code Suggestion Diff",
+ suggestedContent,
+ originalContent,
+ "Suggested fix",
+ "Original code"
+ ).apply {
+ putUserData(DiffUserDataKeys.MERGE_EDITOR_FLAG, true)
+
+ putUserData(DiffUserDataKeys.DO_NOT_IGNORE_WHITESPACES, true)
+
+ putUserData(DiffUserDataKeys.ENABLE_SEARCH_IN_CHANGES, true)
+ putUserData(DiffUserDataKeys.GO_TO_SOURCE_DISABLE, false)
+
+ putUserData(DiffUserDataKeys.ALIGNED_TWO_SIDED_DIFF, true)
+ putUserData(DiffUserDataKeys.FORCE_READ_ONLY_CONTENTS, booleanArrayOf(true, false))
+ putUserData(DiffUserDataKeys.FORCE_READ_ONLY, false)
+ }
+ ApplicationManager.getApplication().invokeLater {
+ DiffManager.getInstance().showDiff(
+ issue.project,
+ request
+ )
+ }
+ }
+ ApplicationManager.getApplication().executeOnPooledThread {
+ CodeWhispererTelemetryService.getInstance().sendCodeScanIssueApplyFixEvent(issue, Result.Succeeded, codeFixAction = CodeFixAction.OpenDiff)
+ }
+}
+
+fun truncateIssueTitle(title: String): String = title.takeUnless { it.length <= CODE_SCAN_ISSUE_TITLE_MAX_LENGTH }?.let {
+ it.substring(0, CODE_SCAN_ISSUE_TITLE_MAX_LENGTH - 3) + "..."
+} ?: title
+
+fun sendCodeRemediationTelemetryToServiceApi(
+ project: Project,
+ language: CodeWhispererProgrammingLanguage?,
+ codeScanRemediationEventType: String?,
+ detectorId: String?,
+ findingId: String?,
+ ruleId: String?,
+ component: String?,
+ reason: String?,
+ result: String?,
+ includesFix: Boolean?,
+) {
+ runIfIdcConnectionOrTelemetryEnabled(project) {
+ pluginAwareExecuteOnPooledThread {
+ try {
+ val response = CodeWhispererClientAdaptor.getInstance(project)
+ .sendCodeScanRemediationTelemetry(
+ language,
+ codeScanRemediationEventType,
+ detectorId,
+ findingId,
+ ruleId,
+ component,
+ reason,
+ result,
+ includesFix
+ )
+ LOG.debug { "Successfully sent code scan remediation telemetry. RequestId: ${response.responseMetadata().requestId()}" }
+ } catch (e: Exception) {
+ val requestId = if (e is CodeWhispererRuntimeException) e.requestId() else null
+ LOG.debug(e) {
+ "Failed to send code scan remediation telemetry. RequestId: $requestId"
+ }
+ }
+ }
+ }
+}
+
+fun applySuggestedFix(project: Project, issue: CodeWhispererCodeScanIssue) {
+ try {
+ val manager = CodeWhispererCodeReferenceManager.getInstance(issue.project)
+ WriteCommandAction.runWriteCommandAction(issue.project) {
+ val document = FileDocumentManager.getInstance().getDocument(issue.file) ?: return@runWriteCommandAction
+
+ val documentContent = document.text
+ val updatedContent = applyPatch(issue.suggestedFixes[0].code, documentContent, issue.file.name)
+ document.replaceString(document.getLineStartOffset(0), document.getLineEndOffset(document.lineCount - 1), updatedContent)
+ PsiDocumentManager.getInstance(issue.project).commitDocument(document)
+ issue.suggestedFixes[0].references.forEach { reference ->
+ LOG.debug { "Applied fix with reference: $reference" }
+ val originalContent = updatedContent.substring(reference.recommendationContentSpan().start(), reference.recommendationContentSpan().end())
+ LOG.debug { "Original content from reference span: $originalContent" }
+ manager.addReferenceLogPanelEntry(reference = reference, null, null, originalContent.split("\n"))
+ }
+ }
+ if (issue.suggestedFixes[0].references.isNotEmpty()) {
+ manager.toolWindow?.show()
+ }
+ if (CodeWhispererExplorerActionManager.getInstance().isAutoEnabledForCodeScan()) {
+ CodeWhispererCodeScanManager.getInstance(issue.project).removeIssueByFindingId(issue, issue.findingId)
+ }
+ ApplicationManager.getApplication().executeOnPooledThread {
+ CodeWhispererTelemetryService.getInstance().sendCodeScanIssueApplyFixEvent(issue, Result.Succeeded, codeFixAction = CodeFixAction.ApplyFix)
+ }
+ sendCodeRemediationTelemetryToServiceApi(
+ project,
+ issue.file.programmingLanguage(),
+ "CODESCAN_ISSUE_APPLY_FIX",
+ issue.detectorId,
+ issue.findingId,
+ issue.ruleId,
+ null,
+ null,
+ Result.Succeeded.toString(),
+ issue.suggestedFixes.isNotEmpty()
+ )
+ sendCodeFixGeneratedTelemetryToServiceAPI(issue, true)
+ } catch (e: Throwable) {
+ notifyError(message("codewhisperer.codescan.fix_applied_fail", e))
+ LOG.debug(e) { "Apply fix command failed." }
+ ApplicationManager.getApplication().executeOnPooledThread {
+ CodeWhispererTelemetryService.getInstance().sendCodeScanIssueApplyFixEvent(issue, Result.Failed, e.message, codeFixAction = CodeFixAction.ApplyFix)
+ sendCodeRemediationTelemetryToServiceApi(
+ project,
+ issue.file.programmingLanguage(),
+ "CODESCAN_ISSUE_APPLY_FIX",
+ issue.detectorId,
+ issue.findingId,
+ issue.ruleId,
+ null,
+ e.message,
+ Result.Failed.toString(),
+ issue.suggestedFixes.isNotEmpty()
+ )
+ }
+ }
+}
+
+fun getSeverityIcon(issue: CodeWhispererCodeScanIssue): Icon? = when (issue.severity) {
+ "Info" -> AwsIcons.Resources.CodeWhisperer.SEVERITY_INFO
+ "Low" -> AwsIcons.Resources.CodeWhisperer.SEVERITY_LOW
+ "Medium" -> AwsIcons.Resources.CodeWhisperer.SEVERITY_MEDIUM
+ "High" -> AwsIcons.Resources.CodeWhisperer.SEVERITY_HIGH
+ "Critical" -> AwsIcons.Resources.CodeWhisperer.SEVERITY_CRITICAL
+ else -> null
+}
+
+fun sendCodeFixGeneratedTelemetryToServiceAPI(
+ issue: CodeWhispererCodeScanIssue,
+ acceptFix: Boolean,
+) {
+ runIfIdcConnectionOrTelemetryEnabled(issue.project) {
+ pluginAwareExecuteOnPooledThread {
+ try {
+ val client = CodeWhispererClientAdaptor.getInstance(issue.project)
+ if (acceptFix) {
+ val acceptFixResponse = client.sendCodeFixAcceptanceTelemetry(
+ issue.file.programmingLanguage(),
+ issue.suggestedFixes.first().codeFixJobId,
+ issue.ruleId,
+ issue.detectorId,
+ issue.findingId,
+ issue.suggestedFixes.first().code.split("\n").size - 1,
+ issue.suggestedFixes.first().code.length
+ )
+ LOG.debug {
+ "Successfully sent code fix acceptance telemetry. RequestId: ${
+ acceptFixResponse.responseMetadata().requestId()
+ }"
+ }
+ } else {
+ val generateFixResponse = client.sendCodeFixGenerationTelemetry(
+ issue.file.programmingLanguage(),
+ issue.suggestedFixes.first().codeFixJobId,
+ issue.ruleId,
+ issue.detectorId,
+ issue.findingId,
+ issue.suggestedFixes.first().code.split("\n").size - 1,
+ issue.suggestedFixes.first().code.length
+ )
+ LOG.debug {
+ "Successfully sent code fix generated telemetry. RequestId: ${
+ generateFixResponse.responseMetadata().requestId()
+ }"
+ }
+ }
+ } catch (e: Exception) {
+ val requestId = if (e is CodeWhispererRuntimeException) e.requestId() else null
+ LOG.debug { "Failed to send code fix telemetry. RequestId: $requestId, ErrorMessage: ${e.message}" }
+ }
+ }
+ }
+}
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codetest/sessionconfig/CodeTestSessionConfig.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codetest/sessionconfig/CodeTestSessionConfig.kt
new file mode 100644
index 0000000000..fcd2fbfcab
--- /dev/null
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codetest/sessionconfig/CodeTestSessionConfig.kt
@@ -0,0 +1,247 @@
+// Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.codewhisperer.codetest.sessionconfig
+
+import com.intellij.openapi.application.runReadAction
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.guessModuleDir
+import com.intellij.openapi.project.guessProjectDir
+import com.intellij.openapi.project.modules
+import com.intellij.openapi.roots.ProjectRootManager
+import com.intellij.openapi.vcs.changes.ChangeListManager
+import com.intellij.openapi.vfs.LocalFileSystem
+import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.openapi.vfs.isFile
+import kotlinx.coroutines.runBlocking
+import software.aws.toolkits.core.utils.createTemporaryZipFile
+import software.aws.toolkits.core.utils.debug
+import software.aws.toolkits.core.utils.getLogger
+import software.aws.toolkits.core.utils.putNextEntry
+import software.aws.toolkits.jetbrains.services.amazonq.FeatureDevSessionContext
+import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.cannotFindBuildArtifacts
+import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.cannotFindFile
+import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.fileTooLarge
+import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.noFileOpenError
+import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.sessionconfig.Payload
+import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.sessionconfig.PayloadContext
+import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.sessionconfig.PayloadMetadata
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererUnknownLanguage
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CODE_SCAN_CREATE_PAYLOAD_TIMEOUT_IN_SECONDS
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_CODE_SCAN_TIMEOUT_IN_SECONDS
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_PAYLOAD_LIMIT_IN_BYTES
+import software.aws.toolkits.resources.message
+import java.io.File
+import java.nio.file.Path
+import java.time.Instant
+import java.util.Stack
+import java.util.zip.ZipEntry
+import kotlin.io.path.name
+import kotlin.io.path.relativeTo
+
+// TODO: share huge duplicates with CodeScanSessionConfig need to abstract to a ZipSessionConfig
+class CodeTestSessionConfig(
+ private val selectedFile: VirtualFile?,
+ private val project: Project,
+ private val buildAndExecuteLogFile: VirtualFile? = null,
+) {
+ val projectRoot = project.basePath?.let { Path.of(it) }?.toFile()?.toVirtualFile() ?: run {
+ project.guessProjectDir() ?: error("Cannot guess base directory for project ${project.name}")
+ }
+
+ private val featureDevSessionContext = FeatureDevSessionContext(project)
+
+ val fileIndex = ProjectRootManager.getInstance(project).fileIndex
+
+ /**
+ * return default timeout
+ */
+ fun overallJobTimeoutInSeconds(): Long = DEFAULT_CODE_SCAN_TIMEOUT_IN_SECONDS
+
+ fun getPayloadLimitInBytes(): Long = DEFAULT_PAYLOAD_LIMIT_IN_BYTES
+
+ private fun willExceedPayloadLimit(currentTotalFileSize: Long, currentFileSize: Long): Boolean =
+ currentTotalFileSize.let { totalSize -> totalSize > (getPayloadLimitInBytes() - currentFileSize) }
+
+ private var programmingLanguage: CodeWhispererProgrammingLanguage = selectedFile?.programmingLanguage() ?: CodeWhispererUnknownLanguage.INSTANCE
+
+ fun getProgrammingLanguage(): CodeWhispererProgrammingLanguage = programmingLanguage
+
+ fun getSelectedFile(): VirtualFile? = selectedFile
+
+ fun createPayload(): Payload {
+ // Fail fast if the selected file is null for UTG
+ if (selectedFile == null) {
+ noFileOpenError()
+ }
+
+ // Fail fast if the selected file size is greater than the payload limit.
+ if (selectedFile.length > getPayloadLimitInBytes()) {
+ fileTooLarge()
+ }
+
+ val start = Instant.now().toEpochMilli()
+
+ LOG.debug { "Creating payload. File selected as root for the context truncation: ${projectRoot.path}" }
+
+ val payloadMetadata: PayloadMetadata = try {
+ getProjectPayloadMetadata()
+ } catch (e: Exception) {
+ val errorMessage = when {
+ e.message?.contains("Illegal repetition near index") == true -> "Illegal repetition near index"
+ else -> e.message
+ }
+ LOG.debug { "Error creating payload metadata: $errorMessage" }
+ throw cannotFindBuildArtifacts(errorMessage ?: message("codewhisperer.codescan.run_scan_error_telemetry"))
+ }
+
+ // Copy all the included source files to the source zip
+ val srcZip = zipFiles(payloadMetadata.sourceFiles.map { Path.of(it) })
+ val payloadContext = PayloadContext(
+ payloadMetadata.language,
+ payloadMetadata.linesScanned,
+ payloadMetadata.sourceFiles.size,
+ Instant.now().toEpochMilli() - start,
+ payloadMetadata.sourceFiles.mapNotNull { Path.of(it).toFile().toVirtualFile() },
+ payloadMetadata.payloadSize,
+ srcZip.length()
+ )
+
+ return Payload(payloadContext, srcZip)
+ }
+
+ /**
+ * Timeout for creating the payload [createPayload]
+ */
+ fun createPayloadTimeoutInSeconds(): Long = CODE_SCAN_CREATE_PAYLOAD_TIMEOUT_IN_SECONDS
+
+ private fun countLinesInVirtualFile(virtualFile: VirtualFile): Int {
+ try {
+ val bufferedReader = virtualFile.inputStream.bufferedReader()
+ return bufferedReader.useLines { lines -> lines.count() }
+ } catch (e: Exception) {
+ cannotFindFile("Line count error: ${e.message}", virtualFile.path)
+ }
+ }
+
+ private fun zipFiles(files: List
+ |
+ |```diff
+ |${it.code.trim()}
+ |```
+ |
+ |
+ |
+ | ↔ Open Diff
+ |
+ |
+ |
+ | 📋 ${if (isCopied) "Copied!" else "Copy"}
+ |
+ |
+ |Inline code suggestions
-Code faster with inline code suggestions as you type.
-
-
- Chat
-Generate code, refactor existing code, explain code, and get answers to questions about software development.
-
+ The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI
+ +Agent capabilities
+Implement new features
+/dev to task Amazon Q with generating new code across your entire project and implement features.
Generate documentation
+/docs to task Amazon Q with writing API, technical design, and onboarding documentation.
Automate code reviews
+/review to ask Amazon Q to perform code reviews, flagging suspicious code patterns and assessing deployment risk.
Generate unit tests
+/test to ask Amazon Q to generate unit tests and add them to your project, helping you improve code quality, fast.
Security scans
-Analyze and fix security vulnerabilities in your project.
-10 languages supported including Java, Python, Javascript, Golang, and more
+Transform workloads
+/transform to upgrade your Java applications in minutes, not weeks.
Agent for software development
-Let Amazon Q plan and implement new functionality across multiple files in your workspace. Type “/” in chat to open the quick actions menu and choose the “/dev” action.
+Core features
-Agent for code transformation
-Upgrade your Java applications in minutes, not weeks. Type “/” in chat to open the quick actions menu and choose the “/transform” action.
-Currently supports upgrading Java 8 or 11 Maven projects to Java 17
-
+ Inline chat
+Seamlessly initial chat within the inline coding experience. Select a section of code that you need assistance with and initiate chat within the editor to request actions such as "Optimize this code", "Add comments", or "Write tests".
+ +Chat
+Generate code, explain code, and get answers about software development.
+ +Inline suggestions
+15+ languages supported including Python, TypeScript, Rust, Terraform, AWS Cloudformation, and more Attribute code from Amazon Q that is similar to training data. When code suggestions similar to training data are accepted, they will be added to the code reference log. Free Tier - create or log in with an AWS Builder ID (no AWS account needed!). Free Tier - create or log in with an AWS Builder ID (a personal profile from AWS). Pro Tier - if your organization is on the Amazon Q Developer Pro tier, log in with single sign-on. File a bug or submit a feature request on our Github repository. File a bug or submit a feature request on our Github repository.Code reference log
Getting Started
-
- Pro Tier - if your organization is on the Amazon Q Developer Pro tier, log in with single sign-on.
- Getting Started
+ 
- Troubleshooting & feedback
- Troubleshooting & feedback
+
\u21E5
→