File tree Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -72,6 +72,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWh
72
72
import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
73
73
import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
74
74
import software.aws.toolkits.jetbrains.services.codewhisperer.toolwindow.CodeWhispererCodeReferenceManager
75
+ import software.aws.toolkits.jetbrains.services.codewhisperer.util.isWithin
75
76
import software.aws.toolkits.jetbrains.services.cwc.ChatConstants
76
77
import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatRequestData
77
78
import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.TriggerType
@@ -1176,7 +1177,7 @@ class CodeTestChatController(
1176
1177
filePath = activeFile.path,
1177
1178
fileName = activeFile.name,
1178
1179
fileLanguage = programmingLanguage,
1179
- fileInWorkspace = activeFile.path.startsWith (projectRoot.path )
1180
+ fileInWorkspace = activeFile.isWithin (projectRoot)
1180
1181
)
1181
1182
} catch (e: Exception ) {
1182
1183
LOG .debug { " Error checking active file: $e " }
Original file line number Diff line number Diff line change @@ -33,6 +33,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmi
33
33
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CODE_SCAN_CREATE_PAYLOAD_TIMEOUT_IN_SECONDS
34
34
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_CODE_SCAN_TIMEOUT_IN_SECONDS
35
35
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_PAYLOAD_LIMIT_IN_BYTES
36
+ import software.aws.toolkits.jetbrains.services.codewhisperer.util.isWithin
36
37
import software.aws.toolkits.resources.message
37
38
import java.io.File
38
39
import java.nio.file.Path
@@ -88,7 +89,10 @@ class CodeTestSessionConfig(
88
89
LOG .debug { " Creating payload. File selected as root for the context truncation: ${projectRoot.path} " }
89
90
90
91
val payloadMetadata: PayloadMetadata = try {
91
- getProjectPayloadMetadata()
92
+ when {
93
+ ! selectedFile.isWithin(projectRoot) -> cannotFindValidFile(" Selected file is not within the project" )
94
+ else -> getProjectPayloadMetadata()
95
+ }
92
96
} catch (e: Exception ) {
93
97
val errorMessage = when {
94
98
e.message?.contains(" Illegal repetition near index" ) == true -> " Illegal repetition near index"
You can’t perform that action at this time.
0 commit comments