From c5f28e395ea5c513d78eea0e31112b6dce22b96d Mon Sep 17 00:00:00 2001 From: LamGC Date: Mon, 28 Mar 2022 23:43:33 +0800 Subject: [PATCH] =?UTF-8?q?refactor(util):=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 使用 Kotlin 语法糖优化不必要的代码. --- scalabot-app/src/main/kotlin/util/Utils.kt | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/scalabot-app/src/main/kotlin/util/Utils.kt b/scalabot-app/src/main/kotlin/util/Utils.kt index bbc7b97..5504f1d 100644 --- a/scalabot-app/src/main/kotlin/util/Utils.kt +++ b/scalabot-app/src/main/kotlin/util/Utils.kt @@ -34,11 +34,7 @@ internal fun File.deepListFiles( this.listFiles(filenameFilter) } else { this.listFiles() - } - - if (files == null) { - return null - } + } ?: return null val result = if (addSelf) mutableSetOf(this) else mutableSetOf() for (file in files) { @@ -48,10 +44,8 @@ internal fun File.deepListFiles( if (!onlyFile) { result.add(file) } - val subFiles = file.deepListFiles(false, onlyFile, fileFilter, filenameFilter) - if (subFiles != null) { - result.addAll(subFiles) - } + val subFiles = file.deepListFiles(false, onlyFile, fileFilter, filenameFilter) ?: continue + result.addAll(subFiles) } } return result.toTypedArray()