From 3f5e6a79c7d615fc1a6480d475e925d32ce4e95d Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 2 Jul 2021 12:42:19 +0300 Subject: [PATCH] Replace all `throw error(...)` with just `error(...)` `throw` is not needed in this case, because `error(...)` already raises exception (so `throw` is unreachable). Also after previous commit compiler reports `UNREACHABLE_CODE` warning on such `throw` --- .../jetbrains/kotlin/analyzer/AbstractResolverForProject.kt | 2 +- .../js/lower/MoveBodilessDeclarationsToSeparatePlace.kt | 2 +- compiler/psi/src/org/jetbrains/kotlin/psi/KtFile.kt | 2 +- .../src/org/jetbrains/kotlin/js/parser/sourcemaps/JSON.kt | 2 +- .../org/jetbrains/kotlin/generators/gradle/targets/js/main.kt | 4 ++-- .../gradle/targets/js/webpack/KotlinWebpackCssSupport.kt | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AbstractResolverForProject.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AbstractResolverForProject.kt index d238bb481c9..6fe56fb5a1b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AbstractResolverForProject.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AbstractResolverForProject.kt @@ -292,7 +292,7 @@ private object DiagnoseUnknownModuleInfoReporter { else -> errorInModulesResolver(message) } } - else -> throw errorInModulesResolver(message) + else -> errorInModulesResolver(message) } } name.contains(ResolverForProject.resolverForScriptDependenciesName) -> errorInScriptDependenciesInfoResolver(message) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/MoveBodilessDeclarationsToSeparatePlace.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/MoveBodilessDeclarationsToSeparatePlace.kt index b72e04fc5b8..c27ac69d5c5 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/MoveBodilessDeclarationsToSeparatePlace.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/MoveBodilessDeclarationsToSeparatePlace.kt @@ -134,7 +134,7 @@ fun validateIsExternal(packageFragment: IrPackageFragment) { fun validateNestedExternalDeclarations(declaration: IrDeclaration, isExternalTopLevel: Boolean) { fun IrPossiblyExternalDeclaration.checkExternal() { if (isExternal != isExternalTopLevel) { - throw error("isExternal validation failed for declaration ${declaration.render()}") + error("isExternal validation failed for declaration ${declaration.render()}") } } diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtFile.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/KtFile.kt index a51fa7896a3..2b090001660 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtFile.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtFile.kt @@ -190,7 +190,7 @@ open class KtFile(viewProvider: FileViewProvider, val isCompiled: Boolean) : return stub } - throw error("Illegal stub for KtFile: type=${this.javaClass}, stub=${stub?.javaClass} name=$name") + error("Illegal stub for KtFile: type=${this.javaClass}, stub=${stub?.javaClass} name=$name") } override fun getClasses(): Array { diff --git a/js/js.parser/src/org/jetbrains/kotlin/js/parser/sourcemaps/JSON.kt b/js/js.parser/src/org/jetbrains/kotlin/js/parser/sourcemaps/JSON.kt index c708d3ed477..069d2c6d17b 100644 --- a/js/js.parser/src/org/jetbrains/kotlin/js/parser/sourcemaps/JSON.kt +++ b/js/js.parser/src/org/jetbrains/kotlin/js/parser/sourcemaps/JSON.kt @@ -143,7 +143,7 @@ private class JsonParser(val content: String) { fun parse(): JsonNode { val result = parseNode() skipSpaces() - if (charCode != -1) throw error("End of input expected") + if (charCode != -1) error("End of input expected") return result } diff --git a/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/main.kt b/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/main.kt index fd394b787d4..50e4017e527 100644 --- a/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/main.kt +++ b/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/main.kt @@ -59,7 +59,7 @@ fun findLastVersions(packages: List): List { .filter { it.preRelease == null && it.build == null } .maxOrNull() ?.toString() - ?: throw error("There is no applicable version for ${packageInformation.name}") + ?: error("There is no applicable version for ${packageInformation.name}") is HardcodedPackageInformation -> packageInformation.version } @@ -69,4 +69,4 @@ fun findLastVersions(packages: List): List { packageInformation.displayName ) } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackCssSupport.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackCssSupport.kt index fe95b11b3ef..2a8c3d62157 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackCssSupport.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackCssSupport.kt @@ -33,7 +33,7 @@ data class KotlinWebpackCssSupport( } private fun singleRuleError(): Nothing { - throw error("CSS mode shortcut can be applied only with one css rule") + error("CSS mode shortcut can be applied only with one css rule") } } @@ -52,4 +52,4 @@ object KotlinWebpackCssMode { const val EXTRACT = "extract" const val INLINE = "inline" const val IMPORT = "import" -} \ No newline at end of file +}