fix(python 106): various fixes

lua/refactoring/code_generation/langs/python.lua

@@ -1,7 +1,10 @@
 local code_utils = require("refactoring.code_generation.utils")
 
+---@param args string[]
+---@param arg_types string[]
+---@return string[]
 local function build_args(args, arg_types)
-    local final_args = {}
+    local final_args = {} ---@type string[]
     for i, arg in pairs(args) do
         if arg_types[arg] ~= code_utils.default_func_param_type() then
             final_args[i] = arg .. ": " .. arg_types[arg]
@@ -22,7 +25,6 @@ local function python_function(opts)
 %sdef %s(%s):
 %s
 
-
 ]],
         opts.func_header,
         opts.name,
@@ -44,7 +46,6 @@ local function python_function_return(opts)
 %sdef %s(%s) -> %s:
 %s
 
-
 ]],
         opts.func_header,
         opts.name,
@@ -56,15 +57,15 @@ end
 
 local function python_class_function(opts)
     local args = build_args(opts.args, opts.args_types)
+    args = vim.list_extend({ "self" }, args)
     if opts.func_header == nil then
         opts.func_header = ""
     end
     return string.format(
         [[
-%sdef %s(self, %s):
+%sdef %s(%s):
 %s
 
-
 ]],
         opts.func_header,
         opts.name,
@@ -75,6 +76,7 @@ end
 
 local function python_class_function_return(opts)
     local args = build_args(opts.args, opts.args_types)
+    args = vim.list_extend({ "self" }, args)
     if opts.func_header == nil then
         opts.func_header = ""
     end
@@ -83,10 +85,9 @@ local function python_class_function_return(opts)
     end
     return string.format(
         [[
-%sdef %s(self, %s) -> %s:
+%sdef %s(%s) -> %s:
 %s
 
-
 ]],
         opts.func_header,
         opts.name,
@@ -176,4 +177,5 @@ local python = {
         return string.format(opts.statement, opts.prefix, opts.var)
     end,
 }
+
 return python

lua/refactoring/tests/debug/printf/py/simple/printf.expected.py

@@ -3,7 +3,7 @@ class Poggers:
     def simple_function(self, a):
         test = 1
         # __AUTO_GENERATED_PRINTF_START__
-        print(f"Poggers#simple_function 1") # __AUTO_GENERATED_PRINTF_END__
+        print("Poggers#simple_function 1") # __AUTO_GENERATED_PRINTF_END__
         test_other = 11
         for x in range(test_other + test):
             print(x, a)

lua/refactoring/tests/refactor/106/py/class-2/extract.expected.py

@@ -5,7 +5,6 @@ def foo(self, a):
             print(x, a)
 
 
-
     def simple_function(self, a):
         self.test = 1
         self.test_other = 11

lua/refactoring/tests/refactor/106/py/class-3/extract.expected.py

@@ -5,7 +5,6 @@ def foo(self, a, test):
             print(x, a)
 
 
-
     def simple_function(self, a):
         test = 3
         self.test = 1

lua/refactoring/tests/refactor/106/py/class-return/extract.expected.py

@@ -7,7 +7,6 @@ def foo(self, a, test) -> None:
         return test_other
 
 
-
     def simple_function(self, a):
         test = 1
         test_other = self.foo(a, test)

lua/refactoring/tests/refactor/106/py/class/extract.expected.py

@@ -5,7 +5,6 @@ def foo(self, a, test, test_other):
             print(x, a)
 
 
-
     def simple_function(self, a):
         test = 1
         test_other = 11

lua/refactoring/tests/refactor/106/py/extract-block/extract_block.cursor_position

@@ -1,2 +1,2 @@
-9
+8
 4

lua/refactoring/tests/refactor/106/py/extract-block/extract_block.expected.py

@@ -5,6 +5,5 @@ def foo_bar(a, b: int, c, d: int):
     for x in range(test_other + test):
         print(x, a, b, c, d)
 
-
 def simple_function(a, b: int, c=1, d: int = 2):
     foo_bar(a, b, c, d)

lua/refactoring/tests/refactor/106/py/global-scope/extract.expected.py

@@ -5,5 +5,4 @@ def foo():
     print("o hai")
     print("o hai")
 
-
 foo()

lua/refactoring/tests/refactor/106/py/indent-inside-for-loop/extract.cursor_position

@@ -1,2 +1,2 @@
-9
+8
 4

lua/refactoring/tests/refactor/106/py/indent-inside-for-loop/extract.expected.py

@@ -2,7 +2,6 @@
 def foo_bar(a, x):
     print(x, a)
 
-
 def simple_function(a):
     test = 1
     test_other = 11

lua/refactoring/tests/refactor/106/py/multiple-returns/extract.cursor_position

@@ -1,2 +1,2 @@
-9
+8
 4

lua/refactoring/tests/refactor/106/py/multiple-returns/extract.expected.py

@@ -4,7 +4,6 @@ def extracted_func() -> None:
     b = 1
     return a, b
 
-
 def simple_function():
     a, b = extracted_func()
 

lua/refactoring/tests/refactor/106/py/simple-function/extract.cursor_position

@@ -1,2 +1,2 @@
-10
+9
 4

lua/refactoring/tests/refactor/106/py/simple-function/extract.expected.py

@@ -3,7 +3,6 @@ def foo_bar(a, b: int, c, d: int, test, test_other):
     for x in range(test_other + test):
         print(x, a, b, c, d)
 
-
 def simple_function(a, b: int, c=1, d: int = 2):
     test = 1
     test_other = 11

lua/refactoring/tests/refactor/106/py/with-comments/extract.cursor_position

@@ -1,2 +1,2 @@
-14
+13
 4

lua/refactoring/tests/refactor/106/py/with-comments/extract.expected.py

@@ -4,7 +4,6 @@ def foo_bar(a, test, test_other):
         print(x, a)
 
 
-
 # This is a comment
 # I use arch btw
 # wow!

lua/refactoring/tests/refactor/106/py/with-decorators/extract.cursor_position

@@ -1,2 +1,2 @@
-16
+15
 4

lua/refactoring/tests/refactor/106/py/with-decorators/extract.expected.py

@@ -6,7 +6,6 @@ def extracted_fun():
         dont_do_much += i
 
 
-
 @my_decorator
 @my_decorator
 @my_decorator

lua/refactoring/tests/refactor/106/py/with-imports/extract.cursor_position

@@ -1,2 +1,2 @@
-17
+16
 4

lua/refactoring/tests/refactor/106/py/with-imports/extract.expected.py

@@ -12,7 +12,6 @@ def foo() -> None:
     return bad_doc_ids, id
 
 
-
 if __name__ == "main":
     bad_doc_ids, id = foo()