procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix python-info-docstring-p

Browse source 
* lisp/progmodes/python.el (python-info-docstring-p): Stop using
python-rx string-delimiter.

* test/lisp/progmodes/python-tests.el
(python-font-lock-escape-sequence-bytes-newline)
(python-font-lock-escape-sequence-hex-octal)
(python-font-lock-escape-sequence-unicode)
(python-font-lock-raw-escape-sequence): Mark as expected failures
until another bug in 'python-info-docstring-p' is corrected.
(python-info-docstring-p-7): New test.  (Bug#63622)
This commit is contained in:
kobarity 2023-05-24 22:01:12 +09:00 • committed by Eli Zaretskii
parent f42de74ebe
commit b7b82ecb2b
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/progmodes/python.el
View file

@ -6018,8 +6018,7 @@ point's current `syntax-ppss'."
(let ((counter 1)
(indentation (current-indentation))
(backward-sexp-point)
(re (concat "[uU]?[rR]?"
(python-rx string-delimiter))))
(re "[uU]?[rR]?[\"']"))
(when (and
(not (python-info-assignment-statement-p))
(looking-at-p re)
@ -6040,9 +6039,7 @@ point's current `syntax-ppss'."
backward-sexp-point))
(setq last-backward-sexp-point
backward-sexp-point))
(looking-at-p
(concat "[uU]?[rR]?"
(python-rx string-delimiter))))))
(looking-at-p re))))
;; Previous sexp was a string, restore point.
(goto-char backward-sexp-point)
(cl-incf counter))

16
test/lisp/progmodes/python-tests.el
View file

@ -729,6 +729,7 @@ u\"\\n\""
(845 . font-lock-string-face) (886))))
(ert-deftest python-font-lock-escape-sequence-bytes-newline ()
:expected-result :failed
(python-tests-assert-faces
"b'\\n'
b\"\\n\""
@ -741,6 +742,7 @@ b\"\\n\""
(11 . font-lock-doc-face))))
(ert-deftest python-font-lock-escape-sequence-hex-octal ()
:expected-result :failed
(python-tests-assert-faces
"b'\\x12 \\777 \\1\\23'
'\\x12 \\777 \\1\\23'"
@ -761,6 +763,7 @@ b\"\\n\""
(36 . font-lock-doc-face))))
(ert-deftest python-font-lock-escape-sequence-unicode ()
:expected-result :failed
(python-tests-assert-faces
"b'\\u1234 \\U00010348 \\N{Plus-Minus Sign}'
'\\u1234 \\U00010348 \\N{Plus-Minus Sign}'"
@ -775,6 +778,7 @@ b\"\\n\""
(80 . font-lock-doc-face))))
(ert-deftest python-font-lock-raw-escape-sequence ()
:expected-result :failed
(python-tests-assert-faces
"rb'\\x12 \123 \\n'
r'\\x12 \123 \\n \\u1234 \\U00010348 \\N{Plus-Minus Sign}'"
@ -6598,6 +6602,18 @@ class Class:
(python-tests-look-at "'''Not a method docstring.'''")
(should (not (python-info-docstring-p)))))
(ert-deftest python-info-docstring-p-7 ()
"Test string in a dictionary."
(python-tests-with-temp-buffer
"
{'Not a docstring': 1}
'Also not a docstring'
"
(python-tests-look-at "Not a docstring")
(should-not (python-info-docstring-p))
(python-tests-look-at "Also not a docstring")
(should-not (python-info-docstring-p))))
(ert-deftest python-info-triple-quoted-string-p-1 ()
"Test triple quoted string."
(python-tests-with-temp-buffer