Skip to content

Commit 6e4d052

Browse files
authored
codewhisperer: rollout classifier to 15 lang (#3907)
* codewhisperer: rollout classifier to 15 lang * add changelog
1 parent 56797f0 commit 6e4d052

16 files changed

+70
-485
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "feature",
3+
"description" : "CodeWhisperer: improve auto-suggestions for additional languages"
4+
}

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/editor/CodeWhispererTypedHandler.kt

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@ import com.intellij.openapi.editor.Editor
88
import com.intellij.openapi.project.Project
99
import com.intellij.psi.PsiFile
1010
import kotlinx.coroutines.Job
11-
import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererLanguageManager
1211
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererAutoTriggerService
1312
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererAutomatedTriggerType
14-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererUserGroup
15-
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererUserGroupSettings
1613
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
1714

1815
class CodeWhispererTypedHandler : TypedHandlerDelegate() {
@@ -26,17 +23,7 @@ class CodeWhispererTypedHandler : TypedHandlerDelegate() {
2623
return Result.CONTINUE
2724
}
2825

29-
val language = CodeWhispererLanguageManager.getInstance().getLanguage(psiFiles)
30-
31-
if ((
32-
CodeWhispererUserGroupSettings.getInstance().getUserGroup() == CodeWhispererUserGroup.Classifier &&
33-
language.isClassifierSupported()
34-
) || language.isAllClassifier()
35-
) {
36-
CodeWhispererAutoTriggerService.getInstance().tryInvokeAutoTrigger(editor, CodeWhispererAutomatedTriggerType.Classifier())
37-
} else {
38-
triggerOnIdle = CodeWhispererAutoTriggerService.getInstance().tryInvokeAutoTrigger(editor, CodeWhispererAutomatedTriggerType.IdleTime())
39-
}
26+
CodeWhispererAutoTriggerService.getInstance().tryInvokeAutoTrigger(editor, CodeWhispererAutomatedTriggerType.Classifier())
4027

4128
return Result.CONTINUE
4229
}

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/CodeWhispererProgrammingLanguage.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ abstract class CodeWhispererProgrammingLanguage {
2828

2929
open fun isImportAdderSupported(): Boolean = false
3030

31-
open fun isClassifierSupported(): Boolean = true
32-
33-
open fun isAllClassifier(): Boolean = false
34-
3531
open fun isSupplementalContextSupported(): Boolean = false
3632

3733
open fun isUTGSupported(): Boolean = false

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererCsharp.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ class CodeWhispererCsharp private constructor() : CodeWhispererProgrammingLangua
1313

1414
override fun isCodeCompletionSupported(): Boolean = true
1515

16-
override fun isClassifierSupported(): Boolean = true
17-
18-
override fun isAllClassifier(): Boolean = true
19-
2016
companion object {
2117
const val ID = "csharp"
2218

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererJava.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ class CodeWhispererJava private constructor() : CodeWhispererProgrammingLanguage
2020

2121
override fun isImportAdderSupported(): Boolean = true
2222

23-
override fun isClassifierSupported(): Boolean = true
24-
25-
override fun isAllClassifier(): Boolean = true
26-
2723
override fun isSupplementalContextSupported() = true
2824

2925
override fun isUTGSupported() = true

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererJavaScript.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ class CodeWhispererJavaScript private constructor() : CodeWhispererProgrammingLa
1818

1919
override fun isImportAdderSupported(): Boolean = true
2020

21-
override fun isClassifierSupported(): Boolean = true
22-
23-
override fun isAllClassifier(): Boolean = true
24-
2521
override fun isSupplementalContextSupported() = true
2622

2723
companion object {

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererJsx.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ class CodeWhispererJsx private constructor() : CodeWhispererProgrammingLanguage(
1818

1919
override fun toCodeWhispererRuntimeLanguage(): CodeWhispererProgrammingLanguage = CodeWhispererJavaScript.INSTANCE
2020

21-
override fun isClassifierSupported(): Boolean = true
22-
23-
override fun isAllClassifier(): Boolean = true
24-
2521
override fun isSupplementalContextSupported() = true
2622

2723
companion object {

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererPlainText.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ class CodeWhispererPlainText private constructor() : CodeWhispererProgrammingLan
1111

1212
override fun toTelemetryType(): CodewhispererLanguage = CodewhispererLanguage.Plaintext
1313

14-
override fun isClassifierSupported(): Boolean = false
15-
1614
companion object {
1715
const val ID = "plaintext"
1816

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererPython.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ class CodeWhispererPython private constructor() : CodeWhispererProgrammingLangua
2020

2121
override fun isImportAdderSupported(): Boolean = true
2222

23-
override fun isClassifierSupported(): Boolean = true
24-
25-
override fun isAllClassifier(): Boolean = true
26-
2723
override fun isUTGSupported() = true
2824

2925
override fun isSupplementalContextSupported() = true

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererTsx.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ class CodeWhispererTsx private constructor() : CodeWhispererProgrammingLanguage(
1818

1919
override fun toCodeWhispererRuntimeLanguage(): CodeWhispererProgrammingLanguage = CodeWhispererTypeScript.INSTANCE
2020

21-
override fun isClassifierSupported(): Boolean = true
22-
23-
override fun isAllClassifier(): Boolean = true
24-
2521
override fun isSupplementalContextSupported() = true
2622

2723
companion object {

0 commit comments

Comments
 (0)