fix(/dev): source folder modification now allows any sub-folder

Author: sannicm

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt

@@ -193,7 +193,7 @@ class FeatureDevController(
         when (sessionState) {
             is PrepareCodeGenerationState -> {
                 runInEdt {
-                    val existingFile = VfsUtil.findRelativeFile(message.filePath, session.context.projectRoot)
+                    val existingFile = VfsUtil.findRelativeFile(message.filePath, session.context.currentRoot)
 
                     val leftDiffContent = if (existingFile == null) {
                         EmptyContent()
@@ -606,7 +606,8 @@ class FeatureDevController(
 
     private suspend fun modifyDefaultSourceFolder(tabId: String) {
         val session = getSessionInfo(tabId)
-        val uri = session.context.projectRoot
+        val currentRoot = session.context.currentRoot
+        val projectRoot = session.context.projectRoot
         val fileChooserDescriptor = FileChooserDescriptorFactory.createSingleFolderDescriptor()
 
         val modifyFolderFollowUp = FollowUp(
@@ -619,7 +620,7 @@ class FeatureDevController(
         var reason: String? = null
 
         withContext(EDT) {
-            val selectedFolder = FileChooser.chooseFile(fileChooserDescriptor, context.project, uri)
+            val selectedFolder = FileChooser.chooseFile(fileChooserDescriptor, context.project, currentRoot)
 
             // No folder was selected
             if (selectedFolder == null) {
@@ -635,7 +636,7 @@ class FeatureDevController(
             }
 
             // The folder is not in the workspace
-            if (selectedFolder.parent.path != uri.path) {
+            if (!selectedFolder.path.startsWith(projectRoot.path)) {
                 logger.info { "Selected folder not in workspace: ${selectedFolder.path}" }
 
                 messenger.sendAnswer(
@@ -655,7 +656,7 @@ class FeatureDevController(
 
             logger.info { "Selected correct folder inside workspace: ${selectedFolder.path}" }
 
-            session.context.projectRoot = selectedFolder
+            session.context.currentRoot = selectedFolder
             result = Result.Succeeded
 
             messenger.sendAnswer(

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/Session.kt

@@ -96,16 +96,16 @@ class Session(val tabID: String, val project: Project) {
      * Triggered by the Insert code follow-up button to apply code changes.
      */
     fun insertChanges(filePaths: List<NewFileZipInfo>, deletedFiles: List<DeletedFileInfo>, references: List<CodeReferenceGenerated>) {
-        val projectRootPath = context.projectRoot.toNioPath()
+        val currentRootPath = context.currentRoot.toNioPath()
 
-        filePaths.forEach { resolveAndCreateOrUpdateFile(projectRootPath, it.zipFilePath, it.fileContent) }
+        filePaths.forEach { resolveAndCreateOrUpdateFile(currentRootPath, it.zipFilePath, it.fileContent) }
 
-        deletedFiles.forEach { resolveAndDeleteFile(projectRootPath, it.zipFilePath) }
+        deletedFiles.forEach { resolveAndDeleteFile(currentRootPath, it.zipFilePath) }
 
         ReferenceLogController.addReferenceLog(references, project)
 
         // Taken from https://intellij-support.jetbrains.com/hc/en-us/community/posts/206118439-Refresh-after-external-changes-to-project-structure-and-sources
-        VfsUtil.markDirtyAndRefresh(true, true, true, context.projectRoot)
+        VfsUtil.markDirtyAndRefresh(true, true, true, context.currentRoot)
     }
 
     suspend fun send(msg: String): Interaction {

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/SessionTest.kt

@@ -91,8 +91,8 @@ class SessionTest : FeatureDevTestBase() {
         val mockNewFile = listOf(NewFileZipInfo("test.ts", "testContent", false))
         val mockDeletedFile = listOf(DeletedFileInfo("deletedTest.ts", false))
 
-        session.context.projectRoot = mock()
-        whenever(session.context.projectRoot.toNioPath()).thenReturn(Path(""))
+        session.context.currentRoot = mock()
+        whenever(session.context.currentRoot.toNioPath()).thenReturn(Path(""))
 
         session.insertChanges(mockNewFile, mockDeletedFile, emptyList())
 

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt

@@ -61,9 +61,10 @@ class FeatureDevSessionContext(val project: Project) {
         "dist/"
     ).map { Regex(it) }
 
-    private var _projectRoot = project.guessProjectDir() ?: error("Cannot guess base directory for project ${project.name}")
+    val projectRoot = project.guessProjectDir() ?: error("Cannot guess base directory for project ${project.name}")
+    private var _currentRoot = projectRoot
     private var ignorePatternsWithGitIgnore = emptyList<Regex>()
-    private val gitIgnoreFile = File(projectRoot.path, ".gitignore")
+    private val gitIgnoreFile = File(currentRoot.path, ".gitignore")
 
     init {
         ignorePatternsWithGitIgnore = (ignorePatterns + parseGitIgnore().map { Regex(it) }).toList()
@@ -72,7 +73,7 @@ class FeatureDevSessionContext(val project: Project) {
     fun getProjectZip(): ZipCreationResult {
         val zippedProject = runBlocking {
             withBackgroundProgress(project, message("amazonqFeatureDev.create_plan.background_progress_title")) {
-                zipFiles(projectRoot)
+                zipFiles(currentRoot)
             }
         }
         val checkSum256: String = Base64.getEncoder().encodeToString(DigestUtils.sha256(FileInputStream(zippedProject)))
@@ -152,11 +153,11 @@ class FeatureDevSessionContext(val project: Project) {
         .replace("*", ".*")
         .let { if (it.endsWith("/")) "$it?" else it } // Handle directory-specific patterns by optionally matching trailing slash
 
-    var projectRoot: VirtualFile
+    var currentRoot: VirtualFile
         set(newRoot) {
-            _projectRoot = newRoot
+            _currentRoot = newRoot
         }
-        get() = _projectRoot
+        get() = _currentRoot
 }
 
 data class ZipCreationResult(val payload: File, val checksum: String, val contentLength: Long)