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

KT-11960 Minor code style fixes

Browse Source
This commit is contained in:
Alexey Andreev
2016-05-23 10:46:12 +03:00
parent 6f363a71be
commit bb8a3aa262
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java
-1
View File
@@ -24,7 +24,6 @@ import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties;
import com.intellij.openapi.util.Factory; import com.intellij.openapi.util.Factory;
import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.HashMap; import com.intellij.util.containers.HashMap;
import com.intellij.util.containers.HashSet;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.ReflectionTypes; import org.jetbrains.kotlin.builtins.ReflectionTypes;
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java
-3
View File
@@ -18,8 +18,6 @@ package org.jetbrains.kotlin.js.translate.context;
import com.google.dart.compiler.backend.js.ast.*; import com.google.dart.compiler.backend.js.ast.*;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.ReflectionTypes; import org.jetbrains.kotlin.builtins.ReflectionTypes;
@@ -520,7 +518,6 @@ public class TranslationContext {
@NotNull @NotNull
public List<DeferredCallSite> endDeclaration() { public List<DeferredCallSite> endDeclaration() {
List<DeferredCallSite> result = null; List<DeferredCallSite> result = null;
ClassDescriptor classDescriptor = this.classDescriptor;
if (classDescriptor != null) { if (classDescriptor != null) {
result = staticContext.getDeferredCallSites().remove(classDescriptor); result = staticContext.getDeferredCallSites().remove(classDescriptor);
} }
js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt
+4 -8
View File
@@ -243,14 +243,10 @@ class ClassTranslator private constructor(
// Build map that maps constructor to all constructors called via this() // Build map that maps constructor to all constructors called via this()
val constructorMap = allConstructors.map { it.descriptor to it }.toMap() val constructorMap = allConstructors.map { it.descriptor to it }.toMap()
fun mapConstructor(constructor: ConstructorDescriptor) = val callSiteMap = callSites.groupBy {
if (constructor.isPrimary) constructor.containingDeclaration else constructor val constructor = it.constructor
if (constructor.isPrimary) constructor.containingDeclaration else constructor
val callSiteMap = callSites }
.map { mapConstructor(it.constructor) }.distinct()
.map { Pair(it, mutableListOf<DeferredCallSite>()) }
.toMap()
callSites.forEach { callSiteMap[mapConstructor(it.constructor)]!! += it }
val thisCalls = secondaryConstructors.map { val thisCalls = secondaryConstructors.map {
val set = mutableSetOf<ConstructorInfo>() val set = mutableSetOf<ConstructorInfo>()