From 2cfd7de8d97afa37b30d7b796171914bc6f5c839 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 24 Apr 2014 18:21:05 +0400 Subject: [PATCH] Fix containment check --- .../plugin/refactoring/extractFunction/extractFunctionUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt index 26da4972826..231d94d883f 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt @@ -560,7 +560,7 @@ fun ExtractionDescriptor.validate(): ExtractionDescriptorWithConflicts { val bindingContext = AnalyzerFacadeWithCache.getContextForElement(function.getBodyExpression()!!) for ((originalOffset, resolveResult) in extractionData.refOffsetToDeclaration) { - if (resolveResult.declaration in extractionData.originalElements) continue + if (resolveResult.declaration.isInsideOf(extractionData.originalElements)) continue val currentRefExpr = nameByOffset[originalOffset] as JetSimpleNameExpression? if (currentRefExpr == null) continue