Skip to content

fix(amazonq): Fix bug for @workspace cannot properly locate certain folders for certain project setup #4975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 17, 2024
Merged

fix(amazonq): Fix bug for @workspace cannot properly locate certain folders for certain project setup #4975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c86d45d
fix wrong project root for @workspace for multi-folder project setup
leigaol Oct 16, 2024
6d7a084
change log
leigaol Oct 16, 2024
f8a2669
log
leigaol Oct 16, 2024
bdfa456
Update .changes/next-release/bugfix-9e318f1e-baa7-4d10-98de-edfa70fcd…
leigaol Oct 16, 2024
b940399
collect file from different paths
leigaol Oct 16, 2024
621aee4
Merge branch 'multi_folder' of github.com:leigaol/aws-toolkit-jetbrai…
leigaol Oct 16, 2024
6e764ba
Merge branch 'main' into multi_folder
leigaol Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .changes/next-release/bugfix-9e318f1e-baa7-4d10-98de-edfa70fcd7e0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "`@workspace` cannot properly locate certain folders for certain project setup"
}
8 changes: 4 additions & 4 deletions ...ware/aws/toolkits/jetbrains/services/cwc/editor/context/project/ProjectContextProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.readValue
import com.intellij.openapi.Disposable
import com.intellij.openapi.project.BaseProjectDirectories.Companion.getBaseDirectories
import com.intellij.openapi.project.Project
import com.intellij.openapi.project.guessProjectDir
import com.intellij.openapi.vfs.VfsUtilCore
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.vfs.VirtualFileVisitor
Expand Down Expand Up @@ -130,7 +130,7 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
}

private fun initEncryption(): Boolean {
logger.info { "project context: init key for ${project.guessProjectDir()} on port ${encoderServer.port}" }
logger.info { "project context: init key for ${project.name} on port ${encoderServer.port}" }
val url = URL("http://localhost:${encoderServer.port}/initialize")
val payload = encoderServer.getEncryptionRequest()
val connection = url.openConnection() as HttpURLConnection
Expand All @@ -148,7 +148,7 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
var duration = (System.currentTimeMillis() - indexStartTime).toDouble()
logger.debug { "project context file collection time: ${duration}ms" }
logger.debug { "list of files collected: ${filesResult.files.joinToString("\n")}" }
val projectRoot = project.guessProjectDir()?.path ?: return false
val projectRoot = project.basePath ?: return false
val payload = IndexRequestPayload(filesResult.files, projectRoot, false)
val payloadJson = mapper.writeValueAsString(payload)
val encrypted = encoderServer.encrypt(payloadJson)
Expand Down Expand Up @@ -275,7 +275,7 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
var currentTotalFileSize = 0L
val featureDevSessionContext = FeatureDevSessionContext(project)
val allFiles = mutableListOf<VirtualFile>()
project.guessProjectDir()?.let {
Copy link
Contributor

@rli rli Oct 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably need tests

Copy link
Contributor Author

@leigaol leigaol Oct 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are making a new major LSP release in 1-2 weeks. Tests will be added as part of below PRs

#4970
#4971
#4972
#4978
#4976

project.getBaseDirectories().forEach {
VfsUtilCore.visitChildrenRecursively(
it,
object : VirtualFileVisitor<Unit>(NO_FOLLOW_SYMLINKS) {
Expand Down
Loading