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

remove requirements for explicit return type for public members

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-09-03 02:01:08 +03:00
parent 724f13954a
commit 3a4dfc5241
15 changed files with 29 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
+1 -6
View File
@@ -42,7 +42,7 @@ public class SpecifyTypeExplicitlyIntention : JetSelfTargetingIntention<JetCalla
if (element is JetConstructor<*>) return false
if (element.getTypeReference() != null) return false
if (getTypeForDeclaration(element).isError() || hasPublicMemberDiagnostic(element)) return false
if (getTypeForDeclaration(element).isError()) return false
val initializer = (element as? JetWithExpressionInitializer)?.getInitializer()
if (initializer != null && initializer.getTextRange().containsOffset(caretOffset)) return false
@@ -54,11 +54,6 @@ public class SpecifyTypeExplicitlyIntention : JetSelfTargetingIntention<JetCalla
return true
}
private fun hasPublicMemberDiagnostic(declaration: JetNamedDeclaration): Boolean {
return declaration.analyze().getDiagnostics().forElement(declaration)
.any { it.getFactory() == Errors.PUBLIC_MEMBER_SHOULD_SPECIFY_TYPE }
}
override fun applyTo(element: JetCallableDeclaration, editor: Editor) {
val type = getTypeForDeclaration(element)
addTypeAnnotation(editor, element, type)
idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
-1
View File
@@ -172,7 +172,6 @@ public class QuickFixRegistrar : QuickFixContributor {
UNNECESSARY_NOT_NULL_ASSERTION.registerFactory(RemoveExclExclCallFix)
UNSAFE_INFIX_CALL.registerFactory(ReplaceInfixCallFix)
PUBLIC_MEMBER_SHOULD_SPECIFY_TYPE.registerActions(SpecifyTypeExplicitlyFix())
AMBIGUOUS_ANONYMOUS_TYPE_INFERRED.registerActions(SpecifyTypeExplicitlyFix())
ELSE_MISPLACED_IN_WHEN.registerFactory(MoveWhenElseBranchFix.createFactory())
idea/testData/quickfix/typeAddition/noAddErrorType.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// "Specify type explicitly" "false"
// ACTION: Convert property to function
// ERROR: Public or protected member should have specified type
// ERROR: Unresolved reference: foo
class A() {
idea/testData/quickfix/typeImports/importFromAnotherFile.after.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// "Specify type explicitly" "true"
// ERROR: Public or protected member should have specified type
package a
idea/testData/quickfix/typeImports/importFromAnotherFile.before.Main.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// "Specify type explicitly" "true"
// ERROR: Public or protected member should have specified type
package a