Skip to content

Commit d080b87

Browse files
authored
fix(codewhisperer): inlay not supported error in injected editior (#3710)
1 parent 9bedaee commit d080b87

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "Inlay not supported exception in injected editor"
4+
}

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
7171
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.notifyErrorCodeWhispererUsageLimit
7272
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.promptReAuth
7373
import software.aws.toolkits.jetbrains.services.codewhisperer.util.FileContextProvider
74+
import software.aws.toolkits.jetbrains.utils.isInjectedText
7475
import software.aws.toolkits.resources.message
7576
import software.aws.toolkits.telemetry.CodewhispererCompletionType
7677
import software.aws.toolkits.telemetry.CodewhispererSuggestionState
@@ -100,6 +101,8 @@ class CodeWhispererService {
100101
}
101102
return
102103
}
104+
val isInjectedFile = runReadAction { psiFile.isInjectedText() }
105+
if (isInjectedFile) return
103106

104107
val requestContext = try {
105108
getRequestContext(triggerTypeInfo, editor, project, psiFile, latencyContext)

jetbrains-core/src/software/aws/toolkits/jetbrains/utils/PsiUtils.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,16 @@ import com.intellij.psi.PsiElement
1010
fun PsiElement.isTestOrInjectedText(): Boolean {
1111
val project = this.project
1212
val virtualFile = this.containingFile.virtualFile ?: return false
13-
if (virtualFile is VirtualFileWindow) {
13+
if (this.isInjectedText() || ProjectRootManager.getInstance(project).fileIndex.isInTestSourceContent(virtualFile)) {
1414
return true
1515
}
1616

17-
if (ProjectRootManager.getInstance(project).fileIndex.isInTestSourceContent(virtualFile)) {
17+
return false
18+
}
19+
20+
fun PsiElement.isInjectedText(): Boolean {
21+
val virtualFile = this.containingFile.virtualFile ?: return false
22+
if (virtualFile is VirtualFileWindow) {
1823
return true
1924
}
2025

0 commit comments

Comments
 (0)