feat(amazonqFeatureDev): add partial code acceptance (#4244)

sannicm · grimalk · web-flow · commit 748e35a6b0a2 · 2024-04-10T11:27:07.000+02:00
Mynah UI already supports an option to handle file clicking. This is being leveraged to add a partial code acceptance feautre to the /dev chat. That is, the user will be able to click through the file changes generated from code generation step to reject them or not. These changes are similar to the ones already implemented for the VSCode toolkit.

---------

Co-authored-by: Nikita Mikhailov &lt;noobgam@amazon.de&gt;
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevApp.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevApp.kt
@@ -39,7 +39,8 @@ class FeatureDevApp : AmazonQApp {
             "chat-item-voted" to IncomingFeatureDevMessage.ChatItemVotedMessage::class,
             "response-body-link-click" to IncomingFeatureDevMessage.ClickedLink::class,
             "insert_code_at_cursor_position" to IncomingFeatureDevMessage.InsertCodeAtCursorPosition::class,
-            "open-diff" to IncomingFeatureDevMessage.OpenDiff::class
+            "open-diff" to IncomingFeatureDevMessage.OpenDiff::class,
+            "file-click" to IncomingFeatureDevMessage.FileClicked::class
         )
 
         scope.launch {
@@ -78,6 +79,7 @@ class FeatureDevApp : AmazonQApp {
             is IncomingFeatureDevMessage.ClickedLink -> inboundAppMessagesHandler.processLinkClick(message)
             is IncomingFeatureDevMessage.InsertCodeAtCursorPosition -> inboundAppMessagesHandler.processInsertCodeAtCursorPosition(message)
             is IncomingFeatureDevMessage.OpenDiff -> inboundAppMessagesHandler.processOpenDiff(message)
+            is IncomingFeatureDevMessage.FileClicked -> inboundAppMessagesHandler.processFileClicked(message)
         }
     }
 
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/InboundAppMessagesHandler.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/InboundAppMessagesHandler.kt
@@ -15,4 +15,5 @@ interface InboundAppMessagesHandler {
     suspend fun processLinkClick(message: IncomingFeatureDevMessage.ClickedLink)
     suspend fun processInsertCodeAtCursorPosition(message: IncomingFeatureDevMessage.InsertCodeAtCursorPosition)
     suspend fun processOpenDiff(message: IncomingFeatureDevMessage.OpenDiff)
+    suspend fun processFileClicked(message: IncomingFeatureDevMessage.FileClicked)
 }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt
@@ -53,6 +53,7 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendC
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendError
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendSystemPrompt
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendUpdatePlaceholder
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.DeletedFileInfo
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.NewFileZipInfo
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.PrepareCodeGenerationState
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.Session
@@ -207,6 +208,31 @@ class FeatureDevController(
         }
     }
 
+    override suspend fun processFileClicked(message: IncomingFeatureDevMessage.FileClicked) {
+        val fileToUpdate = message.filePath
+        val session = getSessionInfo(message.tabId)
+
+        var filePaths: List<NewFileZipInfo> = emptyList()
+        var deletedFiles: List<DeletedFileInfo> = emptyList()
+        when (val state = session.sessionState) {
+            is PrepareCodeGenerationState -> {
+                filePaths = state.filePaths
+                deletedFiles = state.deletedFiles
+            }
+        }
+
+        // Mark the file as rejected or not depending on the previous state
+        filePaths.find { it.zipFilePath == fileToUpdate }?.let { it.rejected = !it.rejected }
+        deletedFiles.find { it.zipFilePath == fileToUpdate }?.let { it.rejected = !it.rejected }
+
+        session.updateFilesPaths(
+            messenger = messenger,
+            tabId = message.tabId,
+            filePaths = filePaths,
+            deletedFiles = deletedFiles
+        )
+    }
+
     private suspend fun newTabOpened(tabId: String) {
         var session: Session? = null
         try {
@@ -256,7 +282,7 @@ class FeatureDevController(
             session = getSessionInfo(tabId)
 
             var filePaths: List<NewFileZipInfo> = emptyList()
-            var deletedFiles: List<String> = emptyList()
+            var deletedFiles: List<DeletedFileInfo> = emptyList()
             var references: List<CodeReference> = emptyList()
 
             when (val state = session.sessionState) {
@@ -268,7 +294,7 @@ class FeatureDevController(
             }
             AmazonqTelemetry.isAcceptedCodeChanges(
                 project = null,
-                amazonqNumberOfFilesAccepted = (filePaths.size + deletedFiles.size) * 1.0,
+                amazonqNumberOfFilesAccepted = (filePaths.filterNot { it.rejected }.size + deletedFiles.filterNot { it.rejected }.size) * 1.0,
                 amazonqConversationId = session.conversationId,
                 enabled = true
             )
@@ -497,7 +523,7 @@ class FeatureDevController(
             val state = session.sessionState
 
             var filePaths: List<NewFileZipInfo> = emptyList()
-            var deletedFiles: List<String> = emptyList()
+            var deletedFiles: List<DeletedFileInfo> = emptyList()
             var references: List<CodeReference> = emptyList()
             var uploadId = ""
 
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessage.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessage.kt
@@ -7,6 +7,8 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.annotation.JsonValue
 import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthFollowUpType
 import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.DeletedFileInfo
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.NewFileZipInfo
 import software.aws.toolkits.jetbrains.services.cwc.messages.CodeReference
 import java.time.Instant
 import java.util.UUID
@@ -69,6 +71,13 @@ sealed interface IncomingFeatureDevMessage : FeatureDevBaseMessage {
         val filePath: String,
         val deleted: Boolean
     ) : IncomingFeatureDevMessage
+
+    data class FileClicked(
+        @JsonProperty("tabID") val tabId: String,
+        val filePath: String,
+        val messageId: String,
+        val actionName: String
+    ) : IncomingFeatureDevMessage
 }
 
 // === UI -> App Messages ===
@@ -121,6 +130,15 @@ data class UpdatePlaceholderMessage(
     type = "updatePlaceholderMessage"
 )
 
+data class FileComponent(
+    @JsonProperty("tabID") override val tabId: String,
+    val filePaths: List<NewFileZipInfo>,
+    val deletedFiles: List<DeletedFileInfo>
+) : UiMessage(
+    tabId = tabId,
+    type = "updateFileComponent"
+)
+
 data class ChatInputEnabledMessage(
     @JsonProperty("tabID") override val tabId: String,
     val enabled: Boolean
@@ -162,8 +180,8 @@ data class AuthNeededException(
 data class CodeResultMessage(
     @JsonProperty("tabID") override val tabId: String,
     val conversationId: String,
-    val filePaths: List<String>,
-    val deletedFiles: List<String>,
+    val filePaths: List<NewFileZipInfo>,
+    val deletedFiles: List<DeletedFileInfo>,
     val references: List<ReducedCodeReference>
 ) : UiMessage(
     tabId = tabId,
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessagePublisherExtensions.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessagePublisherExtensions.kt
@@ -5,6 +5,7 @@ package software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages
 
 import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthNeededState
 import software.aws.toolkits.jetbrains.services.amazonq.messages.MessagePublisher
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.DeletedFileInfo
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.NewFileZipInfo
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.SessionStatePhase
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.licenseText
@@ -56,6 +57,15 @@ suspend fun MessagePublisher.sendSystemPrompt(
     )
 }
 
+suspend fun MessagePublisher.updateFileComponent(tabId: String, filePaths: List<NewFileZipInfo>, deletedFiles: List<DeletedFileInfo>) {
+    val fileComponentMessage = FileComponent(
+        tabId = tabId,
+        filePaths = filePaths,
+        deletedFiles = deletedFiles,
+    )
+    this.publish(fileComponentMessage)
+}
+
 suspend fun MessagePublisher.sendAsyncEventProgress(tabId: String, inProgress: Boolean, message: String? = null) {
     val asyncEventProgressMessage = AsyncEventProgressMessage(
         tabId = tabId,
@@ -171,7 +181,7 @@ suspend fun MessagePublisher.sendCodeResult(
     tabId: String,
     uploadId: String,
     filePaths: List<NewFileZipInfo>,
-    deletedFiles: List<String>,
+    deletedFiles: List<DeletedFileInfo>,
     references: List<CodeReference>
 ) {
     // It is being done this mapping as featureDev currently doesn't support fully references.
@@ -183,7 +193,7 @@ suspend fun MessagePublisher.sendCodeResult(
         CodeResultMessage(
             tabId = tabId,
             conversationId = uploadId,
-            filePaths = filePaths.map { it.zipFilePath },
+            filePaths = filePaths,
             deletedFiles = deletedFiles,
             references = refs
         )
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt
@@ -92,10 +92,11 @@ private suspend fun CodeGenerationState.generateCode(codeGenerationId: String):
                 )
 
                 val newFileInfo = registerNewFiles(newFileContents = codeGenerationStreamResult.new_file_contents)
+                val deletedFileInfo = registerDeletedFiles(deletedFiles = codeGenerationStreamResult.deleted_files)
 
                 return CodeGenerationResult(
                     newFiles = newFileInfo,
-                    deletedFiles = codeGenerationStreamResult.deleted_files,
+                    deletedFiles = deletedFileInfo,
                     references = codeGenerationStreamResult.references
                 )
             }
@@ -109,5 +110,16 @@ private suspend fun CodeGenerationState.generateCode(codeGenerationId: String):
 }
 
 fun registerNewFiles(newFileContents: Map<String, String>): List<NewFileZipInfo> = newFileContents.map {
-    NewFileZipInfo(zipFilePath = it.key, fileContent = it.value)
+    NewFileZipInfo(
+        zipFilePath = it.key,
+        fileContent = it.value,
+        rejected = false
+    )
+}
+
+fun registerDeletedFiles(deletedFiles: List<String>): List<DeletedFileInfo> = deletedFiles.map {
+    DeletedFileInfo(
+        zipFilePath = it,
+        rejected = false
+    )
 }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/PrepareCodeGenerationState.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/PrepareCodeGenerationState.kt
@@ -18,7 +18,7 @@ class PrepareCodeGenerationState(
     override var approach: String,
     private var config: SessionStateConfig,
     val filePaths: List<NewFileZipInfo>,
-    val deletedFiles: List<String>,
+    val deletedFiles: List<DeletedFileInfo>,
     val references: List<CodeReference>,
     var uploadId: String,
     private val currentIteration: Int,
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/Session.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/Session.kt
@@ -11,6 +11,7 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.CODE_GENERATIO
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.clients.FeatureDevClient
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.conversationIdNotFound
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendAsyncEventProgress
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.updateFileComponent
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.createConversation
 import software.aws.toolkits.jetbrains.services.cwc.controller.ReferenceLogController
 import software.aws.toolkits.jetbrains.services.cwc.messages.CodeReference
@@ -90,22 +91,35 @@ class Session(val tabID: String, val project: Project) {
         AmazonqTelemetry.isApproachAccepted(amazonqConversationId = conversationId, enabled = true)
     }
 
+    suspend fun updateFilesPaths(
+        messenger: MessagePublisher,
+        tabId: String,
+        filePaths: List<NewFileZipInfo>,
+        deletedFiles: List<DeletedFileInfo>
+    ) {
+        messenger.updateFileComponent(tabId, filePaths, deletedFiles)
+    }
+
     /**
      * Triggered by the Insert code follow-up button to apply code changes.
      */
-    fun insertChanges(filePaths: List<NewFileZipInfo>, deletedFiles: List<String>, references: List<CodeReference>) {
+    fun insertChanges(filePaths: List<NewFileZipInfo>, deletedFiles: List<DeletedFileInfo>, references: List<CodeReference>) {
         val projectRootPath = context.projectRoot.toNioPath()
 
-        filePaths.forEach {
-            val filePath = projectRootPath.resolve(it.zipFilePath)
-            filePath.parent.createDirectories() // Create directories if needed
-            filePath.writeBytes(it.fileContent.toByteArray(Charsets.UTF_8))
-        }
+        filePaths
+            .filterNot { it.rejected }
+            .forEach {
+                val filePath = projectRootPath.resolve(it.zipFilePath)
+                filePath.parent.createDirectories() // Create directories if needed
+                filePath.writeBytes(it.fileContent.toByteArray(Charsets.UTF_8))
+            }
 
-        deletedFiles.forEach {
-            val deleteFilePath = projectRootPath.resolve(it)
-            deleteFilePath.deleteIfExists()
-        }
+        deletedFiles
+            .filterNot { it.rejected }
+            .forEach {
+                val deleteFilePath = projectRootPath.resolve(it.zipFilePath)
+                deleteFilePath.deleteIfExists()
+            }
 
         ReferenceLogController.addReferenceLog(references, project)
 
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/SessionStateTypes.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/SessionStateTypes.kt
@@ -39,11 +39,17 @@ data class SessionStateConfig(
 data class NewFileZipInfo(
     val zipFilePath: String,
     val fileContent: String,
+    var rejected: Boolean
+)
+
+data class DeletedFileInfo(
+    val zipFilePath: String, // The string is the path of the file to be deleted
+    var rejected: Boolean
 )
 
 data class CodeGenerationResult(
     var newFiles: List<NewFileZipInfo>,
-    var deletedFiles: List<String>, // The string is the path of the file to be deleted
+    var deletedFiles: List<DeletedFileInfo>,
     var references: List<CodeReference>,
 )
 
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/featureDevChatConnector.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/featureDevChatConnector.ts
@@ -8,6 +8,8 @@ import { ExtensionMessage } from '../commands'
 import { TabType, TabsStorage } from '../storages/tabsStorage'
 import { CodeReference } from './amazonqCommonsConnector'
 import { FollowUpGenerator } from '../followUps/generator'
+import { getActions } from '../diffTree/actions'
+import { DiffTreeFileInfo } from '../diffTree/types'
 
 interface ChatPayload {
     chatMessage: string
@@ -26,6 +28,7 @@ export interface ConnectorProps {
     onUpdateAuthentication: (featureDevEnabled: boolean, codeTransformEnabled: boolean, authenticatingTabIDs: string[]) => void
     onNewTab: (tabType: TabType) => void
     tabsStorage: TabsStorage
+    onFileComponentUpdate: (tabID: string, filePaths: DiffTreeFileInfo[], deletedFiles: DiffTreeFileInfo[]) => void
 }
 
 export class Connector {
@@ -39,6 +42,7 @@ export class Connector {
     private readonly onUpdateAuthentication
     private readonly followUpGenerator: FollowUpGenerator
     private readonly onNewTab
+    private readonly onFileComponentUpdate
 
     constructor(props: ConnectorProps) {
         this.sendMessageToExtension = props.sendMessageToExtension
@@ -51,6 +55,7 @@ export class Connector {
         this.onUpdateAuthentication = props.onUpdateAuthentication
         this.followUpGenerator = new FollowUpGenerator()
         this.onNewTab = props.onNewTab
+        this.onFileComponentUpdate = props.onFileComponentUpdate
     }
 
     onCodeInsertToCursorPosition = (
@@ -112,6 +117,17 @@ export class Connector {
             })
         })
 
+    onFileActionClick = (tabID: string, messageId: string, filePath: string, actionName: string): void => {
+        this.sendMessageToExtension({
+            command: 'file-click',
+            tabID,
+            messageId,
+            filePath,
+            actionName,
+            tabType: 'featuredev',
+        })
+    }
+
     private processChatMessage = async (messageData: any): Promise<void> => {
         if (this.onChatAnswerReceived !== undefined) {
             const answer: ChatItem = {
@@ -137,6 +153,10 @@ export class Connector {
 
     private processCodeResultMessage = async (messageData: any): Promise<void> => {
         if (this.onChatAnswerReceived !== undefined) {
+            const actions = getActions([
+                ...messageData.filePaths,
+                ...messageData.deletedFiles,
+            ])
             const answer: ChatItem = {
                 type: ChatItemType.CODE_RESULT,
                 relatedContent: undefined,
@@ -146,8 +166,9 @@ export class Connector {
                 // TODO get the backend to store a message id in addition to conversationID
                 messageId: messageData.messageID ?? messageData.triggerID ?? messageData.conversationID,
                 fileList: {
-                    filePaths: messageData.filePaths,
-                    deletedFiles: messageData.deletedFiles,
+                    filePaths: (messageData.filePaths as DiffTreeFileInfo[]).map(path => path.zipFilePath),
+                    deletedFiles: (messageData.deletedFiles as DiffTreeFileInfo[]).map(path => path.zipFilePath),
+                    actions,
                 },
                 body: '',
             }
@@ -178,6 +199,10 @@ export class Connector {
     }
 
     handleMessageReceive = async (messageData: any): Promise<void> => {
+        if (messageData.type === 'updateFileComponent') {
+            this.onFileComponentUpdate(messageData.tabID, messageData.filePaths, messageData.deletedFiles)
+            return
+        }
         if (messageData.type === 'errorMessage') {
             this.onError(messageData.tabID, messageData.message, messageData.title)
             return
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/commands.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/commands.ts
@@ -37,5 +37,6 @@ type MessageCommand =
     | 'codetransform-open-mvn-build'
     | 'codetransform-view-diff'
     | 'codetransform-view-summary'
+    | 'file-click'
 
 export type ExtensionMessage = Record<string, any> & { command: MessageCommand }
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/connector.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/connector.ts
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/diffTree/actions.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/diffTree/actions.ts
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/diffTree/types.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/diffTree/types.ts
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/main.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/main.ts

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ class FeatureDevApp : AmazonQApp {`
`39`	`39`	`"chat-item-voted" to IncomingFeatureDevMessage.ChatItemVotedMessage::class,`
`40`	`40`	`"response-body-link-click" to IncomingFeatureDevMessage.ClickedLink::class,`
`41`	`41`	`"insert_code_at_cursor_position" to IncomingFeatureDevMessage.InsertCodeAtCursorPosition::class,`
`42`		`- "open-diff" to IncomingFeatureDevMessage.OpenDiff::class`
	`42`	`+ "open-diff" to IncomingFeatureDevMessage.OpenDiff::class,`
	`43`	`+ "file-click" to IncomingFeatureDevMessage.FileClicked::class`
`43`	`44`	`)`
`44`	`45`
`45`	`46`	`scope.launch {`
`@@ -78,6 +79,7 @@ class FeatureDevApp : AmazonQApp {`
`78`	`79`	`is IncomingFeatureDevMessage.ClickedLink -> inboundAppMessagesHandler.processLinkClick(message)`
`79`	`80`	`is IncomingFeatureDevMessage.InsertCodeAtCursorPosition -> inboundAppMessagesHandler.processInsertCodeAtCursorPosition(message)`
`80`	`81`	`is IncomingFeatureDevMessage.OpenDiff -> inboundAppMessagesHandler.processOpenDiff(message)`
	`82`	`+ is IncomingFeatureDevMessage.FileClicked -> inboundAppMessagesHandler.processFileClicked(message)`
`81`	`83`	`}`
`82`	`84`	`}`
`83`	`85`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,5 @@ interface InboundAppMessagesHandler {`
`15`	`15`	`suspend fun processLinkClick(message: IncomingFeatureDevMessage.ClickedLink)`
`16`	`16`	`suspend fun processInsertCodeAtCursorPosition(message: IncomingFeatureDevMessage.InsertCodeAtCursorPosition)`
`17`	`17`	`suspend fun processOpenDiff(message: IncomingFeatureDevMessage.OpenDiff)`
	`18`	`+ suspend fun processFileClicked(message: IncomingFeatureDevMessage.FileClicked)`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,10 +92,11 @@ private suspend fun CodeGenerationState.generateCode(codeGenerationId: String):`
`92`	`92`	`)`
`93`	`93`
`94`	`94`	`val newFileInfo = registerNewFiles(newFileContents = codeGenerationStreamResult.new_file_contents)`
	`95`	`+ val deletedFileInfo = registerDeletedFiles(deletedFiles = codeGenerationStreamResult.deleted_files)`
`95`	`96`
`96`	`97`	`return CodeGenerationResult(`
`97`	`98`	`newFiles = newFileInfo,`
`98`		`- deletedFiles = codeGenerationStreamResult.deleted_files,`
	`99`	`+ deletedFiles = deletedFileInfo,`
`99`	`100`	`references = codeGenerationStreamResult.references`
`100`	`101`	`)`
`101`	`102`	`}`
`@@ -109,5 +110,16 @@ private suspend fun CodeGenerationState.generateCode(codeGenerationId: String):`
`109`	`110`	`}`
`110`	`111`
`111`	`112`	`fun registerNewFiles(newFileContents: Map<String, String>): List<NewFileZipInfo> = newFileContents.map {`
`112`		`- NewFileZipInfo(zipFilePath = it.key, fileContent = it.value)`
	`113`	`+ NewFileZipInfo(`
	`114`	`+ zipFilePath = it.key,`
	`115`	`+ fileContent = it.value,`
	`116`	`+ rejected = false`
	`117`	`+ )`
	`118`	`+}`
	`119`	`+`
	`120`	`+fun registerDeletedFiles(deletedFiles: List<String>): List<DeletedFileInfo> = deletedFiles.map {`
	`121`	`+ DeletedFileInfo(`
	`122`	`+ zipFilePath = it,`
	`123`	`+ rejected = false`
	`124`	`+ )`
`113`	`125`	`}`