Skip to content

Commit b72a13c

Browse files
Will-ShaoHuaWill-ShaoHua
committed
fix compile error caused by merge from main
1 parent a8733d5 commit b72a13c

23 files changed

+26
-24
lines changed

‎plugins/amazonq/codewhisperer/jetbrains-community/it/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererIntegrationTestBase.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispe
5555
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererService
5656
import software.aws.toolkits.jetbrains.services.codewhisperer.settings.CodeWhispererConfiguration
5757
import software.aws.toolkits.jetbrains.services.codewhisperer.settings.CodeWhispererConfigurationType
58-
import software.aws.toolkits.jetbrains.services.codewhisperer.settings.CodeWhispererSettings
5958
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryService
6059
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
60+
import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
6161
import software.aws.toolkits.jetbrains.utils.rules.CodeInsightTestFixtureRule
6262
import software.aws.toolkits.jetbrains.utils.rules.PythonCodeInsightTestFixtureRule
6363
import software.aws.toolkits.jetbrains.utils.rules.RunWithRealCredentials

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import com.intellij.openapi.actionSystem.ActionPromoter
88
import com.intellij.openapi.actionSystem.AnAction
99
import com.intellij.openapi.actionSystem.DataContext
1010
import com.intellij.openapi.editor.actionSystem.EditorAction
11+
import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
1112
import software.aws.toolkits.jetbrains.services.codewhisperer.popup.handlers.CodeWhispererPopupLeftArrowHandler
1213
import software.aws.toolkits.jetbrains.services.codewhisperer.popup.handlers.CodeWhispererPopupRightArrowHandler
1314
import software.aws.toolkits.jetbrains.services.codewhisperer.popup.handlers.CodeWhispererPopupTabHandler
14-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererFeatureConfigService
1515
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatusNew
1616

1717
class CodeWhispererActionPromoter : ActionPromoter {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import com.intellij.openapi.actionSystem.CommonDataKeys
1010
import com.intellij.openapi.project.DumbAware
1111
import com.intellij.openapi.util.Key
1212
import kotlinx.coroutines.Job
13+
import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
1314
import software.aws.toolkits.jetbrains.services.codewhisperer.model.LatencyContext
1415
import software.aws.toolkits.jetbrains.services.codewhisperer.model.TriggerTypeInfo
1516
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererAutomatedTriggerType
16-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererFeatureConfigService
1717
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererService
1818
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererServiceNew
1919
import software.aws.toolkits.resources.message

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererModelConfigurator.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import com.intellij.util.xmlb.annotations.Property
2020
import software.amazon.awssdk.services.codewhispererruntime.model.CodeWhispererRuntimeException
2121
import software.aws.toolkits.core.utils.debug
2222
import software.aws.toolkits.core.utils.getLogger
23+
import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
2324
import software.aws.toolkits.jetbrains.services.amazonq.calculateIfIamIdentityCenterConnection
2425
import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
25-
import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
2626
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
2727
import software.aws.toolkits.jetbrains.utils.notifyInfo
2828
import software.aws.toolkits.jetbrains.utils.notifyWarn

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import com.intellij.openapi.editor.event.EditorFactoryEvent
99
import com.intellij.openapi.editor.event.EditorFactoryListener
1010
import com.intellij.openapi.editor.impl.EditorImpl
1111
import com.intellij.openapi.fileEditor.FileDocumentManager
12+
import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
1213
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererEnabled
1314
import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
14-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererFeatureConfigService
1515
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
1616
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatusNew
1717
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererCodeCoverageTracker

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererAutoTriggerHandler.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package software.aws.toolkits.jetbrains.services.codewhisperer.service
66
import com.intellij.openapi.editor.Editor
77
import software.aws.toolkits.core.utils.debug
88
import software.aws.toolkits.core.utils.getLogger
9+
import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
910
import software.aws.toolkits.jetbrains.services.codewhisperer.model.LatencyContext
1011
import software.aws.toolkits.jetbrains.services.codewhisperer.model.TriggerTypeInfo
1112
import software.aws.toolkits.telemetry.CodewhispererTriggerType

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererAutoTriggerService.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import kotlinx.coroutines.launch
1717
import org.apache.commons.collections4.queue.CircularFifoQueue
1818
import software.aws.toolkits.jetbrains.core.coroutines.EDT
1919
import software.aws.toolkits.jetbrains.core.coroutines.applicationCoroutineScope
20+
import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
2021
import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorUtil
2122
import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererUnknownLanguage
2223
import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.model.Supplemental
7171
import software.aws.toolkits.jetbrains.services.codewhisperer.model.TriggerTypeInfo
7272
import software.aws.toolkits.jetbrains.services.codewhisperer.model.WorkerContext
7373
import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupManager
74-
import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
7574
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryService
7675
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CaretMovement
7776
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeInsightsSettingsFacade
@@ -82,6 +81,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
8281
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.notifyErrorCodeWhispererUsageLimit
8382
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.promptReAuth
8483
import software.aws.toolkits.jetbrains.services.codewhisperer.util.FileContextProvider
84+
import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
8585
import software.aws.toolkits.jetbrains.utils.isInjectedText
8686
import software.aws.toolkits.jetbrains.utils.isQExpired
8787
import software.aws.toolkits.jetbrains.utils.notifyWarn

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererServiceNew.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.model.TriggerTypeI
7474
import software.aws.toolkits.jetbrains.services.codewhisperer.model.WorkerContextNew
7575
import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupManagerNew
7676
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererService.Companion.CODEWHISPERER_CODE_COMPLETION_PERFORMED
77-
import software.aws.toolkits.jetbrains.services.codewhisperer.settings.CodeWhispererSettings
7877
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryServiceNew
7978
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CaretMovement
8079
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeInsightsSettingsFacade
@@ -85,6 +84,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
8584
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.notifyErrorCodeWhispererUsageLimit
8685
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.promptReAuth
8786
import software.aws.toolkits.jetbrains.services.codewhisperer.util.FileContextProvider
87+
import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
8888
import software.aws.toolkits.jetbrains.utils.isInjectedText
8989
import software.aws.toolkits.jetbrains.utils.isQExpired
9090
import software.aws.toolkits.jetbrains.utils.notifyWarn

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/startup/CodeWhispererIntelliSenseAutoTriggerListener.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import com.intellij.codeInsight.lookup.impl.LookupImpl
1111
import com.intellij.openapi.application.runReadAction
1212
import com.intellij.openapi.observable.util.addMouseHoverListener
1313
import com.intellij.ui.hover.HoverListener
14+
import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
1415
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererAutoTriggerService
1516
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererAutomatedTriggerType
16-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererFeatureConfigService
1717
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererServiceNew
1818
import java.awt.Component
1919

0 commit comments

Comments
 (0)