azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract function: capture only local functions, not from local declarations

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-04-28 12:04:24 +03:00
parent 35bacb4ac7
commit 35f9cb5405
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt
+2 -1
View File
@@ -90,7 +90,8 @@ fun getFunctionForExtractedFragment(
val options = ExtractionOptions(inferUnitTypeForUnusedValues = false, val options = ExtractionOptions(inferUnitTypeForUnusedValues = false,
enableListBoxing = true, enableListBoxing = true,
allowSpecialClassNames = true) allowSpecialClassNames = true,
captureLocalFunctions = true)
val analysisResult = ExtractionData(tmpFile, newDebugExpression.toRange(), targetSibling, null, options).performAnalysis() val analysisResult = ExtractionData(tmpFile, newDebugExpression.toRange(), targetSibling, null, options).performAnalysis()
if (analysisResult.status != Status.SUCCESS) { if (analysisResult.status != Status.SUCCESS) {
throw EvaluateExceptionUtil.createEvaluateException(getErrorMessageForExtractFunctionResult(analysisResult)) throw EvaluateExceptionUtil.createEvaluateException(getErrorMessageForExtractFunctionResult(analysisResult))
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt
+1 -2
View File
@@ -642,8 +642,7 @@ private fun ExtractionData.inferParametersInfo(
val extractFunctionRef = val extractFunctionRef =
options.captureLocalFunctions options.captureLocalFunctions
&& originalRef.getReferencedName() == originalDescriptor.getName().asString() // to forbid calls by convention && originalRef.getReferencedName() == originalDescriptor.getName().asString() // to forbid calls by convention
&& originalDescriptor is FunctionDescriptor && originalDeclaration is JetNamedFunction && originalDeclaration.isLocal()
&& DescriptorUtils.isLocal(originalDescriptor)
&& (targetScope == null || originalDescriptor !in targetScope.getFunctions(originalDescriptor.getName())) && (targetScope == null || originalDescriptor !in targetScope.getFunctions(originalDescriptor.getName()))
val descriptorToExtract = (if (extractThis) thisDescriptor else null) ?: originalDescriptor val descriptorToExtract = (if (extractThis) thisDescriptor else null) ?: originalDescriptor