From 33248e7721cc10a9165dec1eced90c45f7d76e39 Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Fri, 24 Jun 2016 14:55:28 +0300 Subject: [PATCH] KT-3008: minor code style fixes --- .../kotlin/cli/common/arguments/K2JSCompilerArguments.java | 5 ----- .../kotlin/utils/KotlinJavascriptMetadataUtils.kt | 4 ++-- .../jetbrains/kotlin/js/config/LibrarySourcesConfig.java | 7 ------- .../org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java | 1 - .../kotlin/js/translate/context/TranslationContext.java | 6 ------ .../js/translate/intrinsic/objects/objectsIntrinsics.kt | 4 ---- 6 files changed, 2 insertions(+), 25 deletions(-) diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.java index 88ae69c29ae..97abbb235e0 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.java @@ -24,11 +24,6 @@ import static org.jetbrains.kotlin.cli.common.arguments.K2JsArgumentConstants.CA import static org.jetbrains.kotlin.cli.common.arguments.K2JsArgumentConstants.NO_CALL; public class K2JSCompilerArguments extends CommonCompilerArguments { - public static final String MODULE_PLAIN = "plain"; - public static final String MODULE_AMD = "amd"; - public static final String MODULE_COMMONJS = "commonjs"; - public static final String MODULE_UMD = "umd"; - @Argument(value = "output", description = "Output file path") @ValueDescription("") public String outputFile; diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt index d94a0be9de7..ce7653fc8bd 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt +++ b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt @@ -80,8 +80,8 @@ object KotlinJavascriptMetadataUtils { val matcher = METADATA_PATTERN.matcher(text) while (matcher.find()) { - var abiVersion = matcher.group(1).toInt() - var moduleName = matcher.group(3) + val abiVersion = matcher.group(1).toInt() + val moduleName = matcher.group(3) val data = matcher.group(5) metadataList.add(KotlinJavascriptMetadata(abiVersion, moduleName, parseBase64Binary(data))) } diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java index e80aa2d7c9c..13047346747 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java @@ -31,9 +31,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.idea.KotlinFileType; -import org.jetbrains.kotlin.js.JavaScript; import org.jetbrains.kotlin.psi.KtFile; -import org.jetbrains.kotlin.serialization.js.ModuleKind; import org.jetbrains.kotlin.utils.KotlinJavascriptMetadata; import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils; import org.jetbrains.kotlin.utils.LibraryUtils; @@ -52,11 +50,6 @@ public class LibrarySourcesConfig extends JsConfig { public static final Key EXTERNAL_MODULE_NAME = Key.create("externalModule"); public static final String UNKNOWN_EXTERNAL_MODULE_NAME = ""; - public static final String STDLIB_JS_MODULE_NAME = "stdlib"; - public static final String BUILTINS_JS_MODULE_NAME = "builtins"; - public static final String BUILTINS_JS_FILE_NAME = BUILTINS_JS_MODULE_NAME + JavaScript.DOT_EXTENSION; - public static final String STDLIB_JS_FILE_NAME = STDLIB_JS_MODULE_NAME + JavaScript.DOT_EXTENSION; - public LibrarySourcesConfig(@NotNull Project project, @NotNull CompilerConfiguration configuration) { super(project, configuration); } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java index 41a2f35e57f..c6626bbba0a 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java @@ -33,7 +33,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.jetbrains.kotlin.js.config.LibrarySourcesConfig.*; import static org.jetbrains.kotlin.js.test.BasicTest.DIST_DIR_JS_PATH; import static org.jetbrains.kotlin.js.test.BasicTest.TEST_DATA_DIR_PATH; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java index 4c873e59647..faba895834d 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java @@ -20,7 +20,6 @@ import com.google.dart.compiler.backend.js.ast.*; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.builtins.ReflectionTypes; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.js.config.JsConfig; import org.jetbrains.kotlin.js.translate.intrinsic.Intrinsics; @@ -271,11 +270,6 @@ public class TranslationContext { return staticContext.getIntrinsics(); } - @NotNull - public ReflectionTypes getReflectionTypes() { - return staticContext.getReflectionTypes(); - } - @NotNull public JsProgram program() { return staticContext.getProgram(); diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt index b89c0f6cfdd..351d2b2ae97 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt @@ -16,13 +16,9 @@ package org.jetbrains.kotlin.js.translate.intrinsic.objects -import com.google.dart.compiler.backend.js.ast.JsArrayAccess import com.google.dart.compiler.backend.js.ast.JsExpression import org.jetbrains.kotlin.builtins.CompanionObjectMapping -import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.kotlin.js.config.LibrarySourcesConfig -import org.jetbrains.kotlin.js.resolve.JsPlatform import org.jetbrains.kotlin.js.translate.context.Namer import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.utils.JsAstUtils