Allow newlines inside argument and parameter lists

marijnh · marijnh · commit 793b7a016816 · 2021-07-11T17:41:11.000+02:00
FIX: Fix a bug that caused newlines to be disallowed in argument and parameter lists. Issue codemirror/dev#536
diff --git a/src/python.grammar b/src/python.grammar
@@ -22,11 +22,13 @@ Decorator { At dottedName ArgList? newline }
 
 FunctionDefinition {
   kw<"async">? kw<"def"> VariableName
-  ParamList { "(" commaSep<param>? ")" }
+  ParamList
   TypeDef { "->" test }?
   Body
 }
 
+ParamList { "(" commaSep<param>? ")" }
+
 ClassDefinition { kw<"class"> VariableName ArgList? Body }
 
 param { VariableName TypeDef? (AssignOp{"="} test)? | "*" VariableName? | "**" VariableName | "/" }
diff --git a/src/tokens.js b/src/tokens.js
@@ -1,15 +1,16 @@
 import {ExternalTokenizer, ContextTracker} from "lezer"
 import {
   newline as newlineToken, eof, newlineEmpty, newlineBracketed, indent, dedent, printKeyword,
-  ParenthesizedExpression, TupleExpression, ComprehensionExpression, ArrayExpression, ArrayComprehensionExpression,
+  ParenthesizedExpression, TupleExpression, ComprehensionExpression,
+  ArrayExpression, ArrayComprehensionExpression, ArgList, ParamList,
   DictionaryExpression, DictionaryComprehensionExpression, SetExpression, SetComprehensionExpression
 } from "./parser.terms.js"
 
 const newline = 10, carriageReturn = 13, space = 32, tab = 9, hash = 35, parenOpen = 40, dot = 46
 
 const bracketed = [
   ParenthesizedExpression, TupleExpression, ComprehensionExpression, ArrayExpression, ArrayComprehensionExpression,
-  DictionaryExpression, DictionaryComprehensionExpression, SetExpression, SetComprehensionExpression
+  DictionaryExpression, DictionaryComprehensionExpression, SetExpression, SetComprehensionExpression, ArgList, ParamList
 ]
 
 let cachedIndent = 0, cachedInput = null, cachedPos = 0
diff --git a/test/expression.txt b/test/expression.txt
@@ -33,6 +33,16 @@ Script(ExpressionStatement(ContinuedString(String, String)),
        ExpressionStatement(String),
        ExpressionStatement(String))
 
+# Bracketed continued string
+
+print('00300:'
+      '03630:')
+
+==>
+
+Script(ExpressionStatement(CallExpression(VariableName, ArgList(ContinuedString(String, String)))))
+
+
 # Format strings
 
 f'hello{22} abc {{ }} {d-1}'
