From 8ad781987e0aebc05263437afad0bb865d652070 Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Mon, 15 May 2023 13:59:24 +0000 Subject: [PATCH] Optimize file extensions usage #KTIJ-25470 Merge-request: KT-MR-10135 Merged-by: Vladimir Dolzhenko --- .../kotlin/scripting/definitions/definitions.kt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/definitions.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/definitions.kt index 826341537a9..e8a02fd0d6c 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/definitions.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/definitions.kt @@ -75,11 +75,15 @@ fun VirtualFile.isNonScript(): Boolean = when (this) { !this.isKotlinFileType() } else -> { - isDirectory || - extension == KotlinFileType.EXTENSION || - extension == JavaFileType.INSTANCE.defaultExtension || - extension == JavaClassFileType.INSTANCE.defaultExtension || - !this.isKotlinFileType() + if (isDirectory) { + true + } else { + val ext = extension + ext == KotlinFileType.EXTENSION || + ext == JavaFileType.DEFAULT_EXTENSION || + ext == JavaClassFileType.INSTANCE.defaultExtension || + !this.isKotlinFileType() + } } }