Failsafes empty lists

Resolves #75
Roboroads · Jun 16, 2021 · 56d22d7 · 56d22d7
1 parent c4c5572
commit 56d22d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 - [[#34]](https://github.com/Roboroads/laravel-tinker/issues/34) Setting to change tinker execution root
+### Fixed
+- [[#75]](https://github.com/Roboroads/laravel-tinker/issues/75) Empty directory list of tinker consoles resulting in fatal error.
 ## [2.1.0]
 ### Added
 - Dependabot

diff --git a/src/main/kotlin/nl/deschepers/laraveltinker/util/TinkerConsoleUtil.kt b/src/main/kotlin/nl/deschepers/laraveltinker/util/TinkerConsoleUtil.kt
@@ -11,11 +11,11 @@ import nl.deschepers.laraveltinker.Strings
 
 class TinkerConsoleUtil(val project: Project) {
     fun getLastOpenTinkerConsole(): VirtualFile? {
-        return getTinkerConsoleFiles()?.last()
+        return getTinkerConsoleFiles()?.lastOrNull()
     }
 
     fun getLastOpenOrCreateTinkerConsole(): VirtualFile {
-        val lastOpen = getTinkerConsoleFiles()?.last()
+        val lastOpen = getTinkerConsoleFiles()?.lastOrNull()
         return lastOpen ?: getTinkerConsole(ScratchFileService.Option.create_if_missing)!!
     }