From f41a8d2c009f42a9bc6fa5dca886fa56ebd11cb1 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Mon, 13 Oct 2014 19:28:22 +0400
Subject: [PATCH] Render "<" properly in HTML

---
 .../org/jetbrains/jet/renderer/DescriptorRendererImpl.java    | 4 ++--
 idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
index 15013342182..bc479450983 100644
--- a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+++ b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
@@ -372,8 +372,8 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
 
         // Foo[] -> Array<(out) Foo!>!
         String array = replacePrefixes(
-                lowerRendered, kotlinPrefix + "Array<", upperRendered, kotlinPrefix + "Array<out ",
-                kotlinPrefix + "Array<(out) "
+                lowerRendered, kotlinPrefix + escape("Array<"), upperRendered, kotlinPrefix + escape("Array<out "),
+                kotlinPrefix + escape("Array<(out) ")
         );
         if (array != null) return array;
         return "(" + renderNormalizedType(lower) + ".." + renderNormalizedType(upper) + ")";
diff --git a/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt b/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt
index 7c71d064bcd..130341fb6f1 100644
--- a/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt
+++ b/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt
@@ -2,4 +2,4 @@ fun ktTest() {
     Test.<caret>foo("SomeTest")
 }
 
-// INFO: <b>public</b> <b>open</b> <b>fun</b> foo(param: String!): (Array&lt;Any!&gt;..Array&lt;out Any!&gt;?)<br/>Java declaration:<br/>Test...
\ No newline at end of file
+// INFO: <b>public</b> <b>open</b> <b>fun</b> foo(param: String!): Array&lt;(out) Any!&gt;!<br/>Java declaration:<br/>Test...
\ No newline at end of file