From b6386e345c7851e5920629a28513b0bf95a5a077 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Thu, 12 Sep 2013 17:28:00 +0400
Subject: [PATCH] added positioning for 'ILLEGAL_ESCAPE' error

---
 .../jet/lang/diagnostics/Errors.java          |  2 +-
 .../diagnostics/PositioningStrategies.java    | 16 ++++++++++++
 .../tests/IncorrectCharacterLiterals.kt       | 26 +++++++++----------
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
index 164dc93afc3..7114358b97f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
@@ -468,7 +468,7 @@ public interface Errors {
     DiagnosticFactory0<JetConstantExpression> INCORRECT_CHARACTER_LITERAL = DiagnosticFactory0.create(ERROR);
     DiagnosticFactory0<JetConstantExpression> EMPTY_CHARACTER_LITERAL = DiagnosticFactory0.create(ERROR);
     DiagnosticFactory1<JetConstantExpression, JetConstantExpression> TOO_MANY_CHARACTERS_IN_CHARACTER_LITERAL = DiagnosticFactory1.create(ERROR);
-    DiagnosticFactory1<JetElement, JetElement> ILLEGAL_ESCAPE = DiagnosticFactory1.create(ERROR);
+    DiagnosticFactory1<JetElement, JetElement> ILLEGAL_ESCAPE = DiagnosticFactory1.create(ERROR, CUT_CHAR_QUOTES);
     DiagnosticFactory1<JetConstantExpression, JetType> NULL_FOR_NONNULL_TYPE = DiagnosticFactory1.create(ERROR);
     DiagnosticFactory0<JetEscapeStringTemplateEntry> ILLEGAL_ESCAPE_SEQUENCE = DiagnosticFactory0.create(ERROR);
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java
index 808b77e3d56..d94f17ae1aa 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNameIdentifierOwner;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.JetNodeTypes;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lexer.JetKeywordToken;
 import org.jetbrains.jet.lexer.JetTokens;
@@ -433,6 +434,21 @@ public class PositioningStrategies {
         }
     };
 
+    public static final PositioningStrategy<JetElement> CUT_CHAR_QUOTES = new PositioningStrategy<JetElement>() {
+        @NotNull
+        @Override
+        public List<TextRange> mark(@NotNull JetElement element) {
+            if (element instanceof JetConstantExpression) {
+                if (element.getNode().getElementType() == JetNodeTypes.CHARACTER_CONSTANT) {
+                    TextRange elementTextRange = element.getTextRange();
+                    return Collections.singletonList(
+                            TextRange.create(elementTextRange.getStartOffset() + 1, elementTextRange.getEndOffset() - 1));
+                }
+            }
+            return super.mark(element);
+        }
+    };
+
     private PositioningStrategies() {
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/IncorrectCharacterLiterals.kt b/compiler/testData/diagnostics/tests/IncorrectCharacterLiterals.kt
index 6bde61ccbe3..ebc5d2d4a0d 100644
--- a/compiler/testData/diagnostics/tests/IncorrectCharacterLiterals.kt
+++ b/compiler/testData/diagnostics/tests/IncorrectCharacterLiterals.kt
@@ -6,7 +6,7 @@ fun ff() {
     val <!UNUSED_VARIABLE!>c<!> = <!TOO_MANY_CHARACTERS_IN_CHARACTER_LITERAL!>'23'<!>
     val <!UNUSED_VARIABLE!>d<!> = <!INCORRECT_CHARACTER_LITERAL!>'a<!>
     val <!UNUSED_VARIABLE!>e<!> = <!INCORRECT_CHARACTER_LITERAL!>'ab<!>
-    val <!UNUSED_VARIABLE!>f<!> = <!ILLEGAL_ESCAPE!>'\'<!>
+    val <!UNUSED_VARIABLE!>f<!> = '<!ILLEGAL_ESCAPE!>\<!>'
 }
 
 fun test() {
@@ -19,19 +19,19 @@ fun test() {
     <!UNUSED_EXPRESSION!>'\''<!>
     <!UNUSED_EXPRESSION!>'\\'<!>
     <!UNUSED_EXPRESSION!>'\$'<!>
-    <!ILLEGAL_ESCAPE, UNUSED_EXPRESSION!>'\x'<!>
-    <!ILLEGAL_ESCAPE, UNUSED_EXPRESSION!>'\123'<!>
-    <!ILLEGAL_ESCAPE, UNUSED_EXPRESSION!>'\ra'<!>
-    <!ILLEGAL_ESCAPE, UNUSED_EXPRESSION!>'\000'<!>
-    <!ILLEGAL_ESCAPE, UNUSED_EXPRESSION!>'\000'<!>
+    <!UNUSED_EXPRESSION!>'<!ILLEGAL_ESCAPE!>\x<!>'<!>
+    <!UNUSED_EXPRESSION!>'<!ILLEGAL_ESCAPE!>\123<!>'<!>
+    <!UNUSED_EXPRESSION!>'<!ILLEGAL_ESCAPE!>\ra<!>'<!>
+    <!UNUSED_EXPRESSION!>'<!ILLEGAL_ESCAPE!>\000<!>'<!>
+    <!UNUSED_EXPRESSION!>'<!ILLEGAL_ESCAPE!>\000<!>'<!>
     <!UNUSED_EXPRESSION!>'\u0000'<!>
     <!UNUSED_EXPRESSION!>'\u000a'<!>
     <!UNUSED_EXPRESSION!>'\u000A'<!>
-    <!ILLEGAL_ESCAPE, UNUSED_EXPRESSION!>'\u'<!>
-    <!ILLEGAL_ESCAPE, UNUSED_EXPRESSION!>'\u0'<!>
-    <!ILLEGAL_ESCAPE, UNUSED_EXPRESSION!>'\u00'<!>
-    <!ILLEGAL_ESCAPE, UNUSED_EXPRESSION!>'\u000'<!>
-    <!ILLEGAL_ESCAPE, UNUSED_EXPRESSION!>'\u000z'<!>
-    <!ILLEGAL_ESCAPE, UNUSED_EXPRESSION!>'\\u000'<!>
-    <!ILLEGAL_ESCAPE, UNUSED_EXPRESSION!>'\'<!>
+    <!UNUSED_EXPRESSION!>'<!ILLEGAL_ESCAPE!>\u<!>'<!>
+    <!UNUSED_EXPRESSION!>'<!ILLEGAL_ESCAPE!>\u0<!>'<!>
+    <!UNUSED_EXPRESSION!>'<!ILLEGAL_ESCAPE!>\u00<!>'<!>
+    <!UNUSED_EXPRESSION!>'<!ILLEGAL_ESCAPE!>\u000<!>'<!>
+    <!UNUSED_EXPRESSION!>'<!ILLEGAL_ESCAPE!>\u000z<!>'<!>
+    <!UNUSED_EXPRESSION!>'<!ILLEGAL_ESCAPE!>\\u000<!>'<!>
+    <!UNUSED_EXPRESSION!>'<!ILLEGAL_ESCAPE!>\<!>'<!>
 }