Code refactoring

core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java

@@ -286,7 +286,7 @@ public class OverridingUtil {
     ) {
         Queue<CallableMemberDescriptor> fromSuperQueue = new LinkedList<CallableMemberDescriptor>(notOverridden);
         while (!fromSuperQueue.isEmpty()) {
-            CallableMemberDescriptor notOverriddenFromSuper = VisibilityUtil.findMemberWithMaxVisibility(fromSuperQueue);
+            CallableMemberDescriptor notOverriddenFromSuper = VisibilityUtilKt.findMemberWithMaxVisibility(fromSuperQueue);
             Collection<CallableMemberDescriptor> overridables =
                     extractMembersOverridableInBothWays(notOverriddenFromSuper, fromSuperQueue, sink);
             createAndBindFakeOverride(overridables, current, sink);

core/descriptors/src/org/jetbrains/kotlin/resolve/VisibilityUtil.java

@@ -1,37 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.resolve;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor;
-import org.jetbrains.kotlin.descriptors.Visibilities;
-
-import java.util.Queue;
-
-public class VisibilityUtil {
-    @NotNull
-    public static CallableMemberDescriptor findMemberWithMaxVisibility(@NotNull Queue<CallableMemberDescriptor> descriptors) {
-        CallableMemberDescriptor descriptor = descriptors.element();
-        for (CallableMemberDescriptor candidate : descriptors) {
-            Integer result = Visibilities.compare(descriptor.getVisibility(), candidate.getVisibility());
-            if (result != null && result < 0) {
-                descriptor = candidate;
-            }
-        }
-        return descriptor;
-    }
-}

core/descriptors/src/org/jetbrains/kotlin/resolve/VisibilityUtil.kt

@@ -0,0 +1,38 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.resolve
+
+import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
+import org.jetbrains.kotlin.descriptors.Visibilities
+
+fun findMemberWithMaxVisibility(descriptors: Collection<CallableMemberDescriptor>): CallableMemberDescriptor {
+    assert(descriptors.isNotEmpty())
+
+    var descriptor: CallableMemberDescriptor? = null
+    for (candidate in descriptors) {
+        if (descriptor == null) {
+            descriptor = candidate
+            continue
+        }
+
+        val result = Visibilities.compare(descriptor.visibility, candidate.visibility)
+        if (result != null && result < 0) {
+            descriptor = candidate
+        }
+    }
+    return descriptor!!
+}

idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.kt

@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.quickfix
 
 import com.google.common.collect.Lists
-import com.google.common.collect.Queues
 import com.intellij.codeInsight.hint.HintManager
 import com.intellij.codeInsight.intention.IntentionAction
 import com.intellij.openapi.command.CommandProcessor
@@ -42,7 +41,7 @@ import org.jetbrains.kotlin.psi.JetPsiFactory
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.renderer.NameShortness
 import org.jetbrains.kotlin.resolve.FunctionDescriptorUtil
-import org.jetbrains.kotlin.resolve.VisibilityUtil
+import org.jetbrains.kotlin.resolve.findMemberWithMaxVisibility
 import org.jetbrains.kotlin.types.checker.JetTypeChecker
 import org.jetbrains.kotlin.types.typeUtil.supertypes
 import org.jetbrains.kotlin.utils.addToStdlib.check
@@ -127,7 +126,7 @@ class ChangeMemberFunctionSignatureFix private constructor(
                     superFunction.copy(
                             function.containingDeclaration,
                             Modality.OPEN,
-                            getVisibility(function, superFunction),
+                            findMemberWithMaxVisibility(listOf(superFunction, function)).visibility,
                             CallableMemberDescriptor.Kind.DELEGATION,
                             /* copyOverrides = */ true),
                     newParameters)
@@ -136,14 +135,6 @@ class ChangeMemberFunctionSignatureFix private constructor(
             return Signature(newFunction)
         }
 
-        /**
-         * Returns new visibility for 'function' modified to override 'superFunction'.
-         */
-        private fun getVisibility(function: FunctionDescriptor, superFunction: FunctionDescriptor): Visibility {
-            val descriptors = Queues.newArrayDeque<CallableMemberDescriptor>(listOf(superFunction, function))
-            return VisibilityUtil.findMemberWithMaxVisibility(descriptors).visibility
-        }
-
         /**
          * Match function's parameters with super function's parameters using parameterChooser.
          * Doesn't have to preserve ordering, parameter names or types.