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

Cleanup

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-08-30 10:56:26 +02:00
parent 29d2482b62
commit a623fb5312
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties
-2
View File
@@ -6,8 +6,6 @@ add.init.keyword.in.whole.project=Add 'init' keyword in whole project
add.init.keyword.in.whole.project.modal.title=Adding 'init' keyword in whole project add.init.keyword.in.whole.project.modal.title=Adding 'init' keyword in whole project
add.init.keyword.in.whole.project.family=Add 'init' keyword in whole project add.init.keyword.in.whole.project.family=Add 'init' keyword in whole project
insert.delegation.call=Insert ''{0}()'' call insert.delegation.call=Insert ''{0}()'' call
remove.parts.from.property=Remove {0} from property
remove.parts.from.property.family=Remove parts from property
remove.useless.nullable=Remove useless '?' remove.useless.nullable=Remove useless '?'
replace.operation.in.binary.expression=Replace operation in a binary expression replace.operation.in.binary.expression=Replace operation in a binary expression
replace.cast.with.static.assert=Replace a cast with a static assert replace.cast.with.static.assert=Replace a cast with a static assert
idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePartsFromPropertyFix.kt
+3 -4
View File
@@ -22,7 +22,6 @@ import com.intellij.psi.PsiFile
import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.idea.KotlinBundle
import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil
import org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention import org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
@@ -45,9 +44,9 @@ class RemovePartsFromPropertyFix(
) )
override fun getText(): String = override fun getText(): String =
KotlinBundle.message("remove.parts.from.property", partsToRemove(removeGetter, removeSetter, removeInitializer)) "Remove ${partsToRemove(removeGetter, removeSetter, removeInitializer)} from property"
override fun getFamilyName(): String = KotlinBundle.message("remove.parts.from.property.family") override fun getFamilyName(): String = "Remove parts from property"
override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean { override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean {
if (!super.isAvailable(project, editor, file)) return false if (!super.isAvailable(project, editor, file)) return false
@@ -55,7 +54,7 @@ class RemovePartsFromPropertyFix(
return !type.isError return !type.isError
} }
public override operator fun invoke(project: Project, editor: Editor?, file: KtFile) { public override fun invoke(project: Project, editor: Editor?, file: KtFile) {
val newElement = element?.copy() as? KtProperty ?: return val newElement = element?.copy() as? KtProperty ?: return
val getter = newElement.getter val getter = newElement.getter