From 5eda5077b90157a80cea914f8c66c14e141cb8b8 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Sat, 4 Nov 2023 03:11:43 +0800 Subject: [PATCH] refactor: replace not to ! --- .../flexilocale/gradle/factory/ExtensionAwareFactory.kt | 4 ++-- .../dsl/configure/FlexiLocaleConfigureExtension.kt | 4 ++-- .../flexilocale/plugin/helper/LocaleAnalysisHelper.kt | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flexilocal-gradle-plugin/src/main/kotlin/com/highcapable/flexilocale/gradle/factory/ExtensionAwareFactory.kt b/flexilocal-gradle-plugin/src/main/kotlin/com/highcapable/flexilocale/gradle/factory/ExtensionAwareFactory.kt index 59513ba..04187b8 100644 --- a/flexilocal-gradle-plugin/src/main/kotlin/com/highcapable/flexilocale/gradle/factory/ExtensionAwareFactory.kt +++ b/flexilocal-gradle-plugin/src/main/kotlin/com/highcapable/flexilocale/gradle/factory/ExtensionAwareFactory.kt @@ -37,7 +37,7 @@ import org.gradle.api.plugins.ExtensionAware */ internal fun ExtensionAware.getOrCreate(name: String, clazz: Class<*>, vararg args: Any?) = name.toSafeExtName().let { sName -> runCatching { extensions.create(sName, clazz, *args).asExtension() }.getOrElse { - if ((it is IllegalArgumentException && it.message?.startsWith("Cannot add extension with name") == true).not()) throw it + if (!(it is IllegalArgumentException && it.message?.startsWith("Cannot add extension with name") == true)) throw it runCatching { extensions.getByName(sName).asExtension() }.getOrNull() ?: FError.make("Create or get extension failed with name \"$sName\"") } } @@ -50,7 +50,7 @@ internal fun ExtensionAware.getOrCreate(name: String, clazz: Class<*>, vararg ar */ internal inline fun ExtensionAware.getOrCreate(name: String, vararg args: Any?) = name.toSafeExtName().let { sName -> runCatching { extensions.create(sName, T::class.java, *args) as T }.getOrElse { - if ((it is IllegalArgumentException && it.message?.startsWith("Cannot add extension with name") == true).not()) throw it + if (!(it is IllegalArgumentException && it.message?.startsWith("Cannot add extension with name") == true)) throw it runCatching { extensions.getByName(sName) as? T? }.getOrNull() ?: FError.make("Create or get extension failed with name \"$sName\"") } } diff --git a/flexilocal-gradle-plugin/src/main/kotlin/com/highcapable/flexilocale/plugin/extension/dsl/configure/FlexiLocaleConfigureExtension.kt b/flexilocal-gradle-plugin/src/main/kotlin/com/highcapable/flexilocale/plugin/extension/dsl/configure/FlexiLocaleConfigureExtension.kt index b58d77c..7339b3f 100644 --- a/flexilocal-gradle-plugin/src/main/kotlin/com/highcapable/flexilocale/plugin/extension/dsl/configure/FlexiLocaleConfigureExtension.kt +++ b/flexilocal-gradle-plugin/src/main/kotlin/com/highcapable/flexilocale/plugin/extension/dsl/configure/FlexiLocaleConfigureExtension.kt @@ -91,13 +91,13 @@ open class FlexiLocaleConfigureExtension internal constructor() { internal fun build(project: Project): IFlexiLocaleConfigs { /** 检查合法包名 */ fun String.checkingValidPackageName() { - if (isNotBlank() && matches("^[a-zA-Z_][a-zA-Z0-9_]*(\\.[a-zA-Z_][a-zA-Z0-9_]*)*$".toRegex()).not()) + if (isNotBlank() && !matches("^[a-zA-Z_][a-zA-Z0-9_]*(\\.[a-zA-Z_][a-zA-Z0-9_]*)*$".toRegex())) FError.make("Invalid package name \"$this\"") } /** 检查合法类名 */ fun String.checkingValidClassName() { - if (isNotBlank() && matches("^[a-zA-Z][a-zA-Z0-9_]*$".toRegex()).not()) + if (isNotBlank() && !matches("^[a-zA-Z][a-zA-Z0-9_]*$".toRegex())) FError.make("Invalid class name \"$this\"") } packageName.checkingValidPackageName() diff --git a/flexilocal-gradle-plugin/src/main/kotlin/com/highcapable/flexilocale/plugin/helper/LocaleAnalysisHelper.kt b/flexilocal-gradle-plugin/src/main/kotlin/com/highcapable/flexilocale/plugin/helper/LocaleAnalysisHelper.kt index 9b06e98..cdcab4d 100644 --- a/flexilocal-gradle-plugin/src/main/kotlin/com/highcapable/flexilocale/plugin/helper/LocaleAnalysisHelper.kt +++ b/flexilocal-gradle-plugin/src/main/kotlin/com/highcapable/flexilocale/plugin/helper/LocaleAnalysisHelper.kt @@ -86,7 +86,7 @@ internal object LocaleAnalysisHelper { */ internal fun start(project: Project, configs: IFlexiLocaleConfigs) { this.configs = configs - if (configs.isEnable.not()) return + if (!configs.isEnable) return checkingConfigsModified(project, configs) initializePlugins(project) val lastMappedStrings: LocaleStringMap = mutableMapOf() @@ -106,7 +106,7 @@ internal object LocaleAnalysisHelper { } }.clear() val isFileModified = mappedStrings != lastMappedStrings - if (isFileModified.not() && isConfigsModified.not()) return + if (!isFileModified && !isConfigsModified) return mappedStrings.clear() mappedStrings.putAll(lastMappedStrings) lastMappedStrings.clear() @@ -172,7 +172,7 @@ internal object LocaleAnalysisHelper { val valuesDirs: LocaleFileMap = mutableMapOf() forEach { it.listFiles()?.filter { dir -> dir.name.startsWith("values") }?.forEach eachDir@{ valuesDir -> - if (valuesDir.exists().not() || valuesDir.isDirectory.not()) return@eachDir + if (!valuesDir.exists() || !valuesDir.isDirectory) return@eachDir val langName = if (valuesDir.name == "values") "default" else valuesDir.name.split("s-").getOrNull(1) ?: return@eachDir if (valuesDirs[langName] == null) valuesDirs[langName] = mutableSetOf() valuesDirs[langName]?.add(valuesDir)