Skip to content

Commit 30a13fa

Browse files
andrewyuqandrewyuq
committed
detekt
1 parent 63b9ff5 commit 30a13fa

File tree

24 files changed

+47
-240
lines changed

24 files changed

+47
-240
lines changed

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -640,15 +640,20 @@ class CodeTestChatController(
640640
LOG.debug { "Original code content from reference span: $originalContent" }
641641
withContext(EDT) {
642642
// TODO flare: hook /test references with flare correctly, this is only a compile error fix which is not tested
643-
manager.addReferenceLogPanelEntry(reference = InlineCompletionReference(
644-
referenceName = reference.repository(),
645-
referenceUrl = reference.url(),
646-
licenseName = reference.licenseName(),
647-
position = InlineCompletionReferencePosition(
648-
startCharacter = reference.recommendationContentSpan().start(),
649-
endCharacter = reference.recommendationContentSpan().end()
650-
)
651-
), null, null, originalContent?.split("\n"))
643+
manager.addReferenceLogPanelEntry(
644+
reference = InlineCompletionReference(
645+
referenceName = reference.repository(),
646+
referenceUrl = reference.url(),
647+
licenseName = reference.licenseName(),
648+
position = InlineCompletionReferencePosition(
649+
startCharacter = reference.recommendationContentSpan().start(),
650+
endCharacter = reference.recommendationContentSpan().end()
651+
)
652+
),
653+
null,
654+
null,
655+
originalContent?.split("\n")
656+
)
652657
manager.toolWindow?.show()
653658
}
654659
}

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ReferenceLogController.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ package software.aws.toolkits.jetbrains.services.cwc.controller
55

66
import com.intellij.openapi.editor.Editor
77
import com.intellij.openapi.project.Project
8-
import software.amazon.awssdk.services.codewhispererruntime.model.Reference
9-
import software.amazon.awssdk.services.codewhispererruntime.model.Span
108
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionReference
119
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionReferencePosition
1210
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.CodeReferenceGenerated

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererRecommendationAction.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@ import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileMa
1515
import software.aws.toolkits.jetbrains.services.codewhisperer.model.LatencyContext
1616
import software.aws.toolkits.jetbrains.services.codewhisperer.model.TriggerTypeInfo
1717
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererAutomatedTriggerType
18-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
1918
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererService
2019
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererServiceNew
2120
import software.aws.toolkits.resources.message
2221
import software.aws.toolkits.telemetry.CodewhispererTriggerType
23-
import java.time.Instant
2422
import java.util.concurrent.atomic.AtomicReference
2523

2624
class CodeWhispererRecommendationAction : AnAction(message("codewhisperer.trigger.service")), DumbAware {

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/utils/CodeWhispererCodeScanIssueUtils.kt‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -352,15 +352,20 @@ fun applySuggestedFix(project: Project, issue: CodeWhispererCodeScanIssue) {
352352
val originalContent = updatedContent.substring(reference.recommendationContentSpan().start(), reference.recommendationContentSpan().end())
353353
LOG.debug { "Original content from reference span: $originalContent" }
354354
// TODO flare: hook codescan references with flare correctly, this is only a compile error fix which is not tested
355-
manager.addReferenceLogPanelEntry(reference = InlineCompletionReference(
356-
referenceName = reference.repository(),
357-
referenceUrl = reference.url(),
358-
licenseName = reference.licenseName(),
359-
position = InlineCompletionReferencePosition(
360-
startCharacter = reference.recommendationContentSpan().start(),
361-
endCharacter = reference.recommendationContentSpan().end(),
355+
manager.addReferenceLogPanelEntry(
356+
reference = InlineCompletionReference(
357+
referenceName = reference.repository(),
358+
referenceUrl = reference.url(),
359+
licenseName = reference.licenseName(),
360+
position = InlineCompletionReferencePosition(
361+
startCharacter = reference.recommendationContentSpan().start(),
362+
endCharacter = reference.recommendationContentSpan().end(),
363+
),
362364
),
363-
), null, null, originalContent.split("\n"))
365+
null,
366+
null,
367+
originalContent.split("\n")
368+
)
364369
}
365370
broadcastQEvent(QFeatureEvent.FINISHES_EDITING)
366371
}

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import com.intellij.util.text.nullize
99
import software.amazon.awssdk.services.codewhispererruntime.CodeWhispererRuntimeClient
1010
import software.amazon.awssdk.services.codewhispererruntime.model.ChatInteractWithMessageEvent
1111
import software.amazon.awssdk.services.codewhispererruntime.model.ChatMessageInteractionType
12-
import software.amazon.awssdk.services.codewhispererruntime.model.CompletionType
1312
import software.amazon.awssdk.services.codewhispererruntime.model.CreateUploadUrlRequest
1413
import software.amazon.awssdk.services.codewhispererruntime.model.CreateUploadUrlResponse
1514
import software.amazon.awssdk.services.codewhispererruntime.model.Dimension
@@ -31,23 +30,15 @@ import software.amazon.awssdk.services.codewhispererruntime.model.StartCodeAnaly
3130
import software.amazon.awssdk.services.codewhispererruntime.model.StartCodeFixJobRequest
3231
import software.amazon.awssdk.services.codewhispererruntime.model.StartCodeFixJobResponse
3332
import software.amazon.awssdk.services.codewhispererruntime.model.StartTestGenerationResponse
34-
import software.amazon.awssdk.services.codewhispererruntime.model.SuggestionState
3533
import software.amazon.awssdk.services.codewhispererruntime.model.TargetCode
3634
import software.amazon.awssdk.services.codewhispererruntime.model.UserIntent
3735
import software.aws.toolkits.jetbrains.services.amazonq.codeWhispererUserContext
3836
import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
3937
import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererCustomization
4038
import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
41-
import software.aws.toolkits.jetbrains.services.codewhisperer.model.SessionContextNew
42-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.RequestContext
43-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.RequestContextNew
44-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.ResponseContext
4539
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
4640
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getTelemetryOptOutPreference
47-
import software.aws.toolkits.telemetry.CodewhispererCompletionType
48-
import software.aws.toolkits.telemetry.CodewhispererSuggestionState
4941
import java.time.Instant
50-
import java.util.concurrent.TimeUnit
5142

5243
// As the connection is project-level, we need to make this project-level too
5344
@Deprecated(
@@ -656,17 +647,3 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
656647
requestBuilder.profileArn(QRegionProfileManager.getInstance().activeProfile(project)?.arn)
657648
}
658649
}
659-
660-
private fun CodewhispererSuggestionState.toCodeWhispererSdkType() = when {
661-
this == CodewhispererSuggestionState.Accept -> SuggestionState.ACCEPT
662-
this == CodewhispererSuggestionState.Reject -> SuggestionState.REJECT
663-
this == CodewhispererSuggestionState.Empty -> SuggestionState.EMPTY
664-
this == CodewhispererSuggestionState.Discard -> SuggestionState.DISCARD
665-
else -> SuggestionState.UNKNOWN_TO_SDK_VERSION
666-
}
667-
668-
private fun CodewhispererCompletionType.toCodeWhispererSdkType() = when {
669-
this == CodewhispererCompletionType.Line -> CompletionType.LINE
670-
this == CodewhispererCompletionType.Block -> CompletionType.BLOCK
671-
else -> CompletionType.UNKNOWN_TO_SDK_VERSION
672-
}

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/editor/CodeWhispererEditorManager.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.model.InvocationCo
1717
import software.aws.toolkits.jetbrains.services.codewhisperer.model.SessionContext
1818
import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupManager
1919
import software.aws.toolkits.jetbrains.services.codewhisperer.settings.CodeWhispererConfigurable
20-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryService
2120
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
2221
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
2322
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CaretMovement
@@ -26,7 +25,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
2625
import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
2726
import software.aws.toolkits.jetbrains.utils.notifyInfo
2827
import software.aws.toolkits.resources.message
29-
import java.time.Instant
3028
import java.util.Stack
3129

3230
@Service

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/editor/CodeWhispererEditorManagerNew.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.model.SessionConte
1515
import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupManager
1616
import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupManagerNew
1717
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererServiceNew
18-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryServiceNew
1918
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
2019
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
2120
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CaretMovement
2221
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.PAIRED_BRACKETS
2322
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.PAIRED_QUOTES
24-
import java.time.Instant
2523
import java.util.Stack
2624

2725
@Service

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/importadder/CodeWhispererImportAdder.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import com.intellij.openapi.extensions.ExtensionPointName
88
import com.intellij.psi.PsiDocumentManager
99
import com.intellij.psi.PsiElement
1010
import com.intellij.psi.PsiFile
11-
import software.amazon.awssdk.services.codewhispererruntime.model.Import
1211
import software.aws.toolkits.core.utils.debug
1312
import software.aws.toolkits.core.utils.getLogger
1413
import software.aws.toolkits.core.utils.info

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupListener.kt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,10 @@ package software.aws.toolkits.jetbrains.services.codewhisperer.popup
55

66
import com.intellij.openapi.ui.popup.JBPopupListener
77
import com.intellij.openapi.ui.popup.LightweightWindowEvent
8-
import io.ktor.client.request.request
9-
import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
10-
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.InlineCompletionStates
11-
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.LogInlineCompletionSessionResultsParams
128
import software.aws.toolkits.jetbrains.services.codewhisperer.model.InvocationContext
139
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
1410
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererServiceNew
1511
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryService
16-
import java.time.Duration
17-
import java.time.Instant
1812

1913
class CodeWhispererPopupListener(private val states: InvocationContext) : JBPopupListener {
2014
override fun beforeShown(event: LightweightWindowEvent) {

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ import java.awt.event.ComponentListener
7878
import javax.swing.JButton
7979
import javax.swing.JComponent
8080
import javax.swing.JLabel
81-
import kotlin.math.min
8281

8382
@Service
8483
class CodeWhispererPopupManager {

0 commit comments

Comments
 (0)