docs: fix regression with incorrect args order

googleapis · Dec 16, 2020 · 07eb216 · 07eb216
1 parent b1b0c83
commit 07eb216
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/describe.py b/describe.py
@@ -215,6 +215,7 @@ def method_params(doc):
             args = doclines[begin + 1 :]
 
         parameters = []
+        sorted_parameters = []
         pname = None
         desc = ""
 
@@ -223,7 +224,11 @@ def add_param(pname, desc):
                 return
             if "(required)" not in desc:
                 pname = pname + "=None"
-            parameters.append(pname)
+                parameters.append(pname)
+            else:
+                # required params should be put straight into sorted_parameters
+                # to maintain order for positional args
+                sorted_parameters.append(pname)
 
         for line in args:
             m = re.search(r"^\s+([a-zA-Z0-9_]+): (.*)", line)
@@ -234,10 +239,11 @@ def add_param(pname, desc):
             pname = m.group(1)
             desc = m.group(2)
         add_param(pname, desc)
-        parameters = ", ".join(sorted(parameters))
+        sorted_parameters.extend(sorted(parameters))
+        sorted_parameters = ", ".join(sorted_parameters)
     else:
-        parameters = ""
-    return parameters
+        sorted_parameters = ""
+    return sorted_parameters
 
 
 def method(name, doc):