More safer firsts

WarningImHack3r · Sep 30, 2024 · 32381e5 · 32381e5
1 parent 1192cf3
commit 32381e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/...github/warningimhack3r/npmupdatedependencies/errorsubmitter/GitHubErrorReportSubmitter.kt b/...github/warningimhack3r/npmupdatedependencies/errorsubmitter/GitHubErrorReportSubmitter.kt
@@ -39,7 +39,7 @@ class GitHubErrorReportSubmitter : ErrorReportSubmitter() {
     ): Boolean {
         return try {
             // Base data
-            val event = if (events.isNotEmpty()) events.first() else null
+            val event = events.firstOrNull()
 
             val stackTrace = event?.throwableText ?: ""
             val simpleErrorMessage = if (event != null && !event.message.isNullOrEmpty()) {
@@ -184,7 +184,7 @@ class GitHubErrorReportSubmitter : ErrorReportSubmitter() {
         return IdeFocusManager.getGlobalInstance().lastFocusedFrame?.project ?: run {
             val projectManager = ProjectManager.getInstance()
             val openProjects = projectManager.openProjects
-            if (openProjects.isNotEmpty()) openProjects.first() else projectManager.defaultProject
+            openProjects.firstOrNull() ?: projectManager.defaultProject
         }
     }
 }
diff --git a/...in/kotlin/com/github/warningimhack3r/npmupdatedependencies/ui/banner/DeprecationBanner.kt b/...in/kotlin/com/github/warningimhack3r/npmupdatedependencies/ui/banner/DeprecationBanner.kt
@@ -15,7 +15,6 @@ import com.intellij.ui.EditorNotificationProvider
 import com.intellij.ui.EditorNotifications
 import com.intellij.ui.JBColor
 import com.intellij.util.applyIf
-import com.jetbrains.rd.util.first
 import java.util.function.Function
 import javax.swing.JComponent
 
@@ -79,7 +78,7 @@ class DeprecationBanner : EditorNotificationProvider {
                 createActionLabel(
                     action.toString() + if (deprecationsCount > 1) {
                         " deprecations"
-                    } else " \"${foundDeprecations.first().key}\""
+                    } else " \"${foundDeprecations.keys.firstOrNull()}\""
                 ) {
                     when (action) {
                         Deprecation.Action.REPLACE -> ActionsCommon.replaceAllDeprecations(psiFile)