From d115a1ff9c30d29c8af95098d602cacc4d202895 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 15 May 2020 17:53:42 +0200 Subject: [PATCH] Minor, fix some warnings such as "unused main argument" in generators --- .../tests/GenerateCompilerTestsAgainstKlib.kt | 4 ++-- .../kotlin/generators/tests/GenerateJava8Tests.kt | 2 +- .../kotlin/generators/tests/GenerateCompilerTests.kt | 12 ++++++------ generators/builtins/generateBuiltIns.kt | 2 +- generators/evaluate/GenerateOperationsMap.kt | 2 +- .../generators/arguments/GenerateGradleOptions.kt | 2 +- .../kotlin/generators/tests/GenerateTests.kt | 2 +- .../kotlin/generators/tests/GenerateTests.kt.as35 | 2 +- .../kotlin/generators/tests/GenerateTests.kt.as36 | 2 +- .../kotlin/generators/tests/GenerateTests.kt.as40 | 2 +- .../kotlin/generators/tests/GenerateJsTests.kt | 2 +- .../tests/generateTestDataForReservedWords.kt | 2 +- .../jetbrains/kotlin/js/test/EncodeSignatureTest.kt | 3 ++- .../jetbrains/kotlin/pill/generateAllTests/Main.java | 8 ++++---- 14 files changed, 24 insertions(+), 23 deletions(-) diff --git a/compiler/tests-against-klib/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTestsAgainstKlib.kt b/compiler/tests-against-klib/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTestsAgainstKlib.kt index cd58a264a43..8170d569a3e 100644 --- a/compiler/tests-against-klib/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTestsAgainstKlib.kt +++ b/compiler/tests-against-klib/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTestsAgainstKlib.kt @@ -5,11 +5,11 @@ package org.jetbrains.kotlin.generators.tests -import org.jetbrains.kotlin.codegen.ir.* +import org.jetbrains.kotlin.codegen.ir.AbstractCompileKotlinAgainstKlibTest import org.jetbrains.kotlin.generators.tests.generator.testGroup import org.jetbrains.kotlin.test.TargetBackend -fun main(args: Array) { +fun main() { System.setProperty("java.awt.headless", "true") testGroup("compiler/tests-against-klib/tests", "compiler/testData") { diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt b/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt index c2ead6b73bd..8e2ada6a118 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.jvm.compiler.AbstractLoadJava8WithPsiClassReadingTes import org.jetbrains.kotlin.jvm.compiler.javac.AbstractLoadJava8UsingJavacTest import org.jetbrains.kotlin.resolve.calls.AbstractEnhancedSignaturesResolvedCallsTest -fun main(args: Array) { +fun main() { System.setProperty("java.awt.headless", "true") testGroup("compiler/tests-java8/tests", "compiler/testData") { diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt index 7e1f72c1259..f3be453bdf4 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt @@ -23,10 +23,10 @@ import org.jetbrains.kotlin.codegen.flags.AbstractWriteFlagsTest import org.jetbrains.kotlin.codegen.ir.* import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.builder.AbstractRawFirBuilderTestCase -import org.jetbrains.kotlin.fir.lightTree.AbstractLightTree2FirConverterTestCase import org.jetbrains.kotlin.fir.java.AbstractFirOldFrontendLightClassesTest import org.jetbrains.kotlin.fir.java.AbstractFirTypeEnhancementTest import org.jetbrains.kotlin.fir.java.AbstractOwnFirTypeEnhancementTest +import org.jetbrains.kotlin.fir.lightTree.AbstractLightTree2FirConverterTestCase import org.jetbrains.kotlin.generators.tests.generator.testGroup import org.jetbrains.kotlin.generators.util.KT_OR_KTS_WITHOUT_DOTS_IN_NAME import org.jetbrains.kotlin.generators.util.KT_WITHOUT_DOTS_IN_NAME @@ -59,7 +59,7 @@ import org.jetbrains.kotlin.types.AbstractTypeBindingTest import org.jetbrains.kotlin.visualizer.fir.AbstractFirVisualizer import org.jetbrains.kotlin.visualizer.psi.AbstractPsiVisualizer -fun main(args: Array) { +fun main() { System.setProperty("java.awt.headless", "true") val excludedFirTestdataPattern = "^(.+)\\.fir\\.kts?\$" @@ -176,10 +176,10 @@ fun main(args: Array) { model("parseCodeFragment/block", testMethod = "doBlockCodeFragmentParsingTest", extension = "kt") } - GenerateRangesCodegenTestData.main(emptyArray()) - GenerateInRangeExpressionTestData.main(emptyArray()) - GenerateSteppedRangesCodegenTestData.main(emptyArray()) - GeneratePrimitiveVsObjectEqualityTestData.main(emptyArray()) + GenerateRangesCodegenTestData.main(emptyArray()) + GenerateInRangeExpressionTestData.main(emptyArray()) + GenerateSteppedRangesCodegenTestData.main(emptyArray()) + GeneratePrimitiveVsObjectEqualityTestData.main(emptyArray()) testClass { model("codegen/box", targetBackend = TargetBackend.JVM) diff --git a/generators/builtins/generateBuiltIns.kt b/generators/builtins/generateBuiltIns.kt index c364f126f7b..b0ed2714b2f 100644 --- a/generators/builtins/generateBuiltIns.kt +++ b/generators/builtins/generateBuiltIns.kt @@ -81,7 +81,7 @@ fun generateBuiltIns(generate: (File, (PrintWriter) -> BuiltInsSourceGenerator) generateUnsignedTypes(UNSIGNED_TYPES_DIR, generate) } -fun main(args: Array) { +fun main() { generateBuiltIns { file, generator -> println("generating $file") file.parentFile?.mkdirs() diff --git a/generators/evaluate/GenerateOperationsMap.kt b/generators/evaluate/GenerateOperationsMap.kt index 2e3f574a5c5..d533028616c 100644 --- a/generators/evaluate/GenerateOperationsMap.kt +++ b/generators/evaluate/GenerateOperationsMap.kt @@ -19,7 +19,7 @@ import java.io.File val DEST_FILE: File = File("compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/OperationsMapGenerated.kt") private val EXCLUDED_FUNCTIONS = listOf("rangeTo", "hashCode", "inc", "dec", "subSequence") -fun main(args: Array) { +fun main() { GeneratorsFileUtil.writeFileIfContentChanged(DEST_FILE, generate()) } diff --git a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt index 9b89d614a99..50e939d17ff 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt @@ -144,7 +144,7 @@ fun generateKotlinGradleOptions(withPrinterToFile: (targetFile: File, Printer.() } -fun main(args: Array) { +fun main() { fun getPrinter(file: File, fn: Printer.()->Unit) { if (!file.exists()) { file.parentFile.mkdirs() diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index a9e6a3f864c..b7bcf867702 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -179,7 +179,7 @@ import org.jetbrains.kotlinx.serialization.AbstractSerializationIrBytecodeListin import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginBytecodeListingTest import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginDiagnosticTest -fun main(args: Array) { +fun main() { System.setProperty("java.awt.headless", "true") testGroup("idea/jvm-debugger/jvm-debugger-test/test", "idea/jvm-debugger/jvm-debugger-test/testData") { diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 index 3414ed8fbf0..0bd2c00c83f 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 @@ -162,7 +162,7 @@ import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginBytecodeLi import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginDiagnosticTest import org.jetbrains.kotlinx.serialization.AbstractSerializationIrBytecodeListingTest -fun main(args: Array) { +fun main() { System.setProperty("java.awt.headless", "true") testGroup("idea/jvm-debugger/jvm-debugger-test/test", "idea/jvm-debugger/jvm-debugger-test/testData") { diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 index 5a89897d114..ef9d8ad88d7 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 @@ -162,7 +162,7 @@ import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginBytecodeLi import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginDiagnosticTest import org.jetbrains.kotlinx.serialization.AbstractSerializationIrBytecodeListingTest -fun main(args: Array) { +fun main() { System.setProperty("java.awt.headless", "true") testGroup("idea/jvm-debugger/jvm-debugger-test/test", "idea/jvm-debugger/jvm-debugger-test/testData") { diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as40 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as40 index 3414ed8fbf0..0bd2c00c83f 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as40 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as40 @@ -162,7 +162,7 @@ import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginBytecodeLi import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginDiagnosticTest import org.jetbrains.kotlinx.serialization.AbstractSerializationIrBytecodeListingTest -fun main(args: Array) { +fun main() { System.setProperty("java.awt.headless", "true") testGroup("idea/jvm-debugger/jvm-debugger-test/test", "idea/jvm-debugger/jvm-debugger-test/testData") { diff --git a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt index bf026933952..77491216a62 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.js.test.semantics.* import org.jetbrains.kotlin.js.test.wasm.semantics.AbstractIrWasmBoxWasmTest import org.jetbrains.kotlin.test.TargetBackend -fun main(args: Array) { +fun main() { System.setProperty("java.awt.headless", "true") // TODO: repair these tests diff --git a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt index 69f0b66fb03..0ead711d12b 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt @@ -39,7 +39,7 @@ private val commonCases: CaseBuilder.(String, String) -> Unit = { testByName, te private val commonCasesWithTestNotRenamed: CaseBuilder.() -> Unit = { commonCases(testNotRenamedByName, testNotRenamedByRef) } -fun main(args: Array) { +fun main() { generateTestDataForReservedWords() } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/EncodeSignatureTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/EncodeSignatureTest.kt index ace53b90545..360201c1037 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/EncodeSignatureTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/EncodeSignatureTest.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.js.test import com.intellij.mock.MockVirtualFileSystem import com.intellij.openapi.Disposable import com.intellij.openapi.util.Disposer +import com.intellij.openapi.vfs.VirtualFileSystem import com.intellij.psi.PsiManager import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment @@ -203,7 +204,7 @@ class EncodeSignatureTest { val project = environment.project val fs = MockVirtualFileSystem() - val file = fs.file("sample.kt", codeSnippet).findFileByPath("/sample.kt") + val file = (fs.file("sample.kt", codeSnippet) as VirtualFileSystem).findFileByPath("/sample.kt")!! val psiManager = PsiManager.getInstance(project) val psiFile = psiManager.findFile(file) as KtFile diff --git a/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java b/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java index 1e87a0aa2d3..430e6a13bec 100644 --- a/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java +++ b/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java @@ -9,10 +9,10 @@ import org.jetbrains.kotlin.generators.tests.*; public class Main { public static void main(String[] args) { - GenerateCompilerTestsKt.main(args); - GenerateTestsKt.main(args); - GenerateJsTestsKt.main(args); - GenerateJava8TestsKt.main(args); + GenerateCompilerTestsKt.main(); + GenerateTestsKt.main(); + GenerateJsTestsKt.main(); + GenerateJava8TestsKt.main(); GenerateRuntimeDescriptorTestsKt.main(); } }