[royale-compiler] branch develop updated: ASParser: fix end position of class, interface, and function, plus variable gated by config condition

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git


The following commit(s) were added to refs/heads/develop by this push:
     new 5577327  ASParser: fix end position of class, interface, and function, plus variable gated by config condition
5577327 is described below

commit 55773274ac864f6dc57d95ef63ad8d016278b78c
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Tue Nov 26 08:32:07 2019 -0800

    ASParser: fix end position of class, interface, and function, plus variable gated by config condition
---
 .../royale/compiler/internal/parsing/as/ASParser.g | 36 +++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/compiler/src/main/antlr/org/apache/royale/compiler/internal/parsing/as/ASParser.g b/compiler/src/main/antlr/org/apache/royale/compiler/internal/parsing/as/ASParser.g
index b099f3f..c5a8105 100644
--- a/compiler/src/main/antlr/org/apache/royale/compiler/internal/parsing/as/ASParser.g
+++ b/compiler/src/main/antlr/org/apache/royale/compiler/internal/parsing/as/ASParser.g
@@ -187,6 +187,7 @@ attributedDefinition[ContainerNode c]
 	{
 		lastChild = c.getChild(c.getChildCount() - 1);
 	}
+	ConfigConditionBlockNode configBlock = null;
     
     boolean enabled = isDefinitionEnabled(c);
     boolean eval = true;
@@ -203,7 +204,7 @@ attributedDefinition[ContainerNode c]
 				// but some IDEs can "fade out" disabled definitions. by adding
 				// the children to a ConfigConditionBlockNode, they can be seen
 				// in the AST, but ignored when generating compiled output. -JT
-			    ConfigConditionBlockNode configBlock = new ConfigConditionBlockNode(false); 
+			    configBlock = new ConfigConditionBlockNode(false); 
 				if(lastChild != null && c.getRemovedConditionalCompileNode())
 				{
 					configBlock.startBefore(lastChild);
@@ -221,6 +222,18 @@ attributedDefinition[ContainerNode c]
                namespaceAttr = namespaceAttributes.get(0);
         }
         definition[c, namespaceAttr, modifiers]
+		{
+			if(configBlock != null)
+			{
+				// since this config block doesn't have braces {}, check if
+				// there's a semicolon at the end of the definition
+				Token prevToken = buffer.previous();
+				if(prevToken.getType() == TOKEN_SEMICOLON)
+				{
+					configBlock.endAfter(prevToken);
+				}
+			}
+		}
     	exception catch [RecognitionException ex]
     	{ 
     		handleParsingError(ex);  
@@ -861,6 +874,13 @@ interfaceDefinition[ContainerNode c,  INamespaceDecorationNode namespace, List<M
  		openT:TOKEN_BLOCK_OPEN
 			{ b.startAfter(openT); }
 		classOrInterfaceBlock[b]
+		{
+			Token prevToken = buffer.previous();
+			if(prevToken.getType() == TOKEN_BLOCK_CLOSE)
+			{
+				interfaceNode.endAfter(prevToken);
+			}
+		}
  	;
  	exception catch [RecognitionException ex] { handleParsingError(ex);  }
  
@@ -939,6 +959,13 @@ classDefinition [ContainerNode c, INamespaceDecorationNode namespace, List<Modif
         openT:TOKEN_BLOCK_OPEN
         { classNode.getScopedNode().startAfter(openT); }
         classOrInterfaceBlock[classNode.getScopedNode()]
+		{
+			Token prevToken = buffer.previous();
+			if(prevToken.getType() == TOKEN_BLOCK_CLOSE)
+			{
+				classNode.endAfter(prevToken);
+			}
+		}
 	;
 	exception catch [RecognitionException ex] { handleParsingError(ex);  }
 
@@ -1115,6 +1142,13 @@ functionDefinition[ContainerNode c, INamespaceDecorationNode namespace, List<Mod
      	(resultType[n])?
      	
      	optionalFunctionBody[n]
+		{
+			Token prevToken = buffer.previous();
+			if(prevToken.getType() == TOKEN_BLOCK_CLOSE)
+			{
+				n.endAfter(prevToken);
+			}
+		}
  	;
 	exception catch [RecognitionException ex] { handleParsingError(ex); }