Extract Function: Capitalize conflict messages
This commit is contained in:
@@ -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>
|
||||
@@ -18,6 +18,7 @@ package org.jetbrains.jet.plugin.refactoring;
|
||||
|
||||
import com.intellij.CommonBundle;
|
||||
import org.jetbrains.annotations.NonNls;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.PropertyKey;
|
||||
|
||||
import java.lang.ref.Reference;
|
||||
@@ -33,6 +34,7 @@ public class JetRefactoringBundle {
|
||||
private JetRefactoringBundle() {
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public static String message(@NonNls @PropertyKey(resourceBundle = BUNDLE)String key, Object... params) {
|
||||
return CommonBundle.message(getBundle(), key, params);
|
||||
}
|
||||
|
||||
+2
-2
@@ -672,7 +672,7 @@ fun ExtractionDescriptor.validate(): ExtractionDescriptorWithConflicts {
|
||||
JetRefactoringBundle.message(
|
||||
"0.will.no.longer.be.accessible.after.extraction",
|
||||
RefactoringUIUtil.getDescription(resolveResult.declaration, true)
|
||||
)
|
||||
).capitalize()
|
||||
)
|
||||
continue
|
||||
}
|
||||
@@ -682,7 +682,7 @@ fun ExtractionDescriptor.validate(): ExtractionDescriptorWithConflicts {
|
||||
resolveResult.originalRefExpr,
|
||||
JetRefactoringBundle.message(
|
||||
"0.will.become.invisible.after.extraction",
|
||||
RefactoringUIUtil.getDescription(resolveResult.declaration, true)
|
||||
RefactoringUIUtil.getDescription(resolveResult.declaration, true).capitalize()
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
function foo.bar will no longer be accessible after extraction
|
||||
Function foo.bar will no longer be accessible after extraction
|
||||
@@ -1 +1 @@
|
||||
function foo.bar will no longer be accessible after extraction
|
||||
Function foo.bar will no longer be accessible after extraction
|
||||
@@ -1 +1 @@
|
||||
property A.t will become invisible after extraction
|
||||
Property A.t will become invisible after extraction
|
||||
Reference in New Issue
Block a user