1 files changed, 54 insertions, 10 deletions

diff --git a/crates/ra_syntax/src/validation.rs b/crates/ra_syntax/src/validation.rs
index c2f545173..11a1fb4a7 100644
--- a/crates/ra_syntax/src/validation.rs
+++ b/crates/ra_syntax/src/validation.rs
@@ -1,17 +1,17 @@
-mod byte;
-mod byte_string;
-mod char;
-mod string;
+mod unescape;
+
 mod block;
 mod field_expr;
 
 use crate::{
-    SourceFile, SyntaxError, AstNode, SyntaxNode,
+    SourceFile, SyntaxError, AstNode, SyntaxNode, TextUnit,
     SyntaxKind::{L_CURLY, R_CURLY, BYTE, BYTE_STRING, STRING, CHAR},
     ast,
     algo::visit::{visitor_ctx, VisitorCtx},
 };
 
+pub(crate) use unescape::EscapeError;
+
 pub(crate) fn validate(file: &SourceFile) -> Vec<SyntaxError> {
     let mut errors = Vec::new();
     for node in file.syntax().descendants() {
@@ -26,11 +26,55 @@ pub(crate) fn validate(file: &SourceFile) -> Vec<SyntaxError> {
 
 // FIXME: kill duplication
 fn validate_literal(literal: &ast::Literal, acc: &mut Vec<SyntaxError>) {
-    match literal.token().kind() {
-        BYTE => byte::validate_byte_node(literal.token(), acc),
-        BYTE_STRING => byte_string::validate_byte_string_node(literal.token(), acc),
-        STRING => string::validate_string_node(literal.token(), acc),
-        CHAR => char::validate_char_node(literal.token(), acc),
+    let token = literal.token();
+    let text = token.text().as_str();
+    match token.kind() {
+        BYTE => {
+            if let Some(end) = text.rfind('\'') {
+                if let Some(without_quotes) = text.get(2..end) {
+                    if let Err((off, err)) = unescape::unescape_byte(without_quotes) {
+                        let off = token.range().start() + TextUnit::from_usize(off + 2);
+                        acc.push(SyntaxError::new(err.into(), off))
+                    }
+                }
+            }
+        }
+        CHAR => {
+            if let Some(end) = text.rfind('\'') {
+                if let Some(without_quotes) = text.get(1..end) {
+                    if let Err((off, err)) = unescape::unescape_char(without_quotes) {
+                        let off = token.range().start() + TextUnit::from_usize(off + 1);
+                        acc.push(SyntaxError::new(err.into(), off))
+                    }
+                }
+            }
+        }
+        BYTE_STRING => {
+            if let Some(end) = text.rfind('\"') {
+                if let Some(without_quotes) = text.get(2..end) {
+                    unescape::unescape_byte_str(without_quotes, &mut |range, char| {
+                        if let Err(err) = char {
+                            let off = range.start;
+                            let off = token.range().start() + TextUnit::from_usize(off + 2);
+                            acc.push(SyntaxError::new(err.into(), off))
+                        }
+                    })
+                }
+            }
+        }
+        STRING => {
+            if let Some(end) = text.rfind('\"') {
+                if let Some(without_quotes) = text.get(1..end) {
+                    unescape::unescape_str(without_quotes, &mut |range, char| {
+                        if let Err(err) = char {
+                            let off = range.start;
+                            let off = token.range().start() + TextUnit::from_usize(off + 1);
+                            acc.push(SyntaxError::new(err.into(), off))
+                        }
+                    })
+                }
+            }
+        }
         _ => (),
     }
 }