2 files changed, 12 insertions, 5 deletions

diff --git a/crates/ra_syntax/src/validation/byte.rs b/crates/ra_syntax/src/validation/byte.rs
index d0897eeed..714224b09 100644
--- a/crates/ra_syntax/src/validation/byte.rs
+++ b/crates/ra_syntax/src/validation/byte.rs
@@ -88,7 +88,9 @@ fn validate_byte_escape(text: &str, range: TextRange, errors: &mut Vec<SyntaxErr
 
 fn validate_byte_code_escape(text: &str, range: TextRange, errors: &mut Vec<SyntaxError>) {
     // A ByteCodeEscape has 4 chars, example: `\xDD`
-    if text.len() < 4 {
+    if !text.is_ascii() {
+        errors.push(SyntaxError::new(MalformedByteCodeEscape, range));
+    } else if text.chars().count() < 4 {
         errors.push(SyntaxError::new(TooShortByteCodeEscape, range));
     } else {
         assert!(
diff --git a/crates/ra_syntax/src/validation/char.rs b/crates/ra_syntax/src/validation/char.rs
index 10d3d1dec..1d6fe8837 100644
--- a/crates/ra_syntax/src/validation/char.rs
+++ b/crates/ra_syntax/src/validation/char.rs
@@ -89,12 +89,17 @@ pub(super) fn is_ascii_escape(code: char) -> bool {
 
 fn validate_ascii_code_escape(text: &str, range: TextRange, errors: &mut Vec<SyntaxError>) {
     // An AsciiCodeEscape has 4 chars, example: `\xDD`
-    if text.len() < 4 {
+    if !text.is_ascii() {
+        // TODO: Give a more precise error message (say what the invalid character was)
+        errors.push(SyntaxError::new(AsciiCodeEscapeOutOfRange, range));
+    } else if text.chars().count() < 4 {
         errors.push(SyntaxError::new(TooShortAsciiCodeEscape, range));
     } else {
-        assert!(
-            text.chars().count() == 4,
-            "AsciiCodeEscape cannot be longer than 4 chars"
+        assert_eq!(
+            text.chars().count(),
+            4,
+            "AsciiCodeEscape cannot be longer than 4 chars, but text '{}' is",
+            text,
         );
 
         match u8::from_str_radix(&text[2..], 16) {