From ac17594f67d3311f4c8dfb339f38408a0495f25b Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Thu, 3 Jul 2014 20:32:18 +0400
Subject: [PATCH] Extract Function: Capitalize conflict messages

---
 annotations/com/intellij/refactoring/util/annotations.xml    | 5 +++++
 .../jet/plugin/refactoring/JetRefactoringBundle.java         | 2 ++
 .../refactoring/extractFunction/extractFunctionUtils.kt      | 4 ++--
 .../extractFunction/basic/localFunctionRef.kt.conflicts      | 2 +-
 .../extractFunction/basic/misdirectedRef.kt.conflicts        | 2 +-
 .../extractFunction/basic/privateMemberRef.kt.conflicts      | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 annotations/com/intellij/refactoring/util/annotations.xml

diff --git a/annotations/com/intellij/refactoring/util/annotations.xml b/annotations/com/intellij/refactoring/util/annotations.xml
new file mode 100644
index 00000000000..eb12c4fde93
--- /dev/null
+++ b/annotations/com/intellij/refactoring/util/annotations.xml
@@ -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>
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringBundle.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringBundle.java
index 64222d77a78..4a73d2aca50 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringBundle.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringBundle.java
@@ -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);
     }
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt
index f7ba32d51ee..9e4442d0de8 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt
@@ -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()
                     )
             )
         }
diff --git a/idea/testData/refactoring/extractFunction/basic/localFunctionRef.kt.conflicts b/idea/testData/refactoring/extractFunction/basic/localFunctionRef.kt.conflicts
index b22b8f15e81..8c70616458b 100644
--- a/idea/testData/refactoring/extractFunction/basic/localFunctionRef.kt.conflicts
+++ b/idea/testData/refactoring/extractFunction/basic/localFunctionRef.kt.conflicts
@@ -1 +1 @@
-function foo.bar will no longer be accessible after extraction
\ No newline at end of file
+Function foo.bar will no longer be accessible after extraction
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/basic/misdirectedRef.kt.conflicts b/idea/testData/refactoring/extractFunction/basic/misdirectedRef.kt.conflicts
index b22b8f15e81..8c70616458b 100644
--- a/idea/testData/refactoring/extractFunction/basic/misdirectedRef.kt.conflicts
+++ b/idea/testData/refactoring/extractFunction/basic/misdirectedRef.kt.conflicts
@@ -1 +1 @@
-function foo.bar will no longer be accessible after extraction
\ No newline at end of file
+Function foo.bar will no longer be accessible after extraction
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/basic/privateMemberRef.kt.conflicts b/idea/testData/refactoring/extractFunction/basic/privateMemberRef.kt.conflicts
index a5ca9d5fe14..cd10b5c7925 100644
--- a/idea/testData/refactoring/extractFunction/basic/privateMemberRef.kt.conflicts
+++ b/idea/testData/refactoring/extractFunction/basic/privateMemberRef.kt.conflicts
@@ -1 +1 @@
-property A.t will become invisible after extraction
\ No newline at end of file
+Property A.t will become invisible after extraction
\ No newline at end of file