Commit1f779de

and

authored

Fix line ranges decorator edge case (#4670)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

1 parent203fd6b commit1f779deCopy full SHA for 1f779de

File tree

+23

-0

lines changed

+23

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@`
`22`	`22`	- Remove support for pre-python 3.7`await/async` as soft keywords/variable names
`23`	`23`	`(#4676)`
`24`	`24`	`- Fix crash on parenthesized expression inside a type parameter bound (#4684)`
	`25`	`+- Fix crash when using line ranges excluding indented single line decorated items`
	`26`	`+ (#4670)`
`25`	`27`
`26`	`28`	`###Preview style`
`27`	`29`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -330,6 +330,19 @@ def _convert_node_to_standalone_comment(node: LN) -> None:`
`330`	`330`	`first.prefix=""`
`331`	`331`	`index=node.remove()`
`332`	`332`	`ifindexisnotNone:`
	`333`	`+# Because of the special handling of multiple decorators, if the decorated`
	`334`	`+# item is a single line then there will be a missing newline between the`
	`335`	`+# decorator and item, so add it back. This doesn't affect any other case`
	`336`	`+# since a decorated item with a newline would hit the earlier suite case`
	`337`	`+# in _convert_unchanged_line_by_line that correctly handles the newlines.`
	`338`	`+ifnode.type==syms.decorated:`
	`339`	`+# A leaf of type decorated wouldn't make sense, since it should always`
	`340`	`+# have at least the decorator + the decorated item, so if this assert`
	`341`	`+# hits that means there's a problem in the parser.`
	`342`	`+assertisinstance(node,Node)`
	`343`	`+# 1 will always be the correct index since before this function is`
	`344`	`+# called all the decorators are collapsed into a single leaf`
	`345`	`+node.insert_child(1,Leaf(NEWLINE,"\n"))`
`333`	`346`	`# Remove the '\n', as STANDALONE_COMMENT will have '\n' appended when`
`334`	`347`	`# generating the formatted code.`
`335`	`348`	`value=str(node)[:-1]`

Lines changed: 8 additions & 0 deletions

Comments

(0)