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

Extract Function: Capitalize conflict messages

Browse Source
This commit is contained in:
Alexey Sedunov
2014-07-03 20:32:18 +04:00
parent d95f6383b7
commit ac17594f67
6 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
annotations/com/intellij/refactoring/util/annotations.xml
+5
View File
@@ -0,0 +1,5 @@
<root>
<item name='com.intellij.refactoring.util.RefactoringUIUtil java.lang.String getDescription(com.intellij.psi.PsiElement, boolean)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
</root>
idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringBundle.java
+2
View File
@@ -18,6 +18,7 @@ package org.jetbrains.jet.plugin.refactoring;
import com.intellij.CommonBundle; import com.intellij.CommonBundle;
import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.PropertyKey; import org.jetbrains.annotations.PropertyKey;
import java.lang.ref.Reference; import java.lang.ref.Reference;
@@ -33,6 +34,7 @@ public class JetRefactoringBundle {
private JetRefactoringBundle() { private JetRefactoringBundle() {
} }
@NotNull
public static String message(@NonNls @PropertyKey(resourceBundle = BUNDLE)String key, Object... params) { public static String message(@NonNls @PropertyKey(resourceBundle = BUNDLE)String key, Object... params) {
return CommonBundle.message(getBundle(), key, params); return CommonBundle.message(getBundle(), key, params);
} }
idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt
+2 -2
View File
@@ -672,7 +672,7 @@ fun ExtractionDescriptor.validate(): ExtractionDescriptorWithConflicts {
JetRefactoringBundle.message( JetRefactoringBundle.message(
"0.will.no.longer.be.accessible.after.extraction", "0.will.no.longer.be.accessible.after.extraction",
RefactoringUIUtil.getDescription(resolveResult.declaration, true) RefactoringUIUtil.getDescription(resolveResult.declaration, true)
) ).capitalize()
) )
continue continue
} }
@@ -682,7 +682,7 @@ fun ExtractionDescriptor.validate(): ExtractionDescriptorWithConflicts {
resolveResult.originalRefExpr, resolveResult.originalRefExpr,
JetRefactoringBundle.message( JetRefactoringBundle.message(
"0.will.become.invisible.after.extraction", "0.will.become.invisible.after.extraction",
RefactoringUIUtil.getDescription(resolveResult.declaration, true) RefactoringUIUtil.getDescription(resolveResult.declaration, true).capitalize()
) )
) )
} }
idea/testData/refactoring/extractFunction/basic/localFunctionRef.kt.conflicts
+1 -1
View File
@@ -1 +1 @@
function foo.bar will no longer be accessible after extraction Function foo.bar will no longer be accessible after extraction
idea/testData/refactoring/extractFunction/basic/misdirectedRef.kt.conflicts
+1 -1
View File
@@ -1 +1 @@
function foo.bar will no longer be accessible after extraction Function foo.bar will no longer be accessible after extraction
idea/testData/refactoring/extractFunction/basic/privateMemberRef.kt.conflicts
+1 -1
View File
@@ -1 +1 @@
property A.t will become invisible after extraction Property A.t will become invisible after extraction