diff --git a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties index 6594d13dfc2..a68a8a1a91a 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties +++ b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties @@ -32,12 +32,12 @@ new.kotlin.file.action=Kotlin File import.fix=Import imports.chooser.title=Imports specify.type.explicitly.action.family.name=Specify Type Explicitly -specify.type.explicitly.add.return.type.action.name=Specify Return Type Explicitly -specify.type.explicitly.add.action.name=Specify Type Explicitly -specify.type.explicitly.remove.action.name=Remove Explicitly Specified Type +specify.type.explicitly.add.return.type.action.name=Specify return type explicitly +specify.type.explicitly.add.action.name=Specify type explicitly +specify.type.explicitly.remove.action.name=Remove explicitly specified type add.kotlin.signature.action.family.name=Specify Custom Kotlin Signature -add.kotlin.signature.action.text=Specify Custom Kotlin Signature +add.kotlin.signature.action.text=Specify custom Kotlin signature goto.super.function.chooser.title=Choose super function goto.super.property.chooser.title=Choose super property diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java index 1ce41a30e22..c3ca36ee6e8 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.plugin.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; @@ -40,10 +39,10 @@ public class SpecifyTypeExplicitlyFix extends SpecifyTypeExplicitlyAction { //noinspection unchecked JetNamedDeclaration declaration = PsiTreeUtil.getParentOfType(element, JetProperty.class, JetNamedFunction.class); if (declaration instanceof JetProperty) { - setText(getQuickFixText(JetBundle.message("specify.type.explicitly.add.action.name"))); + setText(JetBundle.message("specify.type.explicitly.add.action.name")); } else if (declaration instanceof JetNamedFunction) { - setText(getQuickFixText(JetBundle.message("specify.type.explicitly.add.return.type.action.name"))); + setText(JetBundle.message("specify.type.explicitly.add.return.type.action.name")); } else { assert false : "Couldn't find property or function"; @@ -51,10 +50,4 @@ public class SpecifyTypeExplicitlyFix extends SpecifyTypeExplicitlyAction { return !ErrorUtils.isErrorType(getTypeForDeclaration(declaration)); } - - // There is an implicit rule that quick fix text has only first letter capitalized, while intention text - @NotNull - private static String getQuickFixText(@NotNull String intentionText) { - return StringUtil.capitalize(intentionText.toLowerCase()); - } } diff --git a/idea/testData/intentions/specifyType/afterBadCaretPosition.kt b/idea/testData/intentions/specifyType/afterBadCaretPosition.kt index 73502bd79bf..bb249aeb919 100644 --- a/idea/testData/intentions/specifyType/afterBadCaretPosition.kt +++ b/idea/testData/intentions/specifyType/afterBadCaretPosition.kt @@ -1,2 +1,2 @@ -// "Specify Type Explicitly" "false" +// "Specify type explicitly" "false" val x = "" \ No newline at end of file diff --git a/idea/testData/intentions/specifyType/afterClassNameClashing.kt b/idea/testData/intentions/specifyType/afterClassNameClashing.kt index 28531e416a7..c8a23b0fff4 100644 --- a/idea/testData/intentions/specifyType/afterClassNameClashing.kt +++ b/idea/testData/intentions/specifyType/afterClassNameClashing.kt @@ -1,4 +1,4 @@ -// "Specify Type Explicitly" "true" +// "Specify type explicitly" "true" fun getEntry() : Map.Entry, java.sql.Array> { } diff --git a/idea/testData/intentions/specifyType/afterFunctionType.kt b/idea/testData/intentions/specifyType/afterFunctionType.kt index 3f842cc4ced..e9bff56789e 100644 --- a/idea/testData/intentions/specifyType/afterFunctionType.kt +++ b/idea/testData/intentions/specifyType/afterFunctionType.kt @@ -1,2 +1,2 @@ -// "Specify Type Explicitly" "true" +// "Specify type explicitly" "true" val x: (Int) -> String = { (a: Int) -> ""} \ No newline at end of file diff --git a/idea/testData/intentions/specifyType/afterLoopParameter.kt b/idea/testData/intentions/specifyType/afterLoopParameter.kt index 387bb82fbd1..3156dfbacc3 100644 --- a/idea/testData/intentions/specifyType/afterLoopParameter.kt +++ b/idea/testData/intentions/specifyType/afterLoopParameter.kt @@ -1,4 +1,4 @@ -// "Specify Type Explicitly" "true" +// "Specify type explicitly" "true" import java.util.HashMap fun foo(map : HashMap) { diff --git a/idea/testData/intentions/specifyType/afterOnType.kt b/idea/testData/intentions/specifyType/afterOnType.kt index 0dfbb39978c..03ecd94672d 100644 --- a/idea/testData/intentions/specifyType/afterOnType.kt +++ b/idea/testData/intentions/specifyType/afterOnType.kt @@ -1,3 +1,3 @@ -// "Remove Explicitly Specified Type" "true" +// "Remove explicitly specified type" "true" val x = null \ No newline at end of file diff --git a/idea/testData/intentions/specifyType/afterStringRedefined.kt b/idea/testData/intentions/specifyType/afterStringRedefined.kt index 358bb7a1b86..2309c9c7d50 100644 --- a/idea/testData/intentions/specifyType/afterStringRedefined.kt +++ b/idea/testData/intentions/specifyType/afterStringRedefined.kt @@ -1,4 +1,4 @@ -// "Specify Type Explicitly" "true" +// "Specify type explicitly" "true" class String {} val x: jet.String = "" \ No newline at end of file diff --git a/idea/testData/intentions/specifyType/afterTypeAlreadyProvided.kt b/idea/testData/intentions/specifyType/afterTypeAlreadyProvided.kt index e5a91213525..a4666865f87 100644 --- a/idea/testData/intentions/specifyType/afterTypeAlreadyProvided.kt +++ b/idea/testData/intentions/specifyType/afterTypeAlreadyProvided.kt @@ -1,2 +1,2 @@ -// "Remove Explicitly Specified Type" "true" +// "Remove explicitly specified type" "true" val x = "" \ No newline at end of file diff --git a/idea/testData/intentions/specifyType/afterUnitType.kt b/idea/testData/intentions/specifyType/afterUnitType.kt index 8f868d0e08f..15e9b5890f8 100644 --- a/idea/testData/intentions/specifyType/afterUnitType.kt +++ b/idea/testData/intentions/specifyType/afterUnitType.kt @@ -1,2 +1,2 @@ -// "Specify Type Explicitly" "true" +// "Specify type explicitly" "true" val x: Unit = Unit.VALUE \ No newline at end of file diff --git a/idea/testData/intentions/specifyType/afterUnknownType.kt b/idea/testData/intentions/specifyType/afterUnknownType.kt index 55afdef17ef..30568691514 100644 --- a/idea/testData/intentions/specifyType/afterUnknownType.kt +++ b/idea/testData/intentions/specifyType/afterUnknownType.kt @@ -1,2 +1,2 @@ -// "Specify Type Explicitly" "false" +// "Specify type explicitly" "false" val x = BadType() \ No newline at end of file diff --git a/idea/testData/intentions/specifyType/beforeBadCaretPosition.kt b/idea/testData/intentions/specifyType/beforeBadCaretPosition.kt index 73502bd79bf..bb249aeb919 100644 --- a/idea/testData/intentions/specifyType/beforeBadCaretPosition.kt +++ b/idea/testData/intentions/specifyType/beforeBadCaretPosition.kt @@ -1,2 +1,2 @@ -// "Specify Type Explicitly" "false" +// "Specify type explicitly" "false" val x = "" \ No newline at end of file diff --git a/idea/testData/intentions/specifyType/beforeClassNameClashing.kt b/idea/testData/intentions/specifyType/beforeClassNameClashing.kt index 9e01b5fddb8..611510c4ca2 100644 --- a/idea/testData/intentions/specifyType/beforeClassNameClashing.kt +++ b/idea/testData/intentions/specifyType/beforeClassNameClashing.kt @@ -1,4 +1,4 @@ -// "Specify Type Explicitly" "true" +// "Specify type explicitly" "true" fun getEntry() : Map.Entry, java.sql.Array> { } diff --git a/idea/testData/intentions/specifyType/beforeFunctionType.kt b/idea/testData/intentions/specifyType/beforeFunctionType.kt index 000957c3a47..44d3a0120e9 100644 --- a/idea/testData/intentions/specifyType/beforeFunctionType.kt +++ b/idea/testData/intentions/specifyType/beforeFunctionType.kt @@ -1,2 +1,2 @@ -// "Specify Type Explicitly" "true" +// "Specify type explicitly" "true" val x = { (a: Int) -> ""} \ No newline at end of file diff --git a/idea/testData/intentions/specifyType/beforeLoopParameter.kt b/idea/testData/intentions/specifyType/beforeLoopParameter.kt index 3e01f220630..00f625d9dd8 100644 --- a/idea/testData/intentions/specifyType/beforeLoopParameter.kt +++ b/idea/testData/intentions/specifyType/beforeLoopParameter.kt @@ -1,4 +1,4 @@ -// "Specify Type Explicitly" "true" +// "Specify type explicitly" "true" import java.util.HashMap fun foo(map : HashMap) { diff --git a/idea/testData/intentions/specifyType/beforeOnType.kt b/idea/testData/intentions/specifyType/beforeOnType.kt index c50c3b795df..8a641dee9fe 100644 --- a/idea/testData/intentions/specifyType/beforeOnType.kt +++ b/idea/testData/intentions/specifyType/beforeOnType.kt @@ -1,3 +1,3 @@ -// "Remove Explicitly Specified Type" "true" +// "Remove explicitly specified type" "true" val x : Map.Entryng, Int>? = null \ No newline at end of file diff --git a/idea/testData/intentions/specifyType/beforeStringRedefined.kt b/idea/testData/intentions/specifyType/beforeStringRedefined.kt index 4cbfb1802e6..44bc26613a2 100644 --- a/idea/testData/intentions/specifyType/beforeStringRedefined.kt +++ b/idea/testData/intentions/specifyType/beforeStringRedefined.kt @@ -1,4 +1,4 @@ -// "Specify Type Explicitly" "true" +// "Specify type explicitly" "true" class String {} val x = "" \ No newline at end of file diff --git a/idea/testData/intentions/specifyType/beforeTypeAlreadyProvided.kt b/idea/testData/intentions/specifyType/beforeTypeAlreadyProvided.kt index b716acc6475..00ee7905d1e 100644 --- a/idea/testData/intentions/specifyType/beforeTypeAlreadyProvided.kt +++ b/idea/testData/intentions/specifyType/beforeTypeAlreadyProvided.kt @@ -1,2 +1,2 @@ -// "Remove Explicitly Specified Type" "true" +// "Remove explicitly specified type" "true" val x : String = "" \ No newline at end of file diff --git a/idea/testData/intentions/specifyType/beforeUnitType.kt b/idea/testData/intentions/specifyType/beforeUnitType.kt index 71731938f29..e6de0877f15 100644 --- a/idea/testData/intentions/specifyType/beforeUnitType.kt +++ b/idea/testData/intentions/specifyType/beforeUnitType.kt @@ -1,2 +1,2 @@ -// "Specify Type Explicitly" "true" +// "Specify type explicitly" "true" val x = Unit.VALUE \ No newline at end of file diff --git a/idea/testData/intentions/specifyType/beforeUnknownType.kt b/idea/testData/intentions/specifyType/beforeUnknownType.kt index 55afdef17ef..30568691514 100644 --- a/idea/testData/intentions/specifyType/beforeUnknownType.kt +++ b/idea/testData/intentions/specifyType/beforeUnknownType.kt @@ -1,2 +1,2 @@ -// "Specify Type Explicitly" "false" +// "Specify type explicitly" "false" val x = BadType() \ No newline at end of file