Skip to content

Commit 21606fb

Browse files
committed
Ignore 'self' when it is the first function argument
1 parent 4d729f5 commit 21606fb

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

python-insert-docstring-tests.el

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@
110110
(should (equal (python-insert-docstring--get-arguments-names-from-string
111111
" first: Type = 1,\n second: Map[some, other] = 2") '("first" "second")))
112112
(should (equal (python-insert-docstring--get-arguments-names-from-string
113-
" first = 1,\n second = 2") '("first" "second")))))
113+
" first = 1,\n second = 2") '("first" "second")))
114+
(should (equal (python-insert-docstring--get-arguments-names-from-string
115+
" self ,\n second = 2") '("second")))))
114116

115117
(ert-deftest prefix-lines-test ()
116118
"Test the function to prefix lines with blanks."

python-insert-docstring.el

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -147,17 +147,21 @@
147147
"Parse the argument names contained in ARGUMENTS-STRING and return them in a list."
148148
(if (string-equal "" arguments-string)
149149
nil
150-
(mapcar (lambda (string)
151-
"Remove default value if any and trim"
152-
(car (split-string string "=" t python-insert-docstring-blank-or-newline-regex)))
153-
(cl-remove-if (lambda (string)
154-
"Match type data leftovers"
155-
(string-match-p (rx (or "[" "]"))
156-
string))
157-
(mapcar (lambda (single-argument-string)
158-
"Drop type data"
159-
(car (split-string single-argument-string ":")))
160-
(split-string arguments-string ","))))))
150+
(let ((arguments (mapcar (lambda (string)
151+
"Remove default value if any and trim"
152+
(car (split-string string "=" t python-insert-docstring-blank-or-newline-regex)))
153+
(cl-remove-if (lambda (string)
154+
"Match type data leftovers"
155+
(string-match-p (rx (or "[" "]"))
156+
string))
157+
(mapcar (lambda (single-argument-string)
158+
"Drop type data"
159+
(car (split-string single-argument-string ":")))
160+
(split-string arguments-string ","))))))
161+
(if (string-equal (car arguments)
162+
"self")
163+
(cdr arguments)
164+
arguments))))
161165

162166

163167
(defun python-insert-docstring--make-function-data (indentation-string function-name argument-names)

0 commit comments

Comments
 (0)