Skip to content

Commit b932c2c

Browse files
andrewyuqandrewyuq
committed
test fix
1 parent 4f23afb commit b932c2c

18 files changed

+81
-125
lines changed

‎plugins/amazonq/codewhisperer/jetbrains-community/resources/META-INF/plugin-codewhisperer.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
<extensions defaultExtensionNs="com.intellij">
3232
<applicationService serviceInterface="migration.software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator"
3333
serviceImplementation="software.aws.toolkits.jetbrains.services.codewhisperer.customization.DefaultCodeWhispererModelConfigurator"/>
34+
<applicationService serviceInterface="software.aws.toolkit.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus"
35+
serviceImplementation="software.aws.toolkit.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatusNew"/>
3436

3537
<projectService serviceInterface="software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor"
3638
serviceImplementation="software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptorImpl"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import com.intellij.openapi.actionSystem.CommonDataKeys
1010
import com.intellij.openapi.application.ApplicationManager
1111
import com.intellij.openapi.project.DumbAware
1212
import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupManager
13-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatusNew
13+
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
1414
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererServiceNew
1515
import software.aws.toolkits.resources.message
1616

@@ -19,12 +19,12 @@ open class CodeWhispererAcceptAction(title: String = message("codewhisperer.inli
1919

2020
override fun update(e: AnActionEvent) {
2121
e.presentation.isEnabled = e.project != null && e.getData(CommonDataKeys.EDITOR) != null &&
22-
CodeWhispererInvocationStatusNew.getInstance().isDisplaySessionActive()
22+
CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()
2323
}
2424

2525
override fun actionPerformed(e: AnActionEvent) {
2626
val sessionContext = e.project?.getUserData(CodeWhispererServiceNew.KEY_SESSION_CONTEXT) ?: return
27-
if (!CodeWhispererInvocationStatusNew.getInstance().isDisplaySessionActive()) return
27+
if (!CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()) return
2828
ApplicationManager.getApplication().messageBus.syncPublisher(
2929
CodeWhispererPopupManager.CODEWHISPERER_USER_ACTION_PERFORMED
3030
).beforeAccept(sessionContext)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.popup.handlers.Cod
1212
import software.aws.toolkits.jetbrains.services.codewhisperer.popup.handlers.CodeWhispererPopupRightArrowHandler
1313
import software.aws.toolkits.jetbrains.services.codewhisperer.popup.handlers.CodeWhispererPopupTabHandler
1414
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererFeatureConfigService
15-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatusNew
15+
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
1616

1717
class CodeWhispererActionPromoter : ActionPromoter {
1818
override fun promote(actions: MutableList<out AnAction>, context: DataContext): MutableList<AnAction> {
1919
if (CodeWhispererFeatureConfigService.getInstance().getNewAutoTriggerUX()) {
2020
val results = actions.toMutableList()
21-
if (!CodeWhispererInvocationStatusNew.getInstance().isDisplaySessionActive()) return results
21+
if (!CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()) return results
2222

2323
results.sortWith { a, b ->
2424
if (isCodeWhispererForceAction(a)) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import com.intellij.openapi.actionSystem.CommonDataKeys
1010
import com.intellij.openapi.application.ApplicationManager
1111
import com.intellij.openapi.project.DumbAware
1212
import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupManager
13-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatusNew
13+
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
1414
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererServiceNew
1515
import software.aws.toolkits.resources.message
1616

@@ -20,12 +20,12 @@ class CodeWhispererNavigateNextAction : AnAction(message("codewhisperer.inline.n
2020
override fun update(e: AnActionEvent) {
2121
e.presentation.isEnabled = e.project != null &&
2222
e.getData(CommonDataKeys.EDITOR) != null &&
23-
CodeWhispererInvocationStatusNew.getInstance().isDisplaySessionActive()
23+
CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()
2424
}
2525

2626
override fun actionPerformed(e: AnActionEvent) {
2727
val sessionContext = e.project?.getUserData(CodeWhispererServiceNew.KEY_SESSION_CONTEXT) ?: return
28-
if (!CodeWhispererInvocationStatusNew.getInstance().isDisplaySessionActive()) return
28+
if (!CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()) return
2929
ApplicationManager.getApplication().messageBus.syncPublisher(
3030
CodeWhispererPopupManager.CODEWHISPERER_USER_ACTION_PERFORMED
3131
).navigateNext(sessionContext)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import com.intellij.openapi.actionSystem.CommonDataKeys
1010
import com.intellij.openapi.application.ApplicationManager
1111
import com.intellij.openapi.project.DumbAware
1212
import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupManager
13-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatusNew
13+
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
1414
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererServiceNew
1515
import software.aws.toolkits.resources.message
1616

@@ -20,12 +20,12 @@ class CodeWhispererNavigatePrevAction : AnAction(message("codewhisperer.inline.n
2020
override fun update(e: AnActionEvent) {
2121
e.presentation.isEnabled = e.project != null &&
2222
e.getData(CommonDataKeys.EDITOR) != null &&
23-
CodeWhispererInvocationStatusNew.getInstance().isDisplaySessionActive()
23+
CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()
2424
}
2525

2626
override fun actionPerformed(e: AnActionEvent) {
2727
val sessionContext = e.project?.getUserData(CodeWhispererServiceNew.KEY_SESSION_CONTEXT) ?: return
28-
if (!CodeWhispererInvocationStatusNew.getInstance().isDisplaySessionActive()) return
28+
if (!CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()) return
2929
ApplicationManager.getApplication().messageBus.syncPublisher(
3030
CodeWhispererPopupManager.CODEWHISPERER_USER_ACTION_PERFORMED
3131
).navigatePrevious(sessionContext)

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ import com.intellij.openapi.editor.impl.EditorImpl
1111
import com.intellij.openapi.fileEditor.FileDocumentManager
1212
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererEnabled
1313
import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
14-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererFeatureConfigService
1514
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
16-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatusNew
1715
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererCodeCoverageTracker
1816

1917
class CodeWhispererEditorListener : EditorFactoryListener {
@@ -31,11 +29,7 @@ class CodeWhispererEditorListener : EditorFactoryListener {
3129
// the most accurate code percentage data.
3230
override fun documentChanged(event: DocumentEvent) {
3331
if (!isCodeWhispererEnabled(project)) return
34-
if (CodeWhispererFeatureConfigService.getInstance().getNewAutoTriggerUX()) {
35-
CodeWhispererInvocationStatusNew.getInstance().documentChanged()
36-
} else {
37-
CodeWhispererInvocationStatus.getInstance().documentChanged()
38-
}
32+
CodeWhispererInvocationStatus.getInstance().documentChanged()
3933
CodeWhispererCodeCoverageTracker.getInstance(project, language).apply {
4034
activateTrackerIfNotActive()
4135
documentChanged(event)

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/model/CodeWhispererModel.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispere
2121
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererAutoTriggerService
2222
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererAutomatedTriggerType
2323
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererIntelliSenseOnHoverListener
24-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatusNew
24+
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
2525
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererServiceNew
2626
import software.aws.toolkits.jetbrains.services.codewhisperer.service.RequestContext
2727
import software.aws.toolkits.jetbrains.services.codewhisperer.service.RequestContextNew
@@ -179,10 +179,10 @@ data class SessionContextNew(
179179
CodeWhispererTelemetryServiceNew.getInstance().sendUserDecisionEventForAll(
180180
this,
181181
hasAccepted,
182-
CodeWhispererInvocationStatusNew.getInstance().popupStartTimestamp?.let { Duration.between(it, Instant.now()) }
182+
CodeWhispererInvocationStatus.getInstance().popupStartTimestamp?.let { Duration.between(it, Instant.now()) }
183183
)
184184
setIntelliSensePopupAlpha(editor, 0f)
185-
CodeWhispererInvocationStatusNew.getInstance().setDisplaySessionActive(false)
185+
CodeWhispererInvocationStatus.getInstance().setDisplaySessionActive(false)
186186

187187
if (hasAccepted) {
188188
popup?.closeOk(null)
@@ -191,7 +191,7 @@ data class SessionContextNew(
191191
}
192192
popup?.let { Disposer.dispose(it) }
193193
popup = null
194-
CodeWhispererInvocationStatusNew.getInstance().finishInvocation()
194+
CodeWhispererInvocationStatus.getInstance().finishInvocation()
195195
isDisposed = true
196196
}
197197

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class CodeWhispererPopupListener(private val states: InvocationContext) : JBPopu
3030
CodeWhispererInvocationStatus.getInstance().popupStartTimestamp?.let { Duration.between(it, Instant.now()) }
3131
)
3232

33-
CodeWhispererInvocationStatus.getInstance().setPopupActive(false)
33+
CodeWhispererInvocationStatus.getInstance().setDisplaySessionActive(false)
3434
}
3535
}
3636

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ class CodeWhispererPopupManager {
305305
var popupRect = Rectangle(p.x, yBelowLastLine, popupSize.width, popupSize.height)
306306
var shouldHidePopup = false
307307

308-
CodeWhispererInvocationStatus.getInstance().setPopupActive(true)
308+
CodeWhispererInvocationStatus.getInstance().setDisplaySessionActive(true)
309309

310310
// Check if the current editor still has focus. If not, don't show the popup.
311311
val isSameEditorAsTrigger = if (!AppMode.isRemoteDevHost()) {

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.model.InvocationCo
1010
import software.aws.toolkits.jetbrains.services.codewhisperer.model.SessionContextNew
1111
import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupManager
1212
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
13-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatusNew
1413

1514
class CodeWhispererScrollListener(private val states: InvocationContext) : VisibleAreaListener {
1615
override fun visibleAreaChanged(e: VisibleAreaEvent) {
1716
val oldRect = e.oldRectangle
1817
val newRect = e.newRectangle
19-
if (CodeWhispererInvocationStatus.getInstance().isPopupActive() &&
18+
if (CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive() &&
2019
(oldRect.x != newRect.x || oldRect.y != newRect.y)
2120
) {
2221
ApplicationManager.getApplication().messageBus.syncPublisher(
@@ -30,7 +29,7 @@ class CodeWhispererScrollListenerNew(private val sessionContext: SessionContextN
3029
override fun visibleAreaChanged(e: VisibleAreaEvent) {
3130
val oldRect = e.oldRectangle
3231
val newRect = e.newRectangle
33-
if (CodeWhispererInvocationStatusNew.getInstance().isDisplaySessionActive() &&
32+
if (CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive() &&
3433
(oldRect.x != newRect.x || oldRect.y != newRect.y)
3534
) {
3635
ApplicationManager.getApplication().messageBus.syncPublisher(

0 commit comments

Comments
 (0)