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

Fixed case for intention actions texts.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-10-23 18:59:47 +04:00
parent 1ad2fdac0b
commit 4e05bee22a
20 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/JetBundle.properties
+4 -4
View File
@@ -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
idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java
+2 -9
View File
@@ -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());
}
}
idea/testData/intentions/specifyType/afterBadCaretPosition.kt
+1 -1
View File
@@ -1,2 +1,2 @@
// "Specify Type Explicitly" "false"
// "Specify type explicitly" "false"
val x = "<caret>"
idea/testData/intentions/specifyType/afterClassNameClashing.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "Specify Type Explicitly" "true"
// "Specify type explicitly" "true"
fun getEntry() : Map.Entry<jet.Array<String>, java.sql.Array> {
}
idea/testData/intentions/specifyType/afterFunctionType.kt
+1 -1
View File
@@ -1,2 +1,2 @@
// "Specify Type Explicitly" "true"
// "Specify type explicitly" "true"
val x: (Int) -> String = { (a: Int) -> ""}
idea/testData/intentions/specifyType/afterLoopParameter.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "Specify Type Explicitly" "true"
// "Specify type explicitly" "true"
import java.util.HashMap
fun foo(map : HashMap<String, Int>) {
idea/testData/intentions/specifyType/afterOnType.kt
+1 -1
View File
@@ -1,3 +1,3 @@
// "Remove Explicitly Specified Type" "true"
// "Remove explicitly specified type" "true"
val x = null
idea/testData/intentions/specifyType/afterStringRedefined.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "Specify Type Explicitly" "true"
// "Specify type explicitly" "true"
class String {}
val x: jet.String = ""
idea/testData/intentions/specifyType/afterTypeAlreadyProvided.kt
+1 -1
View File
@@ -1,2 +1,2 @@
// "Remove Explicitly Specified Type" "true"
// "Remove explicitly specified type" "true"
val x = ""
idea/testData/intentions/specifyType/afterUnitType.kt
+1 -1
View File
@@ -1,2 +1,2 @@
// "Specify Type Explicitly" "true"
// "Specify type explicitly" "true"
val x: Unit = Unit.VALUE
idea/testData/intentions/specifyType/afterUnknownType.kt
+1 -1
View File
@@ -1,2 +1,2 @@
// "Specify Type Explicitly" "false"
// "Specify type explicitly" "false"
val <caret>x = BadType()
idea/testData/intentions/specifyType/beforeBadCaretPosition.kt
+1 -1
View File
@@ -1,2 +1,2 @@
// "Specify Type Explicitly" "false"
// "Specify type explicitly" "false"
val x = "<caret>"
idea/testData/intentions/specifyType/beforeClassNameClashing.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "Specify Type Explicitly" "true"
// "Specify type explicitly" "true"
fun getEntry() : Map.Entry<jet.Array<String>, java.sql.Array> {
}
idea/testData/intentions/specifyType/beforeFunctionType.kt
+1 -1
View File
@@ -1,2 +1,2 @@
// "Specify Type Explicitly" "true"
// "Specify type explicitly" "true"
val x<caret> = { (a: Int) -> ""}
idea/testData/intentions/specifyType/beforeLoopParameter.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "Specify Type Explicitly" "true"
// "Specify type explicitly" "true"
import java.util.HashMap
fun foo(map : HashMap<String, Int>) {
idea/testData/intentions/specifyType/beforeOnType.kt
+1 -1
View File
@@ -1,3 +1,3 @@
// "Remove Explicitly Specified Type" "true"
// "Remove explicitly specified type" "true"
val x : Map.Entry<Stri<caret>ng, Int>? = null
idea/testData/intentions/specifyType/beforeStringRedefined.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "Specify Type Explicitly" "true"
// "Specify type explicitly" "true"
class String {}
val <caret>x = ""
idea/testData/intentions/specifyType/beforeTypeAlreadyProvided.kt
+1 -1
View File
@@ -1,2 +1,2 @@
// "Remove Explicitly Specified Type" "true"
// "Remove explicitly specified type" "true"
val x<caret> : String = ""
idea/testData/intentions/specifyType/beforeUnitType.kt
+1 -1
View File
@@ -1,2 +1,2 @@
// "Specify Type Explicitly" "true"
// "Specify type explicitly" "true"
val x <caret>= Unit.VALUE
idea/testData/intentions/specifyType/beforeUnknownType.kt
+1 -1
View File
@@ -1,2 +1,2 @@
// "Specify Type Explicitly" "false"
// "Specify type explicitly" "false"
val <caret>x = BadType()