delet indetaion to get corret offset

Author: evanliu048

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

@@ -228,8 +228,16 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
                     codewhispererEndToEndStart = System.nanoTime()
                 }
 
-                val nextCaretPosition = calculateNextCaretPosition(requestContext, firstValidRecommendation)
-                val nextFileContextInfo = createNextFileContextInfo(requestContext, firstValidRecommendation)
+                val nextCaretPosition = CaretPosition(
+                    line = requestContext.caretPosition.line + firstValidRecommendation.recommendation.content().count { it == '\n' },
+                    offset = requestContext.caretPosition.offset + firstValidRecommendation.recommendation.content().length
+                )
+
+                val nextFileContextInfo = requestContext.fileContextInfo.copy(
+                    caretContext = requestContext.fileContextInfo.caretContext.copy(
+                        leftFileContext = requestContext.fileContextInfo.caretContext.leftFileContext + firstValidRecommendation.recommendation.content()
+                    )
+                )
 
                 val nextRequestContext = requestContext.copy(
                     caretPosition = nextCaretPosition,
@@ -753,37 +761,6 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
         LOG.debug { "Promoted nextInvocationContext to current session and displayed next recommendation." }
     }
 
-    private fun calculateNextCaretPosition(
-        currentRequestContext: RequestContext,
-        firstValidRecommendation: DetailContext,
-    ): CaretPosition {
-        val indent = currentRequestContext.fileContextInfo.caretContext.leftContextOnCurrentLine
-            .takeWhile { it.isWhitespace() }
-        val recommendedText = buildString {
-            append(indent)
-            append(firstValidRecommendation.recommendation.content())
-            if (!endsWith("\n")) {
-                append("\n")
-            }
-        }
-        val lineCount = recommendedText.count { it == '\n' }
-
-        return CaretPosition(
-            line = currentRequestContext.caretPosition.line + lineCount,
-            offset = currentRequestContext.caretPosition.offset + recommendedText.length
-        )
-    }
-
-    private fun createNextFileContextInfo(
-        requestContext: RequestContext,
-        firstValidRecommendation: DetailContext,
-    ): FileContextInfo {
-        val updatedCaretContext = requestContext.fileContextInfo.caretContext.copy(
-            leftFileContext = requestContext.fileContextInfo.caretContext.leftFileContext + firstValidRecommendation.recommendation.content()
-        )
-        return requestContext.fileContextInfo.copy(caretContext = updatedCaretContext)
-    }
-
     private fun sendDiscardedUserDecisionEventForAll(
         requestContext: RequestContext,
         responseContext: ResponseContext,

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

@@ -241,13 +241,12 @@ open class CodeWhispererTestBase {
     }
 
     fun addUserInputAfterInvocation(userInput: String) {
-        val codewhispererServiceSpy = spy(codewhispererService)
         val triggerTypeCaptor = argumentCaptor<TriggerTypeInfo>()
         val editorCaptor = argumentCaptor<Editor>()
         val projectCaptor = argumentCaptor<Project>()
         val psiFileCaptor = argumentCaptor<PsiFile>()
         val latencyContextCaptor = argumentCaptor<LatencyContext>()
-        codewhispererServiceSpy.stub {
+        codewhispererService.stub {
             onGeneric {
                 getRequestContext(
                     triggerTypeCaptor.capture(),
@@ -257,7 +256,7 @@ open class CodeWhispererTestBase {
                     latencyContextCaptor.capture()
                 )
             }.doAnswer {
-                val requestContext = codewhispererServiceSpy.getRequestContext(
+                val requestContext = codewhispererService.getRequestContext(
                     triggerTypeCaptor.firstValue,
                     editorCaptor.firstValue,
                     projectCaptor.firstValue,
@@ -268,6 +267,5 @@ open class CodeWhispererTestBase {
                 requestContext
             }.thenCallRealMethod()
         }
-        ApplicationManager.getApplication().replaceService(CodeWhispererService::class.java, codewhispererServiceSpy, disposableRule.disposable)
     }
 }