From 7a6e5f66bd8c70d1101ff9e6ed54757799c81578 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Wed, 8 Jul 2015 18:37:54 +0300
Subject: [PATCH] Regression test: char + int = char

---
 compiler/testData/diagnostics/tests/regressions/intchar.kt  | 1 +
 compiler/testData/diagnostics/tests/regressions/intchar.txt | 3 +++
 .../kotlin/checkers/JetDiagnosticsTestGenerated.java        | 6 ++++++
 3 files changed, 10 insertions(+)
 create mode 100644 compiler/testData/diagnostics/tests/regressions/intchar.kt
 create mode 100644 compiler/testData/diagnostics/tests/regressions/intchar.txt

diff --git a/compiler/testData/diagnostics/tests/regressions/intchar.kt b/compiler/testData/diagnostics/tests/regressions/intchar.kt
new file mode 100644
index 00000000000..edfb8c134cb
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/regressions/intchar.kt
@@ -0,0 +1 @@
+val x: Char = '1'.plus(1)
diff --git a/compiler/testData/diagnostics/tests/regressions/intchar.txt b/compiler/testData/diagnostics/tests/regressions/intchar.txt
new file mode 100644
index 00000000000..2f0f30574f6
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/regressions/intchar.txt
@@ -0,0 +1,3 @@
+package
+
+internal val x: kotlin.Char = \u0032 ('2')
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
index 1558a70e534..447854e66f9 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
@@ -10530,6 +10530,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("intchar.kt")
+            public void testIntchar() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/intchar.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("itselfAsUpperBound.kt")
             public void testItselfAsUpperBound() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/itselfAsUpperBound.kt");