fix detekt

Author: leigaol

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

@@ -53,7 +53,6 @@ class CodeWhispererEditorManagerNew {
         preview.detail.isAccepted = true
 
         WriteCommandAction.runWriteCommandAction(project) {
-
             ApplicationManager.getApplication().messageBus.syncPublisher(Q_FEATURE_TOPIC)
                 .onEvent(QFeatureEvent.STARTS_EDITING)
             document.replaceString(originalOffset, endOffsetToReplace, reformatted)

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/UserWrittenCodeTracker.kt

@@ -27,7 +27,6 @@ import java.time.Duration
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicInteger
 
-
 @Service(Service.Level.PROJECT)
 class UserWrittenCodeTracker(private val project: Project) : Disposable {
     val userWrittenCodeLineCount = mutableMapOf<CodeWhispererProgrammingLanguage, Long>()
@@ -50,7 +49,7 @@ class UserWrittenCodeTracker(private val project: Project) : Disposable {
             Q_FEATURE_TOPIC,
             object : QFeatureListener {
                 override fun onEvent(event: QFeatureEvent) {
-                    when(event) {
+                    when (event) {
                         QFeatureEvent.INVOCATION -> qInvocationCount.getAndIncrement()
                         QFeatureEvent.STARTS_EDITING -> isQMakingEdits.set(true)
                         QFeatureEvent.FINISHES_EDITING -> isQMakingEdits.set(false)
@@ -121,15 +120,12 @@ class UserWrittenCodeTracker(private val project: Project) : Disposable {
     }
 
     // intelliJ sometimes insert multi spaces for indentation, this is not user written code
-    private fun isIntelliJMultiSpacesInsert(text: String): Boolean {
-        return text.trim { it == ' ' }.isEmpty() && text.length > 1
-    }
-
+    private fun isIntelliJMultiSpacesInsert(text: String) = text.trim { it == ' ' }.isEmpty() && text.length > 1
 
     private fun emitCodeWhispererCodeContribution() {
         val customizationArn: String? = CodeWhispererModelConfigurator.getInstance().activeCustomization(project)?.arn
         for ((language, _) in userWrittenCodeCharacterCount) {
-            if (userWrittenCodeCharacterCount.getOrDefault(language, 0) <= 0 ) {
+            if (userWrittenCodeCharacterCount.getOrDefault(language, 0) <= 0) {
                 continue
             }
             runIfIdcConnectionOrTelemetryEnabled(project) {
@@ -153,7 +149,6 @@ class UserWrittenCodeTracker(private val project: Project) : Disposable {
                 }
             }
         }
-
     }
 
     companion object {
@@ -168,7 +163,6 @@ class UserWrittenCodeTracker(private val project: Project) : Disposable {
             "Q service events",
             QFeatureListener::class.java
         )
-
     }
 
     override fun dispose() {
@@ -187,10 +181,9 @@ class UserWrittenCodeTracker(private val project: Project) : Disposable {
 enum class QFeatureEvent {
     INVOCATION,
     STARTS_EDITING,
-    FINISHES_EDITING
+    FINISHES_EDITING,
 }
 
 interface QFeatureListener {
     fun onEvent(event: QFeatureEvent)
 }
-

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

@@ -6,7 +6,6 @@ package software.aws.toolkits.jetbrains.services.codewhisperer
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.editor.event.DocumentEvent
 import com.intellij.openapi.project.Project
 import com.intellij.testFramework.DisposableRule
 import com.intellij.testFramework.fixtures.CodeInsightTestFixture
@@ -17,13 +16,10 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.mockito.internal.verification.Times
 import org.mockito.kotlin.any
-import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.spy
-import org.mockito.kotlin.verify
 import software.aws.toolkits.core.telemetry.TelemetryBatcher
 import software.aws.toolkits.core.telemetry.TelemetryPublisher
 import software.aws.toolkits.jetbrains.core.MockClientManagerRule
@@ -44,7 +40,7 @@ import software.aws.toolkits.jetbrains.utils.rules.PythonCodeInsightTestFixtureR
 
 internal class UserWrittenCodeTrackerTest {
 
-    protected class TestTelemetryService(
+    internal class TestTelemetryService(
         publisher: TelemetryPublisher = NoOpPublisher(),
         batcher: TelemetryBatcher,
     ) : TelemetryService(publisher, batcher)
@@ -61,12 +57,12 @@ internal class UserWrittenCodeTrackerTest {
     @JvmField
     val mockClientManagerRule = MockClientManagerRule()
 
-    protected lateinit var project: Project
-    protected lateinit var fixture: CodeInsightTestFixture
-    protected lateinit var telemetryServiceSpy: TelemetryService
-    protected lateinit var batcher: TelemetryBatcher
-    protected lateinit var exploreActionManagerMock: CodeWhispererExplorerActionManager
-    protected lateinit var sut: UserWrittenCodeTracker
+    lateinit var project: Project
+    lateinit var fixture: CodeInsightTestFixture
+    lateinit var telemetryServiceSpy: TelemetryService
+    lateinit var batcher: TelemetryBatcher
+    lateinit var exploreActionManagerMock: CodeWhispererExplorerActionManager
+    lateinit var sut: UserWrittenCodeTracker
 
     init {
         this.projectRule = PythonCodeInsightTestFixtureRule()
@@ -113,7 +109,6 @@ internal class UserWrittenCodeTrackerTest {
         assertThat(sut.qInvocationCount.get()).isEqualTo(2)
     }
 
-
     @Test
     fun `test tracker is not listening to multi char input more than 50, but works for less than 50, and will not increment totalTokens - add new code`() {
         sut = UserWrittenCodeTracker.getInstance(project)
@@ -153,7 +148,6 @@ internal class UserWrittenCodeTrackerTest {
         assertThat(sut.userWrittenCodeCharacterCount.getOrDefault(CodeWhispererPython.INSTANCE, 0)).isEqualTo(0)
     }
 
-
     @Test
     fun `test tracker is listening to document changes only when Q is not editing`() {
         sut = UserWrittenCodeTracker.getInstance(project)
@@ -180,13 +174,11 @@ internal class UserWrittenCodeTrackerTest {
         }
         assertThat(sut.userWrittenCodeCharacterCount[CodeWhispererPython.INSTANCE]).isEqualTo(newCode.length.toLong())
         assertThat(sut.userWrittenCodeLineCount[CodeWhispererPython.INSTANCE]).isEqualTo(1)
-
     }
 
     private fun Editor.appendString(string: String) {
         val currentOffset = caretModel.primaryCaret.offset
         document.insertString(currentOffset, string)
         caretModel.moveToOffset(currentOffset + string.length)
     }
-
 }