fix userInput and remove unused code

Author: andrewyuq

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

@@ -50,7 +50,6 @@ class CodeWhispererRecommendationAction : AnAction(message("codewhisperer.trigge
         }
 
         val triggerType = TriggerTypeInfo(CodewhispererTriggerType.OnDemand, CodeWhispererAutomatedTriggerType.Unknown())
-        CodeWhispererInvocationStatus.getInstance().timeAtLastManualTrigger = Instant.now()
         val job = if (CodeWhispererFeatureConfigService.getInstance().getNewAutoTriggerUX()) {
             CodeWhispererServiceNew.getInstance().showRecommendationsInPopup(editor, triggerType, latencyContext)
         } else {

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

@@ -131,7 +131,6 @@ class CodeWhispererPopupManager {
                 .recommendationAdded(states, sessionContext)
             return
         }
-        val userInputOriginal = recommendationContext.userInput
         val userInput = recommendationContext.userInput
         val typeaheadOriginal = run {
             val startOffset = states.requestContext.caretPosition.offset
@@ -144,11 +143,11 @@ class CodeWhispererPopupManager {
             // userInput + typeahead
             val prefix = states.requestContext.editor.document.charsSequence
                 .substring(startOffset, currOffset)
-            if (prefix.length < userInputOriginal.length) {
+            if (prefix.length < userInput.length) {
                 cancelPopup(popup)
                 return
             } else {
-                prefix.substring(userInputOriginal.length)
+                prefix.substring(userInput.length)
             }
         }
         val isReverse = indexChange < 0
@@ -284,12 +283,11 @@ class CodeWhispererPopupManager {
         val caretPoint = states.requestContext.editor.offsetToXY(states.requestContext.caretPosition.offset)
         val editor = states.requestContext.editor
         val detailContexts = states.recommendationContext.details
-        val userInputOriginal = states.recommendationContext.userInput
         val userInput = states.recommendationContext.userInput
         val selectedIndex = sessionContext.selectedIndex
         val typeaheadOriginal = sessionContext.typeaheadOriginal
         val typeahead = sessionContext.typeahead
-        val userInputLines = userInputOriginal.split("\n").size - 1
+        val userInputLines = userInput.split("\n").size - 1
         val lineCount = getReformattedRecommendation(detailContexts[selectedIndex], userInput).split("\n").size
         val additionalLines = typeaheadOriginal.split("\n").size - typeahead.split("\n").size
         val popupSize = (popup as AbstractPopup).preferredContentSize

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

@@ -252,8 +252,8 @@ class CodeWhispererPopupManagerNew {
         }
         val editor = sessionContext.editor
         val previews = CodeWhispererServiceNew.getInstance().getAllSuggestionsPreviewInfo()
-        val userInputOriginal = previews[sessionContext.selectedIndex].userInput
-        val userInputLines = userInputOriginal.split("\n").size - 1
+        val userInput = previews[sessionContext.selectedIndex].userInput
+        val userInputLines = userInput.split("\n").size - 1
         val popupSize = (popup as AbstractPopup).preferredContentSize
         val yAboveFirstLine = p.y - popupSize.height + userInputLines * editor.lineHeight
         val popupRect = Rectangle(p.x, yAboveFirstLine, popupSize.width, popupSize.height)

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

@@ -25,7 +25,6 @@ class CodeWhispererInvocationStatus {
     private var timeAtLastInvocationStart: Instant? = null
     var completionShownTime: Instant? = null
         private set
-    var timeAtLastManualTrigger: Instant = Instant.now()
 
     fun checkExistingInvocationAndSet(): Boolean =
         if (isInvokingCodeWhisperer.getAndSet(true)) {
@@ -66,8 +65,6 @@ class CodeWhispererInvocationStatus {
         return timeInDouble
     }
 
-    fun getTimeSinceLastManualTrigger() = Duration.between(timeAtLastManualTrigger, Instant.now()).toMillis().toDouble()
-
     fun hasEnoughDelayToShowCodeWhisperer(): Boolean {
         val timeCanShowCodeWhisperer = timeAtLastDocumentChanged.plusMillis(CodeWhispererConstants.POPUP_DELAY)
         return timeCanShowCodeWhisperer.isBefore(Instant.now())

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

@@ -43,33 +43,5 @@ class CodeWhispererRecommendationManager {
 
     companion object {
         fun getInstance(): CodeWhispererRecommendationManager = service()
-
-        /**
-         * a function to trim extra prefixing new line character (only leave 1 new line character)
-         * example:
-         *  content = "\n\n\nfoo\n\nbar\nbaz"
-         *  return = "\nfoo\n\nbar\nbaz"
-         *
-         * example:
-         *  content = "\n\n\tfoobar\nbaz"
-         *  return = "\n\tfoobar\nbaz"
-         */
-        fun trimExtraPrefixNewLine(content: String): String {
-            if (content.isEmpty()) {
-                return ""
-            }
-
-            val firstChar = content.first()
-            if (firstChar != '\n') {
-                return content
-            }
-
-            var index = 1
-            while (index < content.length && content[index] == '\n') {
-                index++
-            }
-
-            return firstChar + content.substring(index)
-        }
     }
 }

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

@@ -541,28 +541,22 @@ class CodeWhispererServiceNew(private val cs: CoroutineScope) : Disposable {
             return null
         }
 
-        val userInputOriginal = CodeWhispererEditorManagerNew.getInstance().getUserInputSinceInvocation(
-            requestContext.editor,
-            requestContext.caretPosition.offset
-        )
         val userInput =
             if (caretMovement == CaretMovement.NO_CHANGE) {
                 LOG.debug { "Caret position not changed since invocation. Session Id: ${completions.sessionId}" }
                 ""
             } else {
-                userInputOriginal.trimStart().also {
-                    LOG.debug {
-                        "Caret position moved forward since invocation. Session Id: ${completions.sessionId}, " +
-                            "user input since invocation: $userInputOriginal, " +
-                            "user input without leading spaces: $it"
-                    }
-                }
+                LOG.debug { "Caret position moved forward since invocation. Session Id: ${completions.sessionId}" }
+                CodeWhispererEditorManagerNew.getInstance().getUserInputSinceInvocation(
+                    requestContext.editor,
+                    requestContext.caretPosition.offset
+                )
             }
         val detailContexts = CodeWhispererRecommendationManager.getInstance().buildDetailContext(
             userInput,
             completions,
         )
-        val recommendationContext = RecommendationContextNew(detailContexts, userInputOriginal, userInput, visualPosition, jobId)
+        val recommendationContext = RecommendationContextNew(detailContexts, userInput, visualPosition, jobId)
         ongoingRequests[jobId] = buildInvocationContext(requestContext, responseContext, recommendationContext)
         return ongoingRequests[jobId]
     }

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

@@ -122,7 +122,7 @@ class CodeWhispererCodeReferenceComponents(private val project: Project) {
             )
             add(JLabel(" from ").asCodeReferencePanelFont(), inlineLabelConstraints)
             // TODO YUX: reference repository?
-//            add(JLabel(ref.repository), inlineLabelConstraints)
+            add(JLabel(ref.referenceName), inlineLabelConstraints)
         } else {
             add(
                 JLabel(ref.licenseName).apply {
@@ -132,7 +132,7 @@ class CodeWhispererCodeReferenceComponents(private val project: Project) {
             )
             add(JLabel(" from ").asCodeReferencePanelFont(), inlineLabelConstraints)
             // TODO YUX: reference repository?
-//            add(repoNameLink(ref.repository(), ref.referenceUrl), inlineLabelConstraints)
+            add(repoNameLink(ref.referenceName, ref.referenceUrl), inlineLabelConstraints)
         }
 
         if (!lineNums.isNullOrEmpty()) {