Support having an additional comma in the end of multi-line with stat…

…ements.
fabioz · Jan 17, 2025 · a32c052 · a32c052
1 parent 2764171
commit a32c052
Show file tree

Hide file tree

Showing 10 changed files with 1,262 additions and 919 deletions.
diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/PythonGrammar310.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/PythonGrammar310.java
diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/python.jjt b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/python.jjt
@@ -1369,13 +1369,13 @@ void with_stmt(): {}
 	  	LOOKAHEAD(with_item())
 	  	(
 	  		with_item()
-			({grammarActions.findTokenAndAdd(",");}<COMMA> with_item())*
+			({grammarActions.findTokenAndAdd(",");}<COMMA> [with_item()])*
 		)
 	  	|
 		(
 			<LPAREN>
 			with_item()
-			({grammarActions.findTokenAndAdd(",");}<COMMA> with_item())*
+			({grammarActions.findTokenAndAdd(",");}<COMMA> [with_item()])*
 		  	<RPAREN>
 	  	)
   	)

diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/python.jjt_template b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/python.jjt_template
@@ -1175,13 +1175,13 @@ void with_stmt(): {}
 	  	LOOKAHEAD(with_item())
 	  	(
 	  		with_item()
-			($COMMA with_item())*
+			($COMMA [with_item()])*
 		)
 	  	|
 		(
 			<LPAREN>
 			with_item()
-			($COMMA with_item())*
+			($COMMA [with_item()])*
 		  	<RPAREN>
 	  	)
   	)