Merge pull request #25 from ortus-solutions-private/comment-issue

Fixes the error of Javadoc comments in code

src/main/java/ortus/boxlang/parser/BoxAbstractParser.java

@@ -127,6 +127,7 @@ protected void addErrorListeners( Lexer lexer, Parser parser ) {
 		lexer.addErrorListener( errorListener );
 		parser.removeErrorListeners();
 		parser.addErrorListener( errorListener );
+		parser.setErrorHandler( new ParserErrorStrategy() );
 	}
 
 	/**

src/main/java/ortus/boxlang/parser/BoxCFParser.java

@@ -231,6 +231,7 @@ protected ParserRuleContext parserFirstStage( InputStream stream ) throws IOExce
 		CFParser		parser	= new CFParser( new CommonTokenStream( lexer ) );
 		addErrorListeners( lexer, parser );
 		ParserRuleContext parseTree = parser.script();
+
 		if ( lexer.hasUnpoppedModes() ) {
 			List<String>	modes		= lexer.getUnpoppedModes();
 
@@ -1534,8 +1535,10 @@ private List<BoxDocumentationAnnotation> toAst( File file, CFParser.JavadocConte
 			BoxDOCParser		parser	= new BoxDOCParser();
 			ParsingResult		result	= parser.parse( null, node.getText() );
 			BoxDocumentation	docs	= ( BoxDocumentation ) result.getRoot();
-			for ( BoxNode n : docs.getAnnotations() ) {
-				documentation.add( ( BoxDocumentationAnnotation ) n );
+			if ( docs != null ) {
+				for ( BoxNode n : docs.getAnnotations() ) {
+					documentation.add( ( BoxDocumentationAnnotation ) n );
+				}
 			}
 		} catch ( IOException e ) {
 			throw new RuntimeException( e );

src/main/java/ortus/boxlang/parser/ParserErrorStrategy.java

@@ -0,0 +1,24 @@
+package ortus.boxlang.parser;
+
+import org.antlr.v4.runtime.DefaultErrorStrategy;
+import org.antlr.v4.runtime.Parser;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.misc.IntervalSet;
+import ortus.boxlang.parser.antlr.CFLexer;
+
+/**
+ * Recover form errors having Javadoc in body
+ */
+public class ParserErrorStrategy extends DefaultErrorStrategy {
+
+	@Override
+	protected void reportUnwantedToken( Parser recognizer ) {
+		if ( inErrorRecoveryMode( recognizer ) ) {
+			return;
+		}
+		Token t = recognizer.getCurrentToken();
+		if ( t.getType() != CFLexer.JAVADOC_COMMENT ) {
+			super.reportUnwantedToken( recognizer );
+		}
+	}
+}

src/test/java/ortus/boxlang/compiler/TestRecover.java

@@ -0,0 +1,28 @@
+package ortus.boxlang.compiler;
+
+import org.junit.jupiter.api.Test;
+import ortus.boxlang.parser.BoxCFParser;
+import ortus.boxlang.parser.ParsingResult;
+
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestRecover {
+
+	@Test
+	public void testRecover() throws IOException {
+		String			code	= """
+		                          /**
+		                          */
+		                          function f() {
+		                              /**
+		                              */
+		                          }
+		                          """;
+
+		BoxCFParser		parser	= new BoxCFParser();
+		ParsingResult	result	= parser.parse( code );
+		assertTrue( result.isCorrect() );
+	}
+}