PSI Pattern Matching: Prefer strongly matched children over weakly matched parents

idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiRange.kt

@@ -25,6 +25,8 @@ import com.intellij.psi.PsiComment
 import java.util.Collections
 import org.jetbrains.jet.lang.psi.psiUtil.siblings
 import com.intellij.openapi.util.TextRange
+import java.util.HashSet
+import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange.Match
 
 private val SIGNIFICANT_FILTER = { (e: PsiElement) -> e !is PsiWhiteSpace && e !is PsiComment && e.getTextLength() > 0 }
 
@@ -67,28 +69,25 @@ public trait JetPsiRange {
         val matches = ArrayList<Match>()
         scope.accept(
                 object: JetTreeVisitorVoid() {
-                    private fun processElement(element: JetElement): Boolean {
+                    override fun visitJetElement(element: JetElement) {
-                        val candidates = element
+                        val range = element
                                 .siblings()
                                 .filter(SIGNIFICANT_FILTER)
                                 .take(elements.size)
                                 .toList()
-                        if (candidates.size != elements.size) return false
+                                .toRange()
-
-                        val range = candidates.toRange()
 
                         val result = unifier.unify(range, this@JetPsiRange)
-                        if (result is UnificationResult.Matched) {
+
+                        if (result is UnificationResult.StronglyMatched) {
                             matches.add(Match(range, result))
-                            return true
                         }
-
+                        else {
-                        return false
+                            val matchCountSoFar = matches.size
-                    }
-
-                    override fun visitJetElement(element: JetElement) {
-                        if (!processElement(element)) {
                             super.visitJetElement(element)
+                            if (result is UnificationResult.WeaklyMatched && matches.size == matchCountSoFar) {
+                                matches.add(Match(range, result))
+                            }
                         }
                     }
                 }

idea/testData/refactoring/extractFunction/duplicates/nestedStrongMatch.kt

@@ -0,0 +1,5 @@
+// SIBLING:
+fun main(args: Array<String>) {
+    val x = 1 + 1
+    val y = <selection>1 + 1</selection>
+}

idea/testData/refactoring/extractFunction/duplicates/nestedStrongMatch.kt.after

@@ -0,0 +1,9 @@
+// SIBLING:
+fun main(args: Array<String>) {
+    val x = i()
+    val y = i()
+}
+
+private fun i(): Int {
+    return 1 + 1
+}

idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/JetExtractionTestGenerated.java

@@ -1086,7 +1086,13 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/multipleOutputValuesMatching.kt");
                 doExtractFunctionTest(fileName);
             }
-
+            
+            @TestMetadata("nestedStrongMatch.kt")
+            public void testNestedStrongMatch() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/nestedStrongMatch.kt");
+                doExtractFunctionTest(fileName);
+            }
+            
             @TestMetadata("notNullAssertion.kt")
             public void testNotNullAssertion() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/notNullAssertion.kt");