Rename jet -> kotlin in ide-common

org.jetbrains.jet.plugin -> org.jetbrains.kotlin.plugin

idea/ide-common/src/org/jetbrains/kotlin/plugin/codeInsight/ReferenceVariantsHelper.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.codeInsight
+package org.jetbrains.kotlin.plugin.codeInsight
 
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.psi.*
@@ -24,7 +24,6 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastUtils
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo
 import org.jetbrains.kotlin.resolve.scopes.JetScope
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
-
 import java.util.*
 import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo
 import org.jetbrains.kotlin.name.Name
@@ -36,9 +35,9 @@ import org.jetbrains.kotlin.types.JetType
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.checker.JetTypeChecker
 import org.jetbrains.kotlin.lexer.JetTokens
-import org.jetbrains.jet.plugin.util.CallType
-import org.jetbrains.jet.plugin.util.substituteExtensionIfCallable
-import org.jetbrains.jet.plugin.util.getImplicitReceiversWithInstance
+import org.jetbrains.kotlin.plugin.util.CallType
+import org.jetbrains.kotlin.plugin.util.substituteExtensionIfCallable
+import org.jetbrains.kotlin.plugin.util.getImplicitReceiversWithInstance
 
 public class ReferenceVariantsHelper(
         private val context: BindingContext,

idea/ide-common/src/org/jetbrains/kotlin/plugin/util/FuzzyType.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.util
+package org.jetbrains.kotlin.plugin.util
 
 import org.jetbrains.kotlin.types.JetType
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
@@ -24,7 +24,6 @@ import java.util.HashSet
 import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemImpl
 import java.util.LinkedHashMap
 import org.jetbrains.kotlin.types.Variance
-import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPosition
 import org.jetbrains.kotlin.resolve.calls.inference.ConstraintsUtil
 import org.jetbrains.kotlin.types.TypeSubstitutor
 import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf

idea/ide-common/src/org/jetbrains/kotlin/plugin/util/IdeDescriptorRenderers.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * 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.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.util;
+package org.jetbrains.kotlin.plugin.util;
 
 import kotlin.Function1;
-import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.renderer.DescriptorRenderer;
 import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder;
+import org.jetbrains.kotlin.types.JetType;
 
 public class IdeDescriptorRenderers {
 

idea/ide-common/src/org/jetbrains/kotlin/plugin/util/TypeUtils.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * 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.
@@ -14,22 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.util
+package org.jetbrains.kotlin.plugin.util
 
-import org.jetbrains.kotlin.types.JetType
-import org.jetbrains.kotlin.types.TypeUtils
+import org.jetbrains.kotlin.types.*
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.types.JetTypeImpl
-import org.jetbrains.kotlin.types.TypeProjectionImpl
-import org.jetbrains.kotlin.types.ErrorUtils
 import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.CollectionClassMapping
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.load.java.JvmAnnotationNames
-import org.jetbrains.kotlin.types.isFlexible
-import org.jetbrains.kotlin.types.flexibility
 import java.util.LinkedHashSet
-import org.jetbrains.kotlin.types.isDynamic
-import org.jetbrains.kotlin.types.isNullabilityFlexible
 
 fun JetType.makeNullable() = TypeUtils.makeNullable(this)
 fun JetType.makeNotNullable() = TypeUtils.makeNotNullable(this)

idea/ide-common/src/org/jetbrains/kotlin/plugin/util/extensionsUtils.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.util
+package org.jetbrains.kotlin.plugin.util
 
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
@@ -31,21 +31,23 @@ public enum class CallType {
 
     INFIX {
         override fun canCall(descriptor: DeclarationDescriptor)
-                = descriptor is SimpleFunctionDescriptor && descriptor.getValueParameters().size == 1
+                = descriptor is SimpleFunctionDescriptor && descriptor.getValueParameters().size() == 1
     }
 
     UNARY {
         override fun canCall(descriptor: DeclarationDescriptor)
-                = descriptor is SimpleFunctionDescriptor && descriptor.getValueParameters().size == 0
+                = descriptor is SimpleFunctionDescriptor && descriptor.getValueParameters().size() == 0
     }
 
     public open fun canCall(descriptor: DeclarationDescriptor): Boolean = true
 }
 
-public fun CallableDescriptor.substituteExtensionIfCallable(receivers: Collection<ReceiverValue>,
-                                                  context: BindingContext,
-                                                  dataFlowInfo: DataFlowInfo,
-                                                  callType: CallType): Collection<CallableDescriptor> {
+public fun CallableDescriptor.substituteExtensionIfCallable(
+        receivers: Collection<ReceiverValue>,
+        context: BindingContext,
+        dataFlowInfo: DataFlowInfo,
+        callType: CallType
+): Collection<CallableDescriptor> {
     val stream = receivers.stream().flatMap { substituteExtensionIfCallable(it, callType, context, dataFlowInfo).stream() }
     if (getTypeParameters().isEmpty()) { // optimization for non-generic callables
         return stream.firstOrNull()?.let { listOf(it) } ?: listOf()

idea/ide-common/src/org/jetbrains/kotlin/plugin/util/implicitReceiversUtils.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.util
+package org.jetbrains.kotlin.plugin.util
 
 import org.jetbrains.kotlin.resolve.scopes.JetScope
 import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor