allow puml without final newline

Author: xiangu-batw

plantuml/parser/puml_parser/src/grammar/include.pest

@@ -31,16 +31,18 @@ IGNORED   = _{ (WHITESPACE | COMMENT)+ }
 
 // Entry Rule
 file = { SOI ~ line* ~ EOI }
+line_end = _{ NEWLINE | &EOI }
 
 line= _{
       includesub_line
     | include_line
     | sub_block
     | text_line
+    | NEWLINE
 }
 
 // ---------------- Include ----------------
-include_line = { include_directive ~ NEWLINE }
+include_line = { include_directive ~ line_end }
 include_directive = {
     include_keyword ~ include_path
 }
@@ -52,7 +54,7 @@ include_keyword = {
 include_path = @{ (!"!" ~(ASCII_ALPHANUMERIC | "_" | "-" | "." | "/" | " "))+ }
 
 // --------------- IncludeSub ---------------
-includesub_line = { includesub_directive ~ NEWLINE }
+includesub_line = { includesub_directive ~ line_end }
 includesub_directive = {
     "!includesub" ~ include_path ~ include_suffix ~ !include_suffix
 }
@@ -65,18 +67,19 @@ include_index = @{ ASCII_DIGIT+ }
 
 // ---------------- SubBlock ----------------
 sub_block = {
-    startsub_directive ~ NEWLINE ~ sub_content* ~ endsub_directive ~ NEWLINE
+    startsub_directive ~ NEWLINE ~ sub_content* ~ endsub_directive ~ line_end
 }
 startsub_directive = { "!startsub" ~ ((include_index | include_label)) }
 endsub_directive = { "!endsub" }
 sub_content = _{
       includesub_line
     | include_line
     | text_line
+    | NEWLINE
  }
 
 // ---------------- Text Line ----------------
-text_line = { (!("!" ~ preprocess_keyword) ~ (!NEWLINE ~ ANY)*) ~ NEWLINE }
+text_line = { (!("!" ~ preprocess_keyword) ~ (!NEWLINE ~ ANY)+) ~ line_end }
 preprocess_keyword = {
       include_keyword
     | "includesub"

plantuml/parser/puml_parser/src/preprocessor/src/include/include_parser.rs

@@ -245,6 +245,18 @@ mod tests {
         assert_eq!(path, "path/to/file");
     }
 
+    #[test]
+    fn test_parse_include_without_trailing_newline() {
+        let input = "@startuml\n!include path/to/file";
+
+        let result = IncludeParser::parse(Rule::file, input);
+
+        assert!(
+            result.is_ok(),
+            "expected parser to accept !include at EOF without trailing newline"
+        );
+    }
+
     #[test]
     fn test_parse_includesub_directive() {
         let input = "!includesub path/to/file!2";
@@ -257,6 +269,18 @@ mod tests {
         assert!(matches!(suffix, IncludeSuffix::Index(2)));
     }
 
+    #[test]
+    fn test_parse_includesub_without_trailing_newline() {
+        let input = "@startuml\n!includesub path/to/file!2";
+
+        let result = IncludeParser::parse(Rule::file, input);
+
+        assert!(
+            result.is_ok(),
+            "expected parser to accept !includesub at EOF without trailing newline"
+        );
+    }
+
     #[test]
     fn test_parse_file_io_error() {
         let mut service = IncludeParserService;
@@ -267,4 +291,28 @@ mod tests {
             Err(IncludeParseError::Base(BaseParseError::IoError { .. }))
         ));
     }
+
+    #[test]
+    fn test_parse_file_without_trailing_newline() {
+        let input = "@startuml\nclass User {}\n@enduml";
+
+        let result = IncludeParser::parse(Rule::file, input);
+
+        assert!(
+            result.is_ok(),
+            "expected parser to accept EOF without trailing newline"
+        );
+    }
+
+    #[test]
+    fn test_parse_sub_block_without_trailing_newline() {
+        let input = "!startsub label\nclass User {}\n!endsub";
+
+        let result = IncludeParser::parse(Rule::file, input);
+
+        assert!(
+            result.is_ok(),
+            "expected parser to accept !endsub at EOF without trailing newline"
+        );
+    }
 }