Merge pull request #22 from neilccbrown/master

Fix a bug with default parameter handling for class methods

Author: Tobias-Kohn

build.sbt

@@ -1,7 +1,7 @@
 import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
 
 val useScalaVersion = "2.13.14"
-val releaseVersion = "1.1.1"
+val releaseVersion = "1.1.2"
 
 val sharedSettings = Seq(
   scalaVersion := useScalaVersion,

package-lock.json

@@ -1,7 +1,7 @@
 
 {
   "name": "tigerpython-parser",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Enhanced error recognition in Python ",
   "main": "release/tigerpython-parser.mjs",
   "types": "tpParser/js/types/index.d.ts",

package.json

@@ -52453,7 +52453,7 @@ $p.nv = (function() {
         throw new $c_s_MatchError(xs$2);
       }
     }
-    return $f_sc_IterableOnceOps__mkString__T__T__T__T($x_10.aB($m_sc_ArrayOps$().sN(ys, 0, this.H6)), "", ", ", "");
+    return $f_sc_IterableOnceOps__mkString__T__T__T__T($x_10.aB($m_sc_ArrayOps$().sN(ys, 0, (((-1) + this.H6) | 0))), "", ", ", "");
   } else {
     var $x_20 = $m_s_Predef$();
     var xs$3 = this.sd;

release/tigerpython-parser.js

@@ -32,7 +32,7 @@ class PythonFunction(val name: String,
 
   override def getParamsString: String =
     if (isMethod && params.nonEmpty)
-      params.drop(1).map(_.name).take(paramCount).mkString(", ")
+      params.drop(1).map(_.name).take(paramCount - 1).mkString(", ")
     else
       params.map(_.name).take(paramCount).mkString(", ")
 

release/tigerpython-parser.mjs

@@ -25,7 +25,7 @@ class PythonFunction(val name: String,
 
   override def getParamsString: String =
     if (isMethod && params.nonEmpty)
-      params.drop(1).map(_.name).take(paramCount).mkString(", ")
+      params.drop(1).map(_.name).take(paramCount - 1).mkString(", ")
     else
       params.map(_.name).take(paramCount).mkString(", ")
 

tpParser/shared/src/main/scala/tigerpython/parser/types/PythonFunction.scala

@@ -0,0 +1,13 @@
+# parent3.child3.shape3
+# class Shape:
+#    pos_x
+#    pos_y
+#    __init__(self, x, y)
+#    draw(self)
+#    extent(self)
+#    rotate_by(self, degrees = 90)
+# [Shape]make_shape()
+# 49
+# degrees=90
+from parent3.child3.shape3 import *
+make_shape().rotate_by()

tpParser/shared/src/main/scala/tigerpython/utilities/types/PythonFunction.scala

@@ -0,0 +1,11 @@
+# pyi:parent4.child4.shapeparams4
+# class Shape:
+#    def __init__(self, x, y) -> None: ...
+#    def draw(self) -> None: ...
+#    def extent(self) -> int: ...
+#    def rotate_by(self, units:str, degrees: float = 90) -> Shape: ...
+# def make_shape() -> Shape: ...
+# 55
+# units
+from parent4.child4.shapeparams4 import *
+make_shape().rotate_by()

tpParser/shared/src/test/programs/completer_params/params_module_example_3.py

@@ -0,0 +1,12 @@
+# pyi:parent5.child5.shapeparams5
+# class Shape:
+#    def __init__(self, x, y:float=...) -> None: ...
+#    def draw(self) -> None: ...
+#    def extent(self) -> int: ...
+#    def rotate_by(self, degrees: float = 90) -> Shape: ...
+# def make_shape() -> Shape: ...
+# def make_shape_at(x, y: int = ..., z:int = ...) -> None: ...
+# 42
+# x
+from parent5.child5.shapeparams5 import *
+make_shape_at()