File tree Expand file tree Collapse file tree 3 files changed +15
-3
lines changed
plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan Expand file tree Collapse file tree 3 files changed +15
-3
lines changed Original file line number Diff line number Diff line change
1
+ {
2
+ "type" : " bugfix" ,
3
+ "description" : " Resolve a NullPointerException that could occur while handling editor creation event. (#4554)"
4
+ }
Original file line number Diff line number Diff line change @@ -26,6 +26,7 @@ import com.intellij.openapi.ui.MessageDialogBuilder
26
26
import com.intellij.openapi.util.Disposer
27
27
import com.intellij.openapi.util.TextRange
28
28
import com.intellij.openapi.vfs.VirtualFile
29
+ import com.intellij.openapi.vfs.isFile
29
30
import com.intellij.refactoring.suggested.range
30
31
import com.intellij.ui.content.ContentManagerEvent
31
32
import com.intellij.ui.content.ContentManagerListener
@@ -234,7 +235,7 @@ class CodeWhispererCodeScanManager(val project: Project) {
234
235
language = selectedFile?.programmingLanguage() ? : CodeWhispererUnknownLanguage .INSTANCE
235
236
if (scope == CodeWhispererConstants .CodeAnalysisScope .FILE &&
236
237
(
237
- selectedFile == null || ! language.isAutoFileScanSupported() ||
238
+ selectedFile == null || ! language.isAutoFileScanSupported() || ! selectedFile.isFile ||
238
239
runReadAction { (codeScanSessionConfig.fileIndex.isInLibrarySource(selectedFile)) } ||
239
240
selectedFile.fileSystem.protocol == " remoteDeploymentFS"
240
241
)
Original file line number Diff line number Diff line change @@ -6,7 +6,6 @@ package software.aws.toolkits.jetbrains.services.codewhisperer.codescan.listener
6
6
import com.intellij.openapi.editor.event.EditorFactoryEvent
7
7
import com.intellij.openapi.editor.event.EditorFactoryListener
8
8
import com.intellij.openapi.project.Project
9
- import com.intellij.openapi.vfs.isFile
10
9
import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanManager
11
10
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
12
11
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isUserBuilderId
@@ -15,7 +14,15 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
15
14
internal class CodeWhispererCodeScanFileListener (val project : Project ) : EditorFactoryListener {
16
15
override fun editorCreated (event : EditorFactoryEvent ) {
17
16
val actionManager = CodeWhispererExplorerActionManager .getInstance()
18
- if (event.editor.virtualFile.isFile && event.editor.project == project && actionManager.isAutoEnabledForCodeScan() &&
17
+
18
+ if (event.editor.virtualFile == null ) {
19
+ return
20
+ }
21
+ if (event.editor.project != project) {
22
+ return
23
+ }
24
+
25
+ if (actionManager.isAutoEnabledForCodeScan() &&
19
26
! actionManager.isMonthlyQuotaForCodeScansExceeded() && ! isUserBuilderId(project)
20
27
) {
21
28
CodeWhispererCodeScanManager .getInstance(project).createDebouncedRunCodeScan(CodeWhispererConstants .CodeAnalysisScope .FILE )
You can’t perform that action at this time.
0 commit comments