Make Amazon Q inline inlay compatiable with JB remote 2024.1+ (#4649)

* Make Amazon Q inline inlay compatiable with JB remote 2024.1+

Adapt the change of APIs for the following:
1. line inlays: InlineSuffixRenderer -> InlineCompletionLineRenderer
2. block inlays: InlineBlockElementRenderer -> InlineCompletionLineRenderer

JB will use InlineCompletionLineRenderer to render inlays in remote
regardless of whether it's single or multi-line inlays.

* detekt

* changelog and addressing comments

---------

Co-authored-by: manodnyab <[email protected]>

Author: andrewyuq

.changes/next-release/bugfix-6f6aaf13-6392-4bf2-ae8c-ac63b920ca53.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q: Fix an issue where inline suggestion will not properly show in JetBrains remote env 2024.1+"
+}

plugins/amazonq/codewhisperer/jetbrains-community/src-232-241/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/InlineCompletionRemoteRendererFactory.kt

@@ -0,0 +1,65 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+package software.aws.toolkits.jetbrains.services.codewhisperer.inlay
+
+import com.intellij.codeInsight.inline.completion.render.InlineBlockElementRenderer
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.editor.EditorCustomElementRenderer
+import com.intellij.openapi.editor.markup.TextAttributes
+import com.intellij.xdebugger.ui.DebuggerColors
+
+// from 232-241.1, we have `InlineSuffixRenderer`, but with 241.2+ it becomes `InlineCompletionLineRenderer`
+// for both line and block inlays. Also InlineBlockElementRenderer is deprecated
+// 242 is not yet handled by this
+object InlineCompletionRemoteRendererFactory {
+    private var hasOldLineConstructor = true
+    private val lineConstructor = run {
+        val clazz =
+            try {
+                Class.forName("com.intellij.codeInsight.inline.completion.render.InlineSuffixRenderer")
+            } catch (e: ClassNotFoundException) {
+                hasOldLineConstructor = false
+                Class.forName("com.intellij.codeInsight.inline.completion.render.InlineCompletionLineRenderer")
+            }
+        if (hasOldLineConstructor) {
+            clazz.getConstructor(Editor::class.java, String::class.java)
+        } else {
+            clazz.getConstructor(Editor::class.java, String::class.java, TextAttributes::class.java)
+        }
+    }
+    private var hasNewBlockConstructor = true
+    private val blockConstructor = run {
+        val clazz =
+            try {
+                Class.forName("com.intellij.codeInsight.inline.completion.render.InlineCompletionLineRenderer")
+            } catch (e: ClassNotFoundException) {
+                hasNewBlockConstructor = false
+                Class.forName("com.intellij.codeInsight.inline.completion.render.InlineBlockElementRenderer")
+            }
+        clazz.getConstructor(Editor::class.java, List::class.java)
+    }
+
+    fun createLineInlay(editor: Editor, text: String): EditorCustomElementRenderer =
+        (
+            if (hasOldLineConstructor) {
+                lineConstructor.newInstance(editor, text)
+            } else {
+                lineConstructor.newInstance(editor, text, editor.colorsScheme.getAttributes(DebuggerColors.INLINED_VALUES_EXECUTION_LINE))
+            }
+            ) as EditorCustomElementRenderer
+
+    fun createBlockInlays(editor: Editor, block: List<String>): List<EditorCustomElementRenderer> =
+        if (hasNewBlockConstructor) {
+            // 241.2+
+            val textBlockClazz = Class.forName("com.intellij.codeInsight.inline.completion.render.InlineCompletionRenderTextBlock")
+            val textBlockConstructor = textBlockClazz.getConstructor(String::class.java, TextAttributes::class.java)
+            block.map {
+                blockConstructor.newInstance(
+                    editor,
+                    listOf(textBlockConstructor.newInstance(it, editor.colorsScheme.getAttributes(DebuggerColors.INLINED_VALUES_EXECUTION_LINE)))
+                ) as EditorCustomElementRenderer
+            }
+        } else {
+            listOf(InlineBlockElementRenderer(editor, block))
+        }
+}

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

@@ -3,8 +3,6 @@
 
 package software.aws.toolkits.jetbrains.services.codewhisperer.inlay
 
-import com.intellij.codeInsight.inline.completion.render.InlineBlockElementRenderer
-import com.intellij.codeInsight.inline.completion.render.InlineSuffixRenderer
 import com.intellij.idea.AppMode
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
@@ -46,7 +44,7 @@ class CodeWhispererInlayManager {
                 if (!AppMode.isRemoteDevHost()) {
                     CodeWhispererInlayInlineRenderer(firstLine)
                 } else {
-                    InlineSuffixRenderer(editor, firstLine)
+                    InlineCompletionRemoteRendererFactory.createLineInlay(editor, firstLine)
                 }
             val inlineInlay = editor.inlayModel.addInlineElement(startOffset, true, firstLineRenderer)
             inlineInlay?.let {
@@ -58,22 +56,25 @@ class CodeWhispererInlayManager {
         if (otherLines.isEmpty()) {
             return
         }
-        val otherLinesRenderer =
+        val otherLinesRenderers =
             if (!AppMode.isRemoteDevHost()) {
-                CodeWhispererInlayBlockRenderer(otherLines)
+                listOf(CodeWhispererInlayBlockRenderer(otherLines))
             } else {
-                InlineBlockElementRenderer(editor, otherLines.split("\n"))
+                InlineCompletionRemoteRendererFactory.createBlockInlays(editor, otherLines.split("\n"))
+            }
+
+        otherLinesRenderers.forEach { otherLinesRenderer ->
+            val blockInlay = editor.inlayModel.addBlockElement(
+                startOffset,
+                true,
+                false,
+                0,
+                otherLinesRenderer
+            )
+            blockInlay?.let {
+                existingInlays.add(it)
+                Disposer.register(popup, it)
             }
-        val blockInlay = editor.inlayModel.addBlockElement(
-            startOffset,
-            true,
-            false,
-            0,
-            otherLinesRenderer
-        )
-        blockInlay?.let {
-            existingInlays.add(it)
-            Disposer.register(popup, it)
         }
     }