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

Remove unnecessary error report from extract function

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-05-19 20:03:00 +04:00
parent d263621ef5
commit 58b82baa2b
4 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt
-1
View File
@@ -316,7 +316,6 @@ private fun getFunctionForExtractedFragment(
ErrorMessage.SUPER_CALL -> "Cannot perform an action for expression with super call" ErrorMessage.SUPER_CALL -> "Cannot perform an action for expression with super call"
ErrorMessage.DENOTABLE_TYPES -> "Cannot perform an action because following types are unavailable from debugger scope" ErrorMessage.DENOTABLE_TYPES -> "Cannot perform an action because following types are unavailable from debugger scope"
ErrorMessage.MULTIPLE_OUTPUT -> "Cannot perform an action because this code fragment changes more than one variable" ErrorMessage.MULTIPLE_OUTPUT -> "Cannot perform an action because this code fragment changes more than one variable"
ErrorMessage.NON_LOCAL_DECLARATION,
ErrorMessage.DECLARATIONS_OUT_OF_SCOPE, ErrorMessage.DECLARATIONS_OUT_OF_SCOPE,
ErrorMessage.OUTPUT_AND_EXIT_POINT, ErrorMessage.OUTPUT_AND_EXIT_POINT,
ErrorMessage.MULTIPLE_EXIT_POINTS, ErrorMessage.MULTIPLE_EXIT_POINTS,
idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringBundle.properties
-1
View File
@@ -16,7 +16,6 @@ selected.code.fragment.has.output.values.and.exit.points=Selected code fragment
parameter.types.are.not.denotable=Cannot extract method since following types are not denotable in the target scope: parameter.types.are.not.denotable=Cannot extract method since following types are not denotable in the target scope:
declarations.will.move.out.of.scope=Following declarations won't be available outside of extracted function body: declarations.will.move.out.of.scope=Following declarations won't be available outside of extracted function body:
cannot.extract.super.call=Cannot extract super-call cannot.extract.super.call=Cannot extract super-call
cannot.extract.non.local.declaration.ref=Cannot extract reference to non-local declaration
cannot.refactor.expression.should.have.inferred.type=Expression should have inferred type cannot.refactor.expression.should.have.inferred.type=Expression should have inferred type
cannot.refactor.synthesized.function=Cannot refactor synthesized function ''{0}'' cannot.refactor.synthesized.function=Cannot refactor synthesized function ''{0}''
idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionDescriptor.kt
-2
View File
@@ -151,7 +151,6 @@ class AnalysisResult (
NO_EXPRESSION NO_EXPRESSION
NO_CONTAINER NO_CONTAINER
SUPER_CALL SUPER_CALL
NON_LOCAL_DECLARATION
DENOTABLE_TYPES DENOTABLE_TYPES
MULTIPLE_OUTPUT MULTIPLE_OUTPUT
OUTPUT_AND_EXIT_POINT OUTPUT_AND_EXIT_POINT
@@ -171,7 +170,6 @@ class AnalysisResult (
NO_EXPRESSION -> "cannot.refactor.no.expresson" NO_EXPRESSION -> "cannot.refactor.no.expresson"
NO_CONTAINER -> "cannot.refactor.no.container" NO_CONTAINER -> "cannot.refactor.no.container"
SUPER_CALL -> "cannot.extract.super.call" SUPER_CALL -> "cannot.extract.super.call"
NON_LOCAL_DECLARATION -> "cannot.extract.non.local.declaration.ref"
DENOTABLE_TYPES -> "parameter.types.are.not.denotable" DENOTABLE_TYPES -> "parameter.types.are.not.denotable"
MULTIPLE_OUTPUT -> "selected.code.fragment.has.multiple.output.values" MULTIPLE_OUTPUT -> "selected.code.fragment.has.multiple.output.values"
OUTPUT_AND_EXIT_POINT -> "selected.code.fragment.has.output.values.and.exit.points" OUTPUT_AND_EXIT_POINT -> "selected.code.fragment.has.output.values.and.exit.points"
idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt
+1 -3
View File
@@ -346,9 +346,7 @@ private fun ExtractionData.inferParametersInfo(
if (hasClassObjectReceiver) thisDescriptor!!.getContainingDeclaration() as? ClassDescriptor else null if (hasClassObjectReceiver) thisDescriptor!!.getContainingDeclaration() as? ClassDescriptor else null
if (classObjectClassDescriptor != null) { if (classObjectClassDescriptor != null) {
if (!classObjectClassDescriptor.canBeReferencedViaImport()) { assert (classObjectClassDescriptor.canBeReferencedViaImport(), "Class object should be allowed only for importable classes: className = ${classObjectClassDescriptor.getName().asString()}")
return ErrorMessage.NON_LOCAL_DECLARATION
}
replacementMap[refInfo.offsetInBody] = FqNameReplacement(DescriptorUtils.getFqNameSafe(originalDescriptor)) replacementMap[refInfo.offsetInBody] = FqNameReplacement(DescriptorUtils.getFqNameSafe(originalDescriptor))
} }