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

Intention action for hiddnen declarations fixed

Browse Source
This commit is contained in:
Andrey Breslav
2015-10-09 14:50:45 +03:00
parent 1c00b933a5
commit 4f63d47f82
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt
+2 -3
View File
@@ -223,14 +223,13 @@ public class ConflictingExtensionPropertyInspection : AbstractKotlinInspection()
} }
private class MarkHiddenAndDeprecatedAction(property: JetProperty) : JetIntentionAction<JetProperty>(property) { private class MarkHiddenAndDeprecatedAction(property: JetProperty) : JetIntentionAction<JetProperty>(property) {
override fun getFamilyName() = "Mark with @HiddenDeclaration and @Deprecated" override fun getFamilyName() = "Mark as @Deprecated(..., level = DeprecationLevel.HIDDEN)"
override fun getText() = familyName override fun getText() = familyName
override fun invoke(project: Project, editor: Editor?, file: JetFile) { override fun invoke(project: Project, editor: Editor?, file: JetFile) {
val factory = JetPsiFactory(project) val factory = JetPsiFactory(project)
val name = element.nameAsName!!.render() val name = element.nameAsName!!.render()
element.addAnnotationWithLineBreak(factory.createAnnotationEntry("@Deprecated(\"Is replaced with automatic synthetic extension\", ReplaceWith(\"$name\"))")) element.addAnnotationWithLineBreak(factory.createAnnotationEntry("@Deprecated(\"Is replaced with automatic synthetic extension\", ReplaceWith(\"$name\"), level = DeprecationLevel.HIDDEN)"))
element.addAnnotationWithLineBreak(factory.createAnnotationEntry("@HiddenDeclaration"))
} }
//TODO: move into PSI? //TODO: move into PSI?
idea/testData/quickfix/migration/conflictingExtension/markHiddenAndDeprecated.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// "Mark with @HiddenDeclaration and @Deprecated" "true" // "Mark as @Deprecated(..., level = DeprecationLevel.HIDDEN)" "true"
import java.io.File import java.io.File
val File.<caret>name: String val File.<caret>name: String
idea/testData/quickfix/migration/conflictingExtension/markHiddenAndDeprecated.kt.after
Vendored
+2 -3
View File
@@ -1,7 +1,6 @@
// "Mark with @HiddenDeclaration and @Deprecated" "true" // "Mark as @Deprecated(..., level = DeprecationLevel.HIDDEN)" "true"
import java.io.File import java.io.File
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("name"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("name"))
val File.<caret>name: String val File.<caret>name: String
get() = getName() get() = getName()