Skip to content

Commit c86d45d

Browse files
committed
fix wrong project root for @workspace for multi-folder project setup
1 parent dd00e96 commit c86d45d

File tree

1 file changed

+3
-4
lines changed
  • plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/project

1 file changed

+3
-4
lines changed

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/project/ProjectContextProvider.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
99
import com.fasterxml.jackson.module.kotlin.readValue
1010
import com.intellij.openapi.Disposable
1111
import com.intellij.openapi.project.Project
12-
import com.intellij.openapi.project.guessProjectDir
1312
import com.intellij.openapi.vfs.VfsUtilCore
1413
import com.intellij.openapi.vfs.VirtualFile
1514
import com.intellij.openapi.vfs.VirtualFileVisitor
@@ -130,7 +129,7 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
130129
}
131130

132131
private fun initEncryption(): Boolean {
133-
logger.info { "project context: init key for ${project.guessProjectDir()} on port ${encoderServer.port}" }
132+
logger.info { "project context: init key for ${project.basePath} on port ${encoderServer.port}" }
134133
val url = URL("http://localhost:${encoderServer.port}/initialize")
135134
val payload = encoderServer.getEncryptionRequest()
136135
val connection = url.openConnection() as HttpURLConnection
@@ -148,7 +147,7 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
148147
var duration = (System.currentTimeMillis() - indexStartTime).toDouble()
149148
logger.debug { "project context file collection time: ${duration}ms" }
150149
logger.debug { "list of files collected: ${filesResult.files.joinToString("\n")}" }
151-
val projectRoot = project.guessProjectDir()?.path ?: return false
150+
val projectRoot = project.basePath ?: return false
152151
val payload = IndexRequestPayload(filesResult.files, projectRoot, false)
153152
val payloadJson = mapper.writeValueAsString(payload)
154153
val encrypted = encoderServer.encrypt(payloadJson)
@@ -275,7 +274,7 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
275274
var currentTotalFileSize = 0L
276275
val featureDevSessionContext = FeatureDevSessionContext(project)
277276
val allFiles = mutableListOf<VirtualFile>()
278-
project.guessProjectDir()?.let {
277+
project.baseDir?.let {
279278
VfsUtilCore.visitChildrenRecursively(
280279
it,
281280
object : VirtualFileVisitor<Unit>(NO_FOLLOW_SYMLINKS) {

0 commit comments

Comments
 (0)