Add working test and change error range

I was putting the error on the `return` to match how it's on the `if` when missing the `end`. But the code review made me realize that where the `end` can be is arbitrary with an if statement, but not with a return statement.

Author: PennyJim

crates/emmylua_parser/src/grammar/doc/test.rs

@@ -3733,7 +3733,8 @@ Syntax(Chunk)@0..47
 
         assert_eq!(errors.len(), 1);
         assert_eq!(errors[0].kind, LuaParseErrorKind::SyntaxError);
-        assert_eq!(errors[0].message, "expected end of block after return")
+        assert_eq!(errors[0].message, "expected end of block after return");
+        assert_eq!(u32::from(errors[0].range.start()) as usize, 12);
     }
 
     #[test]
@@ -3744,6 +3745,16 @@ Syntax(Chunk)@0..47
 
         assert_eq!(errors.len(), 1);
         assert_eq!(errors[0].kind, LuaParseErrorKind::SyntaxError);
-        assert_eq!(errors[0].message, "expected end of block after return")
+        assert_eq!(errors[0].message, "expected end of block after return");
+        assert_eq!(u32::from(errors[0].range.start()) as usize, 8);
+    }
+
+    #[test]
+    fn test_do_return_end() {
+      let code = "do return end";
+      let tree = LuaParser::parse(code, ParserConfig::default());
+      let errors = tree.get_errors();
+
+      assert!(errors.is_empty());
     }
 }

crates/emmylua_parser/src/grammar/lua/stat.rs

@@ -752,7 +752,6 @@ fn parse_attrib(p: &mut LuaParser) -> ParseResult {
 
 fn parse_return(p: &mut LuaParser) -> ParseResult {
     let m = p.mark(LuaSyntaxKind::ReturnStat);
-    let return_start_range = p.current_token_range();
     p.bump();
     if !block_follow(p)
         && p.current_token() != LuaTokenKind::TkSemicolon
@@ -766,9 +765,9 @@ fn parse_return(p: &mut LuaParser) -> ParseResult {
     if !block_follow(p) {
         p.push_error(LuaParseError::syntax_error_from(
             &t!("expected end of block after return"),
-            return_start_range,
+            p.current_token_range(),
         ));
-    };
+    }
 
     Ok(m.complete(p))
 }