Skip to content

Commit 5d326bc

Browse files
committed
detekt
1 parent b933941 commit 5d326bc

File tree

2 files changed

+22
-16
lines changed

2 files changed

+22
-16
lines changed

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandler.kt

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class WorkspaceServiceHandler(
9898
val validFiles = events.mapNotNull { event ->
9999
when (event) {
100100
is VFileDeleteEvent -> {
101-
val file = event.file?.takeIf { shouldHandleFile(it) } ?: return@mapNotNull null
101+
val file = event.file.takeIf { shouldHandleFile(it) } ?: return@mapNotNull null
102102
toUriString(file)
103103
}
104104
is VFileMoveEvent -> {
@@ -159,10 +159,12 @@ class WorkspaceServiceHandler(
159159
is VFileCopyEvent -> {
160160
event.newParent.findChild(event.newChildName)?.let { newFile ->
161161
toUriString(newFile)?.let { uri ->
162-
listOf(FileEvent().apply {
163-
this.uri = uri
164-
type = FileChangeType.Created
165-
})
162+
listOf(
163+
FileEvent().apply {
164+
this.uri = uri
165+
type = FileChangeType.Created
166+
}
167+
)
166168
}
167169
} ?: emptyList()
168170
}
@@ -185,14 +187,16 @@ class WorkspaceServiceHandler(
185187
else -> {
186188
event.file?.let { file ->
187189
toUriString(file)?.let { uri ->
188-
listOf(FileEvent().apply {
189-
this.uri = uri
190-
type = when (event) {
191-
is VFileCreateEvent -> FileChangeType.Created
192-
is VFileDeleteEvent -> FileChangeType.Deleted
193-
else -> FileChangeType.Changed
190+
listOf(
191+
FileEvent().apply {
192+
this.uri = uri
193+
type = when (event) {
194+
is VFileCreateEvent -> FileChangeType.Created
195+
is VFileDeleteEvent -> FileChangeType.Deleted
196+
else -> FileChangeType.Changed
197+
}
194198
}
195-
})
199+
)
196200
}
197201
} ?: emptyList()
198202
}

plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandlerTest.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ class WorkspaceServiceHandlerTest {
265265
assertEquals(normalizeFileUri(dirUri.toString()), paramsSlot.captured.files[0].uri)
266266
}
267267

268-
269268
@Test
270269
fun `test didDeleteFiles handles both delete and move events in same batch`() = runTest {
271270
val deleteUri = URI("file:///test/deleteFile")
@@ -628,7 +627,12 @@ class WorkspaceServiceHandlerTest {
628627
}
629628
}
630629

631-
private fun createMockVFileEvent(uri: URI, type: FileChangeType = FileChangeType.Changed, isDirectory: Boolean = false, extension: String = "py"): VFileEvent {
630+
private fun createMockVFileEvent(
631+
uri: URI,
632+
type: FileChangeType = FileChangeType.Changed,
633+
isDirectory: Boolean = false,
634+
extension: String = "py",
635+
): VFileEvent {
632636
val virtualFile = createMockVirtualFile(uri, "test.$extension", isDirectory)
633637
return when (type) {
634638
FileChangeType.Deleted -> mockk<VFileDeleteEvent>()
@@ -681,8 +685,6 @@ class WorkspaceServiceHandlerTest {
681685
}
682686
}
683687

684-
685-
686688
// for windows unit tests
687689
private fun normalizeFileUri(uri: String): String {
688690
if (!System.getProperty("os.name").lowercase().contains("windows")) {

0 commit comments

Comments
 (0)