Skip to content

Commit f94e290

Browse files
rlirli
committed
cleanup
1 parent 5ac379e commit f94e290

File tree

10 files changed

+29
-33
lines changed

10 files changed

+29
-33
lines changed

‎buildSrc/src/main/kotlin/toolkit-publish-root-conventions.gradle.kts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
55
import org.jetbrains.intellij.platform.gradle.tasks.PatchPluginXmlTask
6+
import org.jetbrains.intellij.platform.gradle.tasks.aware.SplitModeAware
67
import software.aws.toolkits.gradle.intellij.IdeFlavor
78
import software.aws.toolkits.gradle.intellij.toolkitIntelliJ
89

@@ -75,3 +76,8 @@ tasks.runIde {
7576
systemProperty("user.home", home)
7677
environment("HOME", home)
7778
}
79+
80+
val runSplitIde by intellijPlatformTesting.runIde.registering {
81+
splitMode = true
82+
splitModeTarget = SplitModeAware.SplitModeTarget.BACKEND
83+
}

‎plugins/amazonq/build.gradle.kts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
5-
import org.jetbrains.intellij.platform.gradle.tasks.aware.SplitModeAware
64
import software.aws.toolkits.gradle.changelog.tasks.GeneratePluginChangeLog
7-
import software.aws.toolkits.gradle.intellij.IdeFlavor
8-
import software.aws.toolkits.gradle.intellij.IdeVersions
9-
import software.aws.toolkits.gradle.intellij.toolkitIntelliJ
105

116
plugins {
127
id("toolkit-publishing-conventions")
@@ -50,8 +45,3 @@ tasks.check {
5045
}
5146
}
5247
}
53-
54-
val runSplitIde by intellijPlatformTesting.runIde.registering {
55-
splitMode = true
56-
splitModeTarget = SplitModeAware.SplitModeTarget.BACKEND
57-
}

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
package software.aws.toolkits.jetbrains.services.amazonq.toolwindow
55

6-
import com.intellij.idea.AppMode
76
import com.intellij.openapi.Disposable
87
import com.intellij.openapi.util.Disposer
98
import com.intellij.ui.components.JBTextArea
@@ -14,6 +13,7 @@ import com.intellij.ui.dsl.gridLayout.VerticalAlign
1413
import com.intellij.ui.jcef.JBCefApp
1514
import software.aws.toolkits.jetbrains.isDeveloperMode
1615
import software.aws.toolkits.jetbrains.services.amazonq.webview.Browser
16+
import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
1717
import java.awt.event.ActionListener
1818
import javax.swing.JButton
1919

@@ -66,7 +66,7 @@ class AmazonQPanel(private val parent: Disposable) {
6666
private fun init() {
6767
if (!JBCefApp.isSupported()) {
6868
// Fallback to an alternative browser-less solution
69-
if (AppMode.isRemoteDevHost()) {
69+
if (isRunningOnRemoteBackend()) {
7070
webviewContainer.add(JBTextArea("Amazon Q chat is not supported in remote dev environment."))
7171
} else {
7272
webviewContainer.add(JBTextArea("JCEF not supported"))

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/listeners/InlineChatSelectionListener.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33

44
package software.aws.toolkits.jetbrains.services.cwc.inline.listeners
55

6-
import com.intellij.idea.AppMode
76
import com.intellij.openapi.Disposable
87
import com.intellij.openapi.editor.event.SelectionEvent
98
import com.intellij.openapi.editor.event.SelectionListener
109
import software.aws.toolkits.jetbrains.services.cwc.inline.InlineChatEditorHint
10+
import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
1111

1212
class InlineChatSelectionListener : SelectionListener, Disposable {
1313
private val inlineChatEditorHint = InlineChatEditorHint()
1414
override fun selectionChanged(e: SelectionEvent) {
15-
if (AppMode.isRemoteDevHost()) return
15+
if (isRunningOnRemoteBackend()) return
1616
val editor = e.editor
1717
val selectionModel = editor.selectionModel
1818

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/CodeWhispererInlayManager.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
package software.aws.toolkits.jetbrains.services.codewhisperer.inlay
55

6-
import com.intellij.idea.AppMode
76
import com.intellij.openapi.components.Service
87
import com.intellij.openapi.components.service
98
import com.intellij.openapi.editor.Editor
@@ -13,6 +12,7 @@ import com.intellij.openapi.ui.popup.JBPopup
1312
import com.intellij.openapi.util.Disposer
1413
import software.aws.toolkits.jetbrains.services.codewhisperer.model.InvocationContext
1514
import software.aws.toolkits.jetbrains.services.codewhisperer.model.RecommendationChunk
15+
import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
1616

1717
@Service
1818
class CodeWhispererInlayManager {
@@ -41,7 +41,7 @@ class CodeWhispererInlayManager {
4141

4242
if (firstLine.isNotEmpty()) {
4343
val firstLineRenderer =
44-
if (!AppMode.isRemoteDevHost()) {
44+
if (!isRunningOnRemoteBackend()) {
4545
CodeWhispererInlayInlineRenderer(firstLine)
4646
} else {
4747
InlineCompletionRemoteRendererFactory.createLineInlay(editor, firstLine)
@@ -57,7 +57,7 @@ class CodeWhispererInlayManager {
5757
return
5858
}
5959
val otherLinesRenderers =
60-
if (!AppMode.isRemoteDevHost()) {
60+
if (!isRunningOnRemoteBackend()) {
6161
listOf(CodeWhispererInlayBlockRenderer(otherLines))
6262
} else {
6363
InlineCompletionRemoteRendererFactory.createBlockInlays(editor, otherLines.split("\n"))

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/CodeWhispererInlayManagerNew.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
package software.aws.toolkits.jetbrains.services.codewhisperer.inlay
55

6-
import com.intellij.idea.AppMode
76
import com.intellij.openapi.components.Service
87
import com.intellij.openapi.components.service
98
import com.intellij.openapi.editor.EditorCustomElementRenderer
109
import com.intellij.openapi.editor.Inlay
1110
import com.intellij.openapi.util.Disposer
1211
import software.aws.toolkits.jetbrains.services.codewhisperer.model.RecommendationChunk
1312
import software.aws.toolkits.jetbrains.services.codewhisperer.model.SessionContextNew
13+
import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
1414

1515
@Service
1616
class CodeWhispererInlayManagerNew {
@@ -39,7 +39,7 @@ class CodeWhispererInlayManagerNew {
3939

4040
if (firstLine.isNotEmpty()) {
4141
val firstLineRenderer =
42-
if (!AppMode.isRemoteDevHost()) {
42+
if (!isRunningOnRemoteBackend()) {
4343
CodeWhispererInlayInlineRenderer(firstLine)
4444
} else {
4545
InlineCompletionRemoteRendererFactory.createLineInlay(editor, firstLine)
@@ -55,7 +55,7 @@ class CodeWhispererInlayManagerNew {
5555
return
5656
}
5757
val otherLinesRenderers =
58-
if (!AppMode.isRemoteDevHost()) {
58+
if (!isRunningOnRemoteBackend()) {
5959
listOf(CodeWhispererInlayBlockRenderer(otherLines))
6060
} else {
6161
InlineCompletionRemoteRendererFactory.createBlockInlays(editor, otherLines.split("\n"))

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

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

66
import com.intellij.icons.AllIcons
77
import com.intellij.ide.BrowserUtil
8-
import com.intellij.idea.AppMode
98
import com.intellij.openapi.actionSystem.ActionManager
109
import com.intellij.openapi.actionSystem.ActionPlaces
1110
import com.intellij.openapi.actionSystem.ActionToolbar
@@ -34,6 +33,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
3433
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererColorUtil.POPUP_REF_NOTICE_HEX
3534
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.POPUP_BUTTON_TEXT_SIZE
3635
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.POPUP_INFO_TEXT_SIZE
36+
import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
3737
import software.aws.toolkits.resources.message
3838
import java.awt.GridBagLayout
3939
import java.awt.event.MouseAdapter
@@ -87,7 +87,7 @@ class CodeWhispererPopupComponents {
8787
add(recommendationInfoLabel, inlineLabelConstraints)
8888
addHorizontalGlue()
8989
// "More menu" not working in remote dev, it's not so important so disable it for now
90-
if (!AppMode.isRemoteDevHost()) {
90+
if (!isRunningOnRemoteBackend()) {
9191
add(kebabMenu, kebabMenuConstraints)
9292
}
9393
}
@@ -223,7 +223,7 @@ class CodeWhispererPopupComponentsNew {
223223
add(recommendationInfoLabel, inlineLabelConstraints)
224224
addHorizontalGlue()
225225
// "More menu" not working in remote dev, it's not so important so disable it for now
226-
if (!AppMode.isRemoteDevHost()) {
226+
if (!isRunningOnRemoteBackend()) {
227227
add(kebabMenu, kebabMenuConstraints)
228228
}
229229
}

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

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

66
import com.intellij.codeInsight.hint.ParameterInfoController
77
import com.intellij.codeInsight.lookup.LookupManager
8-
import com.intellij.idea.AppMode
98
import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_BACKSPACE
109
import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_ENTER
1110
import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_MOVE_CARET_LEFT
@@ -72,6 +71,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhis
7271
import software.aws.toolkits.jetbrains.services.codewhisperer.toolwindow.CodeWhispererCodeReferenceManager
7372
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererColorUtil.POPUP_DIM_HEX
7473
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.POPUP_INFO_TEXT_SIZE
74+
import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
7575
import software.aws.toolkits.resources.message
7676
import java.awt.Point
7777
import java.awt.Rectangle
@@ -310,7 +310,7 @@ class CodeWhispererPopupManager {
310310
CodeWhispererInvocationStatus.getInstance().setPopupActive(true)
311311

312312
// Check if the current editor still has focus. If not, don't show the popup.
313-
val isSameEditorAsTrigger = if (!AppMode.isRemoteDevHost()) {
313+
val isSameEditorAsTrigger = if (!isRunningOnRemoteBackend()) {
314314
editor.contentComponent.isFocusOwner
315315
} else {
316316
FileEditorManager.getInstance(states.requestContext.project).selectedTextEditorWithRemotes.firstOrNull() == editor
@@ -346,12 +346,12 @@ class CodeWhispererPopupManager {
346346
// TODO: visibleAreaChanged listener is not getting triggered in remote environment when scrolling
347347
if (popup.isVisible) {
348348
// Changing the position of BackendBeAbstractPopup does not work
349-
if (!shouldHidePopup && !AppMode.isRemoteDevHost()) {
349+
if (!shouldHidePopup && !isRunningOnRemoteBackend()) {
350350
popup.setLocation(relativePopupLocationToEditor.screenPoint)
351351
popup.size = popup.preferredContentSize
352352
}
353353
} else {
354-
if (!AppMode.isRemoteDevHost()) {
354+
if (!isRunningOnRemoteBackend()) {
355355
popup.show(relativePopupLocationToEditor)
356356
} else {
357357
// TODO: For now, the popup will always display below the suggestions, without checking
@@ -378,7 +378,7 @@ class CodeWhispererPopupManager {
378378
}
379379

380380
// popup.popupWindow is null in remote host
381-
if (!AppMode.isRemoteDevHost()) {
381+
if (!isRunningOnRemoteBackend()) {
382382
if (shouldHidePopup) {
383383
WindowManager.getInstance().setAlphaModeRatio(popup.popupWindow, 1f)
384384
} else {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package software.aws.toolkits.jetbrains.services.codewhisperer.popup
55

66
import com.intellij.codeInsight.lookup.LookupManager
7-
import com.intellij.idea.AppMode
87
import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_BACKSPACE
98
import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_ENTER
109
import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_ESCAPE
@@ -67,6 +66,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispe
6766
import software.aws.toolkits.jetbrains.services.codewhisperer.toolwindow.CodeWhispererCodeReferenceManager
6867
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererColorUtil.POPUP_DIM_HEX
6968
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.POPUP_INFO_TEXT_SIZE
69+
import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
7070
import software.aws.toolkits.resources.message
7171
import java.awt.Point
7272
import java.awt.Rectangle
@@ -276,12 +276,12 @@ class CodeWhispererPopupManagerNew {
276276
// TODO: visibleAreaChanged listener is not getting triggered in remote environment when scrolling
277277
if (popup.isVisible) {
278278
// Changing the position of BackendBeAbstractPopup does not work
279-
if (!shouldHidePopup && !AppMode.isRemoteDevHost()) {
279+
if (!shouldHidePopup && !isRunningOnRemoteBackend()) {
280280
popup.setLocation(relativePopupLocationToEditor.screenPoint)
281281
popup.size = popup.preferredContentSize
282282
}
283283
} else {
284-
if (!AppMode.isRemoteDevHost()) {
284+
if (!isRunningOnRemoteBackend()) {
285285
if (force && !shouldHidePopup) {
286286
popup.show(relativePopupLocationToEditor)
287287
}

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/status/CodeWhispererStatusBarWidget.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package software.aws.toolkits.jetbrains.services.codewhisperer.status
55

66
import com.intellij.icons.AllIcons
77
import com.intellij.ide.DataManager
8-
import com.intellij.idea.AppMode
98
import com.intellij.openapi.actionSystem.ActionGroup
109
import com.intellij.openapi.actionSystem.ActionManager
1110
import com.intellij.openapi.application.ApplicationManager
@@ -32,6 +31,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispe
3231
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.reconnectCodeWhisperer
3332
import software.aws.toolkits.jetbrains.utils.isQConnected
3433
import software.aws.toolkits.jetbrains.utils.isQExpired
34+
import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
3535
import software.aws.toolkits.resources.message
3636
import java.awt.event.MouseEvent
3737
import javax.swing.Icon
@@ -133,7 +133,7 @@ class CodeWhispererStatusBarWidget(project: Project) :
133133
}
134134
) {
135135
// AnimatedIcon can't serialize over remote host
136-
if (!AppMode.isRemoteDevHost()) {
136+
if (!isRunningOnRemoteBackend()) {
137137
AnimatedIcon.Default()
138138
} else {
139139
AllIcons.Actions.Download

0 commit comments

Comments
 (0)