Skip to content

Commit f045b1e

Browse files
Will-ShaoHuaWill-ShaoHua
committed
remove isCodewhispererConnected() and replace it with isQConnected()
1 parent a7f2fe4 commit f045b1e

File tree

10 files changed

+30
-29
lines changed

10 files changed

+30
-29
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import com.intellij.openapi.actionSystem.AnAction
1010
import com.intellij.openapi.actionSystem.AnActionEvent
1111
import com.intellij.openapi.project.DumbAware
1212
import software.aws.toolkits.jetbrains.services.amazonq.QConstants
13-
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererEnabled
13+
import software.aws.toolkits.jetbrains.utils.isQConnected
1414
import software.aws.toolkits.resources.message
1515
import java.net.URI
1616

@@ -25,7 +25,7 @@ class CodeWhispererWhatIsAction :
2525

2626
override fun update(e: AnActionEvent) {
2727
e.project?.let {
28-
e.presentation.isEnabledAndVisible = isCodeWhispererEnabled(it)
28+
e.presentation.isEnabledAndVisible = isQConnected(it)
2929
}
3030
}
3131

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import com.intellij.openapi.actionSystem.AnActionEvent
1010
import com.intellij.openapi.actionSystem.impl.SimpleDataContext
1111
import com.intellij.openapi.project.DumbAwareAction
1212
import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanManager
13-
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererEnabled
1413
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererColorUtil.INACTIVE_TEXT_COLOR
1514
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.runScanKey
15+
import software.aws.toolkits.jetbrains.utils.isQConnected
1616
import software.aws.toolkits.resources.message
1717

1818
class CodeWhispererCodeScanRunAction : DumbAwareAction(
@@ -24,7 +24,7 @@ class CodeWhispererCodeScanRunAction : DumbAwareAction(
2424

2525
override fun update(event: AnActionEvent) {
2626
val project = event.project ?: return
27-
event.presentation.isEnabledAndVisible = isCodeWhispererEnabled(project)
27+
event.presentation.isEnabledAndVisible = isQConnected(project)
2828
val scanManager = CodeWhispererCodeScanManager.getInstance(project)
2929
event.presentation.icon = scanManager.getRunActionButtonIcon()
3030
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import com.intellij.openapi.editor.event.EditorFactoryListener
1010
import com.intellij.openapi.editor.impl.EditorImpl
1111
import com.intellij.openapi.fileEditor.FileDocumentManager
1212
import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
13-
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererEnabled
1413
import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
1514
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
1615
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatusNew
1716
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererCodeCoverageTracker
1817
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.UserWrittenCodeTracker
18+
import software.aws.toolkits.jetbrains.utils.isQConnected
1919

2020
class CodeWhispererEditorListener : EditorFactoryListener {
2121
override fun editorCreated(event: EditorFactoryEvent) {
@@ -31,7 +31,7 @@ class CodeWhispererEditorListener : EditorFactoryListener {
3131
// TODO: Track only deletion changes within the current 5-min interval which will give
3232
// the most accurate code percentage data.
3333
override fun documentChanged(event: DocumentEvent) {
34-
if (!isCodeWhispererEnabled(project)) return
34+
if (!isQConnected(project)) return
3535
if (CodeWhispererFeatureConfigService.getInstance().getNewAutoTriggerUX()) {
3636
CodeWhispererInvocationStatusNew.getInstance().documentChanged()
3737
} else {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhisper
6060
import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorUtil.getCaretPosition
6161
import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorUtil.isSupportedJsonFormat
6262
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
63-
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererEnabled
6463
import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererJson
6564
import software.aws.toolkits.jetbrains.services.codewhisperer.model.CaretPosition
6665
import software.aws.toolkits.jetbrains.services.codewhisperer.model.DetailContext
@@ -86,6 +85,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
8685
import software.aws.toolkits.jetbrains.services.codewhisperer.util.FileContextProvider
8786
import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
8887
import software.aws.toolkits.jetbrains.utils.isInjectedText
88+
import software.aws.toolkits.jetbrains.utils.isQConnected
8989
import software.aws.toolkits.jetbrains.utils.isQExpired
9090
import software.aws.toolkits.jetbrains.utils.notifyWarn
9191
import software.aws.toolkits.resources.message
@@ -125,7 +125,7 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
125125
latencyContext: LatencyContext,
126126
) {
127127
val project = editor.project ?: return
128-
if (!isCodeWhispererEnabled(project)) return
128+
if (!isQConnected(project)) return
129129

130130
latencyContext.credentialFetchingStart = System.nanoTime()
131131

@@ -751,7 +751,7 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
751751

752752
fun canDoInvocation(editor: Editor, type: CodewhispererTriggerType): Boolean {
753753
editor.project?.let {
754-
if (!isCodeWhispererEnabled(it)) {
754+
if (!isQConnected(it)) {
755755
return false
756756
}
757757
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhisper
6060
import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorUtil.getCaretPosition
6161
import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorUtil.isSupportedJsonFormat
6262
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
63-
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererEnabled
6463
import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererJson
6564
import software.aws.toolkits.jetbrains.services.codewhisperer.model.CaretPosition
6665
import software.aws.toolkits.jetbrains.services.codewhisperer.model.DetailContextNew
@@ -86,6 +85,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
8685
import software.aws.toolkits.jetbrains.services.codewhisperer.util.FileContextProvider
8786
import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
8887
import software.aws.toolkits.jetbrains.utils.isInjectedText
88+
import software.aws.toolkits.jetbrains.utils.isQConnected
8989
import software.aws.toolkits.jetbrains.utils.isQExpired
9090
import software.aws.toolkits.jetbrains.utils.notifyWarn
9191
import software.aws.toolkits.resources.message
@@ -129,7 +129,7 @@ class CodeWhispererServiceNew(private val cs: CoroutineScope) : Disposable {
129129
latencyContext: LatencyContext,
130130
) {
131131
val project = editor.project ?: return
132-
if (!isCodeWhispererEnabled(project)) return
132+
if (!isQConnected(project)) return
133133

134134
latencyContext.credentialFetchingStart = System.nanoTime()
135135

@@ -778,7 +778,7 @@ class CodeWhispererServiceNew(private val cs: CoroutineScope) : Disposable {
778778

779779
fun canDoInvocation(editor: Editor, type: CodewhispererTriggerType): Boolean {
780780
editor.project?.let {
781-
if (!isCodeWhispererEnabled(it)) {
781+
if (!isQConnected(it)) {
782782
return false
783783
}
784784
}

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
2323
import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManagerListener
2424
import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererLoginType
2525
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
26-
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererEnabled
2726
import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
27+
import software.aws.toolkits.jetbrains.utils.isQConnected
2828
import software.aws.toolkits.resources.message
2929
import java.awt.Font
3030
import java.util.concurrent.TimeUnit
@@ -43,7 +43,7 @@ class CodeWhispererConfigurable(private val project: Project) :
4343

4444
override fun createPanel() = panel {
4545
val connect = project.messageBus.connect(disposable ?: error("disposable wasn't initialized by framework"))
46-
val invoke = isCodeWhispererEnabled(project)
46+
val invoke = isQConnected(project)
4747

4848
// TODO: can we remove message bus subscribe and solely use visible(boolean) / enabled(boolean), consider multi project cases
4949
row {
@@ -55,7 +55,7 @@ class CodeWhispererConfigurable(private val project: Project) :
5555
ToolkitConnectionManagerListener.TOPIC,
5656
object : ToolkitConnectionManagerListener {
5757
override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
58-
visible(!isCodeWhispererEnabled(project))
58+
visible(!isQConnected(project))
5959
}
6060
}
6161
)
@@ -69,7 +69,7 @@ class CodeWhispererConfigurable(private val project: Project) :
6969
ToolkitConnectionManagerListener.TOPIC,
7070
object : ToolkitConnectionManagerListener {
7171
override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
72-
enabled(isCodeWhispererEnabled(project) && !isSso)
72+
enabled(isQConnected(project) && !isSso)
7373
}
7474
}
7575
)
@@ -89,7 +89,7 @@ class CodeWhispererConfigurable(private val project: Project) :
8989
ToolkitConnectionManagerListener.TOPIC,
9090
object : ToolkitConnectionManagerListener {
9191
override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
92-
enabled(isCodeWhispererEnabled(project))
92+
enabled(isQConnected(project))
9393
}
9494
}
9595
)
@@ -132,7 +132,7 @@ class CodeWhispererConfigurable(private val project: Project) :
132132
ToolkitConnectionManagerListener.TOPIC,
133133
object : ToolkitConnectionManagerListener {
134134
override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
135-
enabled(isCodeWhispererEnabled(project))
135+
enabled(isQConnected(project))
136136
}
137137
}
138138
)
@@ -150,7 +150,7 @@ class CodeWhispererConfigurable(private val project: Project) :
150150
ToolkitConnectionManagerListener.TOPIC,
151151
object : ToolkitConnectionManagerListener {
152152
override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
153-
enabled(isCodeWhispererEnabled(project))
153+
enabled(isQConnected(project))
154154
}
155155
}
156156
)
@@ -167,7 +167,7 @@ class CodeWhispererConfigurable(private val project: Project) :
167167
ToolkitConnectionManagerListener.TOPIC,
168168
object : ToolkitConnectionManagerListener {
169169
override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
170-
enabled(isCodeWhispererEnabled(project))
170+
enabled(isQConnected(project))
171171
}
172172
}
173173
)
@@ -181,7 +181,7 @@ class CodeWhispererConfigurable(private val project: Project) :
181181
ToolkitConnectionManagerListener.TOPIC,
182182
object : ToolkitConnectionManagerListener {
183183
override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
184-
enabled(isCodeWhispererEnabled(project))
184+
enabled(isQConnected(project))
185185
}
186186
}
187187
)
@@ -209,7 +209,7 @@ class CodeWhispererConfigurable(private val project: Project) :
209209
ToolkitConnectionManagerListener.TOPIC,
210210
object : ToolkitConnectionManagerListener {
211211
override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
212-
enabled(isCodeWhispererEnabled(project) && !isSso)
212+
enabled(isQConnected(project) && !isSso)
213213
}
214214
}
215215
)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenPr
1818
import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanManager
1919
import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
2020
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererActivationChangedListener
21-
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererEnabled
2221
import software.aws.toolkits.jetbrains.services.codewhisperer.status.CodeWhispererStatusBarWidgetFactory
2322
import software.aws.toolkits.jetbrains.services.codewhisperer.toolwindow.CodeWhispererCodeReferenceManager
2423
import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
24+
import software.aws.toolkits.jetbrains.utils.isQConnected
2525

2626
class CodeWhispererProjectStartupSettingsListener(private val project: Project) :
2727
CodeWhispererActivationChangedListener,
@@ -42,7 +42,7 @@ class CodeWhispererProjectStartupSettingsListener(private val project: Project)
4242
override fun toolWindowShown(toolWindow: ToolWindow) {
4343
super.toolWindowShown(toolWindow)
4444
if (toolWindow.id != ProblemsView.ID) return
45-
if (!isCodeWhispererEnabled(project)) return
45+
if (!isQConnected(project)) return
4646
CodeWhispererCodeScanManager.getInstance(project).buildCodeScanUI()
4747
CodeWhispererCodeScanManager.getInstance(project).showCodeScanUI()
4848
}

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/toolwindow/CodeWhispererCodeReferenceToolWindowFactory.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.intellij.openapi.project.Project
88
import com.intellij.openapi.wm.ToolWindow
99
import com.intellij.openapi.wm.ToolWindowFactory
1010
import com.intellij.ui.components.JBScrollPane
11-
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererEnabled
11+
import software.aws.toolkits.jetbrains.utils.isQConnected
1212
import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
1313

1414
class CodeWhispererCodeReferenceToolWindowFactory : ToolWindowFactory, DumbAware {
@@ -23,7 +23,7 @@ class CodeWhispererCodeReferenceToolWindowFactory : ToolWindowFactory, DumbAware
2323
toolWindow.contentManager.addContent(toolWindowContent)
2424
}
2525

26-
override fun shouldBeAvailable(project: Project): Boolean = isCodeWhispererEnabled(project) && !isRunningOnRemoteBackend()
26+
override fun shouldBeAvailable(project: Project): Boolean = isQConnected(project) && !isRunningOnRemoteBackend()
2727

2828
companion object {
2929
const val id = "aws.codewhisperer.codereference"

‎plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererExplorerActionManagerTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.InteractiveBe
3434
import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererLoginType
3535
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
3636
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererEnabled
37+
import software.aws.toolkits.jetbrains.utils.isQConnected
3738
import java.nio.file.Files
3839
import java.nio.file.Path
3940
import java.nio.file.Paths
@@ -211,6 +212,6 @@ class CodeWhispererExplorerActionManagerTest {
211212
assertThat(activeCwConn).isEqualTo(myConnection)
212213
assertThat(myTokenProvider.state()).isEqualTo(expectedState)
213214
assertThat(CodeWhispererExplorerActionManager.getInstance().checkActiveCodeWhispererConnectionType(project)).isEqualTo(expectedLoginType)
214-
assertThat(isCodeWhispererEnabled(project)).isEqualTo(expectedIsCwEnabled)
215+
assertThat(isQConnected(project)).isEqualTo(expectedIsCwEnabled)
215216
}
216217
}

‎plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererSettingsTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import org.mockito.kotlin.whenever
2424
import software.aws.toolkits.jetbrains.core.ToolWindowHeadlessManagerImpl
2525
import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererLoginType
2626
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExploreActionState
27-
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererEnabled
2827
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererService
2928
import software.aws.toolkits.jetbrains.services.codewhisperer.status.CodeWhispererStatusBarWidgetFactory
3029
import software.aws.toolkits.jetbrains.services.codewhisperer.toolwindow.CodeWhispererCodeReferenceToolWindowFactory
3130
import software.aws.toolkits.jetbrains.settings.CodeWhispererConfiguration
3231
import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
32+
import software.aws.toolkits.jetbrains.utils.isQConnected
3333
import kotlin.test.fail
3434

3535
class CodeWhispererSettingsTest : CodeWhispererTestBase() {
@@ -81,7 +81,7 @@ class CodeWhispererSettingsTest : CodeWhispererTestBase() {
8181
@Test
8282
fun `when isCodeWhispererEnabled is false, user not able to trigger CodeWhisperer manually`() {
8383
whenever(stateManager.checkActiveCodeWhispererConnectionType(projectRule.project)).thenReturn(CodeWhispererLoginType.Logout)
84-
assertThat(isCodeWhispererEnabled(projectRule.project)).isFalse
84+
assertThat(isQConnected(projectRule.project)).isFalse
8585
invokeCodeWhispererService()
8686
verify(codewhispererServiceSpy, never()).showRecommendationsInPopup(any(), any(), any())
8787
}

0 commit comments

Comments
 (0)