From 92c2d17910c662c4cb0cc6c17089e48d5a287a83 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Tue, 29 Dec 2015 18:48:56 +0300
Subject: [PATCH] Cleanup leftovers in compiler and IDE

---
 .../src/org/jetbrains/kotlin/daemon/LazyClasspathWatcher.kt | 2 +-
 .../kotlin/idea/completion/handlers/GenerateLambda.kt       | 2 +-
 .../idea/inspections/RedundantSamConstructorInspection.kt   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/LazyClasspathWatcher.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/LazyClasspathWatcher.kt
index b7b7f8ca1e9..bc9b9d2da6c 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/LazyClasspathWatcher.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/LazyClasspathWatcher.kt
@@ -56,7 +56,7 @@ class LazyClasspathWatcher(classpath: Iterable<String>,
     init {
         // locking before entering thread in order to avoid racing with isChanged
         fileIdsLock.acquire()
-        thread(daemon = true, start = true) {
+        thread(isDaemon = true, start = true) {
             try {
                 fileIds = classpath
                         .map { File(it) }
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt
index 0690a00cfae..af8f3488c20 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt
@@ -88,7 +88,7 @@ private fun needExplicitParameterTypes(context: InsertionContext, placeholderRan
     if (functionTypes.size <= 1) return false
 
     val lambdaParameterCount = KotlinBuiltIns.getParameterTypeProjectionsFromFunctionType(lambdaType).size
-    return functionTypes.filter { KotlinBuiltIns.getParameterTypeProjectionsFromFunctionType(it).size() == lambdaParameterCount }.size > 1
+    return functionTypes.filter { KotlinBuiltIns.getParameterTypeProjectionsFromFunctionType(it).size == lambdaParameterCount }.size > 1
 }
 
 private fun buildTemplate(lambdaType: KotlinType, explicitParameterTypes: Boolean, project: Project): Template {
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSamConstructorInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSamConstructorInspection.kt
index 660384c6dc6..9208a9e6862 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSamConstructorInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSamConstructorInspection.kt
@@ -79,7 +79,7 @@ class RedundantSamConstructorInspection : AbstractKotlinInspection() {
 
                 val samConstructorCalls = samConstructorCallsToBeConverted(expression)
                 if (samConstructorCalls.isEmpty()) return
-                if (samConstructorCalls.size() == 1) {
+                if (samConstructorCalls.size == 1) {
                     val single = samConstructorCalls.single()
                     val problemDescriptor = holder.manager.
                             createProblemDescriptor(single.calleeExpression!!,
@@ -177,7 +177,7 @@ class RedundantSamConstructorInspection : AbstractKotlinInspection() {
             // SAM adapters for static functions
             for (staticFunWithSameName in containingClass.staticScope.getContributedFunctions(functionResolvedCall.resultingDescriptor.name, NoLookupLocation.FROM_IDE)) {
                 if (staticFunWithSameName is SamAdapterDescriptor<*>) {
-                    if (isSamAdapterSuitableForCall(staticFunWithSameName, originalFunctionDescriptor, samConstructorCallArguments.size())) {
+                    if (isSamAdapterSuitableForCall(staticFunWithSameName, originalFunctionDescriptor, samConstructorCallArguments.size)) {
                         return samConstructorCallArguments.check { canBeReplaced(functionCall, it) } ?: emptyList()
                     }
                 }
@@ -191,7 +191,7 @@ class RedundantSamConstructorInspection : AbstractKotlinInspection() {
                         NoLookupLocation.FROM_IDE)
             for (syntheticExtension in syntheticExtensions) {
                 val samAdapter = syntheticExtension as? SamAdapterExtensionFunctionDescriptor ?: continue
-                if (isSamAdapterSuitableForCall(samAdapter, originalFunctionDescriptor, samConstructorCallArguments.size())) {
+                if (isSamAdapterSuitableForCall(samAdapter, originalFunctionDescriptor, samConstructorCallArguments.size)) {
                     return samConstructorCallArguments.check { canBeReplaced(functionCall, it) } ?: emptyList()
                 }
             }