Fix NPE calling isInTestSourceContent (#2785)

abrooksv · web-flow · commit fba172644870 · 2021-08-27T15:23:03.000-07:00
diff --git a/.changes/next-release/bugfix-0d3ce222-365f-4cbb-8d1e-b7189e71816d.json b/.changes/next-release/bugfix-0d3ce222-365f-4cbb-8d1e-b7189e71816d.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix NullPointerException calling isInTestSourceContent (#2752)"
+}
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/PsiUtils.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/PsiUtils.kt
@@ -9,7 +9,7 @@ import com.intellij.psi.PsiElement
 
 fun PsiElement.isTestOrInjectedText(): Boolean {
     val project = this.project
-    val virtualFile = this.containingFile.virtualFile
+    val virtualFile = this.containingFile.virtualFile ?: return false
     if (virtualFile is VirtualFileWindow) {
         return true
     }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Fix NullPointerException calling isInTestSourceContent (#2752)"
 +}
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import com.intellij.psi.PsiElement`
`9`	`9`
`10`	`10`	`fun PsiElement.isTestOrInjectedText(): Boolean {`
`11`	`11`	`val project = this.project`
`12`		`- val virtualFile = this.containingFile.virtualFile`
	`12`	`+ val virtualFile = this.containingFile.virtualFile ?: return false`
`13`	`13`	`if (virtualFile is VirtualFileWindow) {`
`14`	`14`	`return true`
`15`	`15`	`}`