From 6520e9aed65f1603902404096dbae61703109612 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 20 Nov 2015 20:45:04 +0300 Subject: [PATCH] Refactor: AnalyzerScriptParameter -> ScriptParameter --- .../jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt | 6 +-- .../jvm/compiler/CommandLineScriptUtils.java | 6 +-- .../compiler/KotlinToJVMBytecodeCompiler.java | 4 +- .../cli/jvm/config/JVMConfigurationKeys.java | 4 +- .../descriptors/LazyScriptClassMemberScope.kt | 2 +- .../script/AnalyzerScriptParameter.java | 43 ------------------- .../kotlin/script/KotlinScriptDefinition.kt | 7 ++- .../KotlinScriptDefinitionProvider.java | 2 +- .../kotlin/codegen/CodegenTestFiles.java | 6 +-- .../kotlin/codegen/ScriptGenTest.java | 4 +- .../jetbrains/kotlin/scripts/ScriptTest.java | 8 ++-- 11 files changed, 27 insertions(+), 65 deletions(-) delete mode 100644 compiler/frontend/src/org/jetbrains/kotlin/script/AnalyzerScriptParameter.java diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt index a2732845018..8fa3a139f39 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.config.addKotlinSourceRoot import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents -import org.jetbrains.kotlin.script.AnalyzerScriptParameter +import org.jetbrains.kotlin.script.ScriptParameter import org.jetbrains.kotlin.util.PerformanceCounter import org.jetbrains.kotlin.utils.KotlinPaths import org.jetbrains.kotlin.utils.KotlinPathsFromHomeDir @@ -126,10 +126,10 @@ public open class K2JVMCompiler : CLICompiler() { return ExitCode.OK } - configuration.put>(JVMConfigurationKeys.SCRIPT_PARAMETERS, if (arguments.script) + configuration.put>(JVMConfigurationKeys.SCRIPT_PARAMETERS, if (arguments.script) CommandLineScriptUtils.scriptParameters() else - emptyList()) + emptyList()) putAdvancedOptions(configuration, arguments) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java index c4d8987e6ee..d55663fc35b 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.cli.jvm.compiler; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; -import org.jetbrains.kotlin.script.AnalyzerScriptParameter; +import org.jetbrains.kotlin.script.ScriptParameter; import org.jetbrains.kotlin.types.KotlinType; import java.util.Collections; @@ -33,10 +33,10 @@ public class CommandLineScriptUtils { private CommandLineScriptUtils() { } - public static List scriptParameters() { + public static List scriptParameters() { KotlinBuiltIns builtIns = JvmPlatform.INSTANCE$.getBuiltIns(); KotlinType arrayOfStrings = builtIns.getArrayType(INVARIANT, builtIns.getStringType()); - AnalyzerScriptParameter argsParameter = new AnalyzerScriptParameter(ARGS_NAME, arrayOfStrings); + ScriptParameter argsParameter = new ScriptParameter(ARGS_NAME, arrayOfStrings); return Collections.singletonList(argsParameter); } } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index a31b99ceafe..81b1cd51c01 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -60,7 +60,7 @@ import org.jetbrains.kotlin.psi.KtScript; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; -import org.jetbrains.kotlin.script.AnalyzerScriptParameter; +import org.jetbrains.kotlin.script.ScriptParameter; import org.jetbrains.kotlin.script.KotlinScriptDefinition; import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider; import org.jetbrains.kotlin.util.PerformanceCounter; @@ -274,7 +274,7 @@ public class KotlinToJVMBytecodeCompiler { @NotNull KotlinPaths paths, @NotNull KotlinCoreEnvironment environment ) { - List scriptParameters = environment.getConfiguration().getList(JVMConfigurationKeys.SCRIPT_PARAMETERS); + List scriptParameters = environment.getConfiguration().getList(JVMConfigurationKeys.SCRIPT_PARAMETERS); if (!scriptParameters.isEmpty()) { KotlinScriptDefinitionProvider.getInstance(environment.getProject()).addScriptDefinition( new KotlinScriptDefinition(".kts", scriptParameters) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JVMConfigurationKeys.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JVMConfigurationKeys.java index a84b8c4fea8..840156cda8a 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JVMConfigurationKeys.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JVMConfigurationKeys.java @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.CompilerJarLocator; import org.jetbrains.kotlin.config.CompilerConfigurationKey; import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents; import org.jetbrains.kotlin.modules.Module; -import org.jetbrains.kotlin.script.AnalyzerScriptParameter; +import org.jetbrains.kotlin.script.ScriptParameter; import java.util.List; @@ -28,7 +28,7 @@ public class JVMConfigurationKeys { private JVMConfigurationKeys() { } - public static final CompilerConfigurationKey> SCRIPT_PARAMETERS = + public static final CompilerConfigurationKey> SCRIPT_PARAMETERS = CompilerConfigurationKey.create("script"); public static final CompilerConfigurationKey DISABLE_CALL_ASSERTIONS = diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt index 40ace1a6610..5e01fc7df34 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt @@ -57,7 +57,7 @@ public class LazyScriptClassMemberScope( val scriptDefinition = KotlinScriptDefinitionProvider.getInstance(file.project).findScriptDefinition(file) return scriptDefinition.scriptParameters.mapIndexed { index, scriptParameter -> ValueParameterDescriptorImpl( - constructor, null, index, Annotations.EMPTY, scriptParameter.getName(), scriptParameter.getType(), + constructor, null, index, Annotations.EMPTY, scriptParameter.name, scriptParameter.type, /* declaresDefaultValue = */ false, /* isCrossinline = */ false, /* isNoinline = */ false, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/script/AnalyzerScriptParameter.java b/compiler/frontend/src/org/jetbrains/kotlin/script/AnalyzerScriptParameter.java deleted file mode 100644 index c3a972c06ca..00000000000 --- a/compiler/frontend/src/org/jetbrains/kotlin/script/AnalyzerScriptParameter.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.script; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.types.KotlinType; - -public class AnalyzerScriptParameter { - @NotNull - private final Name name; - @NotNull - private final KotlinType type; - - public AnalyzerScriptParameter(@NotNull Name name, @NotNull KotlinType type) { - this.name = name; - this.type = type; - } - - @NotNull - public Name getName() { - return name; - } - - @NotNull - public KotlinType getType() { - return type; - } -} diff --git a/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt index 64f788769b2..ae108918409 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt @@ -16,4 +16,9 @@ package org.jetbrains.kotlin.script -class KotlinScriptDefinition(val extension: String, val scriptParameters: List) \ No newline at end of file +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.types.KotlinType + +class KotlinScriptDefinition(val extension: String, val scriptParameters: List) + +class ScriptParameter(val name: Name, val type: KotlinType) \ No newline at end of file diff --git a/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.java index 99fe5d38757..29ddeced266 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.java @@ -30,7 +30,7 @@ public class KotlinScriptDefinitionProvider { private final Set scriptsFiles = new HashSet(); private static final KotlinScriptDefinition - standardScript = new KotlinScriptDefinition(KotlinParserDefinition.STD_SCRIPT_EXT, Collections.emptyList()); + standardScript = new KotlinScriptDefinition(KotlinParserDefinition.STD_SCRIPT_EXT, Collections.emptyList()); public static KotlinScriptDefinitionProvider getInstance(Project project) { return ServiceManager.getService(project, KotlinScriptDefinitionProvider.class); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java index 5bf48fa932c..9588f5d9045 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.AnalyzingUtils; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; -import org.jetbrains.kotlin.script.AnalyzerScriptParameter; +import org.jetbrains.kotlin.script.ScriptParameter; import org.jetbrains.kotlin.script.KotlinScriptDefinition; import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider; import org.jetbrains.kotlin.test.KotlinTestUtils; @@ -117,7 +117,7 @@ public class CodegenTestFiles { expectedValues.add(Pair.create(fieldName, expectedValue)); } - List scriptParameterTypes = Lists.newArrayList(); + List scriptParameterTypes = Lists.newArrayList(); List scriptParameterValues = Lists.newArrayList(); if (file.isScript()) { @@ -152,7 +152,7 @@ public class CodegenTestFiles { throw new AssertionError("TODO: " + type); } - scriptParameterTypes.add(new AnalyzerScriptParameter(Name.identifier(name), jetType)); + scriptParameterTypes.add(new ScriptParameter(Name.identifier(name), jetType)); scriptParameterValues.add(value); } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java index 434f3d4b259..d247ea90483 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; -import org.jetbrains.kotlin.script.AnalyzerScriptParameter; +import org.jetbrains.kotlin.script.ScriptParameter; import org.jetbrains.kotlin.script.KotlinScriptDefinition; import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider; import org.jetbrains.kotlin.test.ConfigurationKind; @@ -34,7 +34,7 @@ public class ScriptGenTest extends CodegenTestCase { private static final KotlinScriptDefinition FIB_SCRIPT_DEFINITION = new KotlinScriptDefinition( ".lang.kt", - singletonList(new AnalyzerScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE$.getBuiltIns().getIntType())) + singletonList(new ScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE$.getBuiltIns().getIntType())) ); @Override diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java index 68f40bdcb67..13734f125e2 100644 --- a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java +++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.config.ContentRootsKt; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; -import org.jetbrains.kotlin.script.AnalyzerScriptParameter; +import org.jetbrains.kotlin.script.ScriptParameter; import org.jetbrains.kotlin.script.KotlinScriptDefinition; import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider; import org.jetbrains.kotlin.test.ConfigurationKind; @@ -72,7 +72,7 @@ public class ScriptTest { @Nullable private static Class compileScript( @NotNull String scriptPath, - @Nullable List scriptParameters, + @Nullable List scriptParameters, @NotNull List scriptDefinitions ) { KotlinPaths paths = PathUtil.getKotlinPathsForDistDirectory(); @@ -110,7 +110,7 @@ public class ScriptTest { } @NotNull - private static List numIntParam() { - return Collections.singletonList(new AnalyzerScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE$.getBuiltIns().getIntType())); + private static List numIntParam() { + return Collections.singletonList(new ScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE$.getBuiltIns().getIntType())); } }