azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-3008: minor code style fixes

Browse Source
This commit is contained in:
Alexey Andreev
2016-06-24 14:55:28 +03:00
parent da53b9a9a4
commit 33248e7721
6 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.java
-5
View File
@@ -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("<path>")
public String outputFile;
compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt
+2 -2
View File
@@ -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)))
}
js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java
-7
View File
@@ -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<String> EXTERNAL_MODULE_NAME = Key.create("externalModule");
public static final String UNKNOWN_EXTERNAL_MODULE_NAME = "<unknown>";
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);
}
js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java
-1
View File
@@ -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;
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java
-6
View File
@@ -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();
js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt
-4
View File
@@ -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