From 9a2307927c8f5440b41daaa02a484ec50331baed Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Tue, 8 Nov 2022 11:22:09 -0500
Subject: [PATCH 1/2] fix: Allow unicode in javadoc comments

---
 third_party/docfx-doclet-143274/pom.xml                     | 6 ++++++
 .../src/main/java/com/microsoft/lookup/BaseLookup.java      | 5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/third_party/docfx-doclet-143274/pom.xml b/third_party/docfx-doclet-143274/pom.xml
index 5aff67b1..938f9057 100644
--- a/third_party/docfx-doclet-143274/pom.xml
+++ b/third_party/docfx-doclet-143274/pom.xml
@@ -17,6 +17,7 @@
     <apache.commons-lang.version>3.12.0</apache.commons-lang.version>
     <apache.commons-collections.version>4.4</apache.commons-collections.version>
     <apache.commons-io.version>2.11.0</apache.commons-io.version>
+    <apache.commons-text.version>1.10.0</apache.commons-text.version>
     <remark.version>1.1.0</remark.version>
   </properties>
 
@@ -111,6 +112,11 @@
       <artifactId>commons-io</artifactId>
       <version>${apache.commons-io.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
+      <version>${apache.commons-text.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
diff --git a/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/BaseLookup.java b/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/BaseLookup.java
index d4f04d14..d537949f 100644
--- a/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/BaseLookup.java
+++ b/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/BaseLookup.java
@@ -13,14 +13,13 @@
 import com.sun.source.doctree.LinkTree;
 import com.sun.source.doctree.LiteralTree;
 import com.sun.source.doctree.SeeTree;
-import java.util.concurrent.ConcurrentHashMap;
 import jdk.javadoc.doclet.DocletEnvironment;
 import org.apache.commons.lang3.RegExUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -242,7 +241,7 @@ String replaceLinksAndCodes(List<? extends DocTree> items) {
                     case LITERAL:
                         return expandLiteralBody((LiteralTree) bodyItem);
                     default:
-                        return String.valueOf(bodyItem);
+                        return String.valueOf(StringEscapeUtils.unescapeJava(bodyItem.toString()));
                 }
             }
         ).collect(Collectors.joining()));

From ba9b79ed711046071f83f221db723ca79247552a Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Tue, 8 Nov 2022 12:01:10 -0500
Subject: [PATCH 2/2] chore: Add tests for unicode support

---
 .../main/java/com/microsoft/lookup/BaseLookup.java    |  4 ++--
 .../java/com/microsoft/lookup/BaseLookupTest.java     | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/BaseLookup.java b/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/BaseLookup.java
index d537949f..ba6b808b 100644
--- a/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/BaseLookup.java
+++ b/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/BaseLookup.java
@@ -260,11 +260,11 @@ String buildXrefTag(LinkTree linkTree) {
     }
 
     String buildCodeTag(LiteralTree literalTree) {
-        return String.format("<code>%s</code>", literalTree.getBody());
+        return String.format("<code>%s</code>", StringEscapeUtils.unescapeJava(literalTree.getBody().toString()));
     }
 
     String expandLiteralBody(LiteralTree bodyItem) {
-        return String.valueOf(bodyItem.getBody());
+        return String.valueOf(StringEscapeUtils.unescapeJava(bodyItem.getBody().toString()));
     }
 
     protected Optional<DocCommentTree> getDocCommentTree(T element) {
diff --git a/third_party/docfx-doclet-143274/src/test/java/com/microsoft/lookup/BaseLookupTest.java b/third_party/docfx-doclet-143274/src/test/java/com/microsoft/lookup/BaseLookupTest.java
index c978e643..4078facd 100644
--- a/third_party/docfx-doclet-143274/src/test/java/com/microsoft/lookup/BaseLookupTest.java
+++ b/third_party/docfx-doclet-143274/src/test/java/com/microsoft/lookup/BaseLookupTest.java
@@ -134,7 +134,7 @@ public void buildXrefTagWhenLabelPresents() {
 
     @Test
     public void buildCodeTag() {
-        String tagContent = "Some text";
+        String tagContent = "Some text ≤";
         when(literalTree.getBody()).thenReturn(textTree);
         when(textTree.toString()).thenReturn(tagContent);
 
@@ -145,13 +145,14 @@ public void buildCodeTag() {
 
     @Test
     public void expandLiteralBody() {
-        String tagContent = "Some text";
+        String tagContent = "Some text ≤ \u2264";
         when(literalTree.getBody()).thenReturn(textTree);
         when(textTree.toString()).thenReturn(tagContent);
 
         String result = baseLookup.expandLiteralBody(literalTree);
+        String expected = "Some text ≤ ≤";
 
-        assertEquals("Wrong result", result, tagContent);
+        assertEquals("Wrong result", result, expected);
     }
 
     @Test
@@ -159,7 +160,7 @@ public void replaceLinksAndCodes() {
         when(linkTree.getReference()).thenReturn(referenceTree);
         when(referenceTree.getSignature()).thenReturn("Some#signature");
         when(linkTree.getLabel()).thenReturn(Collections.emptyList());
-        String textTreeContent = "Some text content";
+        String textTreeContent = "Some text content ≤ \u2264";
         when(literalTree.getBody()).thenReturn(textTree);
         when(textTree.toString()).thenReturn(textTreeContent);
         when(linkTree.getKind()).thenReturn(Kind.LINK);
@@ -169,7 +170,7 @@ public void replaceLinksAndCodes() {
         String result = baseLookup.replaceLinksAndCodes(Arrays.asList(linkTree, literalTree, textTree));
 
         assertEquals("Wrong result", result, "<xref uid=\"Some#signature\" data-throw-if-not-resolved=\"false\">"
-                + "Some#signature</xref><code>Some text content</code>" + textTreeContent);
+                + "Some#signature</xref><code>Some text content ≤ ≤</code>" + textTreeContent);
     }
 
     @Test