Validate byte string literals

1 files changed, 29 insertions, 21 deletions

diff --git a/crates/ra_syntax/src/validation/byte.rs b/crates/ra_syntax/src/validation/byte.rs
index 3d2806c4e..7baf3c1d7 100644
--- a/crates/ra_syntax/src/validation/byte.rs
+++ b/crates/ra_syntax/src/validation/byte.rs
@@ -20,26 +20,7 @@ pub(super) fn validate_byte_node(node: ast::Byte, errors: &mut Vec<SyntaxError>)
         len += 1;
         let text = &literal_text[component.range];
         let range = component.range + literal_range.start();
-
-        use self::CharComponentKind::*;
-        match component.kind {
-            AsciiEscape => validate_byte_escape(text, range, errors),
-            AsciiCodeEscape => validate_byte_code_escape(text, range, errors),
-            UnicodeEscape => errors.push(SyntaxError::new(UnicodeEscapeForbidden, range)),
-            CodePoint => {
-                let c = text.chars().next().expect("Code points should be one character long");
-
-                // These bytes must always be escaped
-                if c == '\t' || c == '\r' || c == '\n' {
-                    errors.push(SyntaxError::new(UnescapedByte, range));
-                }
-
-                // Only ASCII bytes are allowed
-                if c > 0x7F as char {
-                    errors.push(SyntaxError::new(ByteOutOfRange, range));
-                }
-            }
-        }
+        validate_byte_component(text, component.kind, range, errors);
     }
 
     if !components.has_closing_quote {
@@ -55,6 +36,33 @@ pub(super) fn validate_byte_node(node: ast::Byte, errors: &mut Vec<SyntaxError>)
     }
 }
 
+pub(super) fn validate_byte_component(
+    text: &str,
+    kind: CharComponentKind,
+    range: TextRange,
+    errors: &mut Vec<SyntaxError>,
+) {
+    use self::CharComponentKind::*;
+    match kind {
+        AsciiEscape => validate_byte_escape(text, range, errors),
+        AsciiCodeEscape => validate_byte_code_escape(text, range, errors),
+        UnicodeEscape => errors.push(SyntaxError::new(UnicodeEscapeForbidden, range)),
+        CodePoint => {
+            let c = text.chars().next().expect("Code points should be one character long");
+
+            // These bytes must always be escaped
+            if c == '\t' || c == '\r' || c == '\n' {
+                errors.push(SyntaxError::new(UnescapedByte, range));
+            }
+
+            // Only ASCII bytes are allowed
+            if c > 0x7F as char {
+                errors.push(SyntaxError::new(ByteOutOfRange, range));
+            }
+        }
+    }
+}
+
 fn validate_byte_escape(text: &str, range: TextRange, errors: &mut Vec<SyntaxError>) {
     if text.len() == 1 {
         // Escape sequence consists only of leading `\`
@@ -141,7 +149,7 @@ mod test {
     #[test]
     fn test_valid_byte_escape() {
         let valid = [
-            r"\'", "\"", "\\\\", "\\\"", r"\n", r"\r", r"\t", r"\0", "a", "b",
+            r"\'", "\"", "\\\\", "\\\"", r"\n", r"\r", r"\t", r"\0",
         ];
         for c in &valid {
             assert_valid_byte(c);