From ed0f23ce0c6903addaa97c8285ce51adaad863d3 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 13 Feb 2020 15:08:21 +0100
Subject: [PATCH] [java] making "convert to Basic Latin" intention produce
 uppercase Unicode escapes (IDEA-232859)

GitOrigin-RevId: 6120c9d5a5c6b3ed1fc51cfb6af5e1e2f8a75e1c
---
 .../intention/impl/ConvertToBasicLatinAction.java            | 5 +++--
 .../codeInsight/convertToBasicLatin/CharLiteral_after.java   | 2 +-
 .../testData/codeInsight/convertToBasicLatin/DocComment.java | 5 ++---
 .../codeInsight/convertToBasicLatin/DocComment_after.java    | 5 ++---
 .../codeInsight/convertToBasicLatin/StringLiteral_after.java | 2 +-
 .../codeInsight/convertToBasicLatin/UnclosedDocComment.java  | 2 +-
 .../convertToBasicLatin/UnclosedDocComment_after.java        | 2 +-
 .../convertToBasicLatin/UnclosedStringLiteral_after.java     | 2 +-
 8 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertToBasicLatinAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertToBasicLatinAction.java
index 61595bba1bed..4fa0cb27becc 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertToBasicLatinAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertToBasicLatinAction.java
@@ -26,6 +26,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -129,7 +130,7 @@ public class ConvertToBasicLatinAction extends PsiElementBaseIntentionAction {
 
     @Override
     protected void convert(StringBuilder sb, char ch) {
-      sb.append(String.format("\\u%04x", (int)ch));
+      sb.append(String.format("\\u%04X", (int)ch));
     }
   }
 
@@ -154,7 +155,7 @@ public class ConvertToBasicLatinAction extends PsiElementBaseIntentionAction {
         sb.append('&').append(entity).append(';');
       }
       else {
-        sb.append("&#x").append(Integer.toHexString(ch)).append(';');
+        sb.append("&#x").append(Integer.toHexString(ch).toUpperCase(Locale.ENGLISH)).append(';');
       }
     }
 
diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/CharLiteral_after.java b/java/java-tests/testData/codeInsight/convertToBasicLatin/CharLiteral_after.java
index 2826f3e0bf30..d4652b9e7f8e 100644
--- a/java/java-tests/testData/codeInsight/convertToBasicLatin/CharLiteral_after.java
+++ b/java/java-tests/testData/codeInsight/convertToBasicLatin/CharLiteral_after.java
@@ -1,3 +1,3 @@
 class C {
-    char ch = '\u00a9';
+    char ch = '\u00A9';
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/DocComment.java b/java/java-tests/testData/codeInsight/convertToBasicLatin/DocComment.java
index f1329a829735..5e599a98d0e6 100644
--- a/java/java-tests/testData/codeInsight/convertToBasicLatin/DocComment.java
+++ b/java/java-tests/testData/codeInsight/convertToBasicLatin/DocComment.java
@@ -1,5 +1,4 @@
 /**<caret>
- * Copyright © 2000-2010 JetBrains s.r.o.
+ * Copyright © 2000⋯ JetBrains s.r.o.
  */
-class C {
-}
\ No newline at end of file
+class C { }
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/DocComment_after.java b/java/java-tests/testData/codeInsight/convertToBasicLatin/DocComment_after.java
index 39cc65a190b1..aa8943189ac2 100644
--- a/java/java-tests/testData/codeInsight/convertToBasicLatin/DocComment_after.java
+++ b/java/java-tests/testData/codeInsight/convertToBasicLatin/DocComment_after.java
@@ -1,5 +1,4 @@
 /**
- * Copyright &copy; 2000-2010 JetBrains s.r.o.
+ * Copyright &copy; 2000&#x22EF; JetBrains s.r.o.
  */
-class C {
-}
\ No newline at end of file
+class C { }
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/StringLiteral_after.java b/java/java-tests/testData/codeInsight/convertToBasicLatin/StringLiteral_after.java
index 8622f9b4c4d3..43344b51e4fb 100644
--- a/java/java-tests/testData/codeInsight/convertToBasicLatin/StringLiteral_after.java
+++ b/java/java-tests/testData/codeInsight/convertToBasicLatin/StringLiteral_after.java
@@ -1,3 +1,3 @@
 class C {
-    String s = "\u00c1\u00ee";
+    String s = "\u00C1\u00EE";
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedDocComment.java b/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedDocComment.java
index fe79dce52886..c1882e1c3321 100644
--- a/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedDocComment.java
+++ b/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedDocComment.java
@@ -1,2 +1,2 @@
 /**<caret>
- * Copyright © 2000-2010 JetBrains s.r.o.
\ No newline at end of file
+ * Copyright © 2000⋯ JetBrains s.r.o.
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedDocComment_after.java b/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedDocComment_after.java
index ae76ea86ad33..938c65fc0ca2 100644
--- a/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedDocComment_after.java
+++ b/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedDocComment_after.java
@@ -1,2 +1,2 @@
 /**
- * Copyright &copy; 2000-2010 JetBrains s.r.o.
\ No newline at end of file
+ * Copyright &copy; 2000&#x22EF; JetBrains s.r.o.
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedStringLiteral_after.java b/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedStringLiteral_after.java
index f9e63ddd5794..abeb9d2fc4c0 100644
--- a/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedStringLiteral_after.java
+++ b/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedStringLiteral_after.java
@@ -1,3 +1,3 @@
 class C {
-    String s = "\u00c1\u00ee
+    String s = "\u00C1\u00EE
 }
\ No newline at end of file