Fix NPE in Rider SAM wizard (#4776)

rli · web-flow · commit f36a16ee4c64 · 2024-08-15T10:35:04.000-07:00
diff --git a/.changes/next-release/bugfix-63939142-5ec5-46ee-be06-ab013e9f27c7.json b/.changes/next-release/bugfix-63939142-5ec5-46ee-be06-ab013e9f27c7.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix NPE in Rider AWS SAM project wizard (#4768)"
+}
diff --git a/plugins/toolkit/jetbrains-rider/src-241+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGeneratorRoot.kt b/plugins/toolkit/jetbrains-rider/src-241+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGeneratorRoot.kt
@@ -81,8 +81,9 @@ abstract class DotNetSamProjectGeneratorRoot(
     }
 
     private fun validateData() {
-        // first validateData comes from SamInitSelectionPanel constructor...
-        samPanel.validate()?.let {
+        // first validateData comes from SamInitSelectionPanel constructor, so is null...
+        @Suppress("UNNECESSARY_SAFE_CALL")
+        samPanel?.validate()?.let {
             context.statusMessages.add(StatusMessages.Error(it.message))
             return
         }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Fix NPE in Rider AWS SAM project wizard (#4768)"
 +}
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,9 @@ abstract class DotNetSamProjectGeneratorRoot(`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`private fun validateData() {`
`84`		`- // first validateData comes from SamInitSelectionPanel constructor...`
`85`		`- samPanel.validate()?.let {`
	`84`	`+ // first validateData comes from SamInitSelectionPanel constructor, so is null...`
	`85`	`+ @Suppress("UNNECESSARY_SAFE_CALL")`
	`86`	`+ samPanel?.validate()?.let {`
`86`	`87`	`context.statusMessages.add(StatusMessages.Error(it.message))`
`87`	`88`	`return`
`88`	`89`	`}`