Skip to content

Commit 5583c21

Browse files
committed
fixed refresh
1 parent 3307059 commit 5583c21

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

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

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import org.eclipse.lsp4j.ShowDocumentParams
2626
import org.eclipse.lsp4j.ShowDocumentResult
2727
import org.eclipse.lsp4j.ShowMessageRequestParams
2828
import org.slf4j.event.Level
29+
import software.amazon.awssdk.utils.UserHomeDirectoryUtils
2930
import software.aws.toolkits.core.utils.error
3031
import software.aws.toolkits.core.utils.getLogger
3132
import software.aws.toolkits.core.utils.info
@@ -360,30 +361,36 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
360361
return CompletableFuture.completedFuture(Unit)
361362
}
362363

363-
override fun appendFile(params: FileParams): CompletableFuture<Unit> = refreshVfs(params.path, false)
364+
override fun appendFile(params: FileParams): CompletableFuture<Unit> = refreshVfs(params.path)
364365

365-
override fun createDirectory(params: FileParams): CompletableFuture<Unit> = refreshVfs(params.path, true)
366+
override fun createDirectory(params: FileParams): CompletableFuture<Unit> = refreshVfs(params.path)
366367

367-
override fun removeFile(params: FileParams): CompletableFuture<Unit> = refreshVfs(params.path, true)
368+
override fun removeFile(params: FileParams): CompletableFuture<Unit> = refreshVfs(params.path)
368369

369-
override fun writeFile(params: FileParams): CompletableFuture<Unit> = refreshVfs(params.path, false)
370+
override fun writeFile(params: FileParams): CompletableFuture<Unit> = refreshVfs(params.path)
370371

371372
override fun copyFile(params: CopyFileParams): CompletableFuture<Unit> {
372-
refreshVfs(params.oldPath, false)
373-
return refreshVfs(params.newPath, false)
373+
refreshVfs(params.oldPath)
374+
return refreshVfs(params.newPath)
374375
}
375376

376-
fun refreshVfs(path: String, isDirectory: Boolean): CompletableFuture<Unit> {
377+
private fun refreshVfs(path: String): CompletableFuture<Unit> {
378+
val userHomePath = Paths.get(
379+
UserHomeDirectoryUtils.userHomeDirectory(),
380+
".aws",
381+
"amazonq",
382+
"history"
383+
).toString()
384+
if (path.startsWith(userHomePath)) return CompletableFuture()
377385
return try {
378386
CompletableFuture.supplyAsync(
379387
{
380-
VirtualFileManager.getInstance().refreshAndFindFileByNioPath(Path(path))
381-
val vfile = VirtualFileManager.getInstance().findFileByUrl(path) ?: return@supplyAsync
382-
VfsUtil.markDirtyAndRefresh(true, isDirectory, isDirectory, vfile)
388+
VfsUtil.markDirtyAndRefresh(false, true, true, Path(path).toFile())
383389
},
384390
ApplicationManager.getApplication()::invokeLater
385391
)
386392
} catch (e: Exception) {
393+
LOG.warn { "Could not refresh file" }
387394
CompletableFuture.failedFuture(e)
388395
}
389396
}

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/FlareChatCommands.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const val DID_COPY_FILE = "aws/didCopyFile"
3535
const val DID_WRITE_FILE = "aws/didWriteFile"
3636
const val DID_APPEND_FILE = "aws/didAppendFile"
3737
const val DID_REMOVE_FILE = "aws/didRemoveFileOrDirectory"
38-
const val DID_CREATE_DIRECTORY = "aws/didRemoveFileOrDirectory"
38+
const val DID_CREATE_DIRECTORY = "aws/didCreateDirectory"
3939

4040
const val GET_SERIALIZED_CHAT_REQUEST_METHOD = "aws/chat/getSerializedChat"
4141

0 commit comments

Comments
 (0)