Commit1acdfec

authored

gh-99341: Cover type ignore nodes when incrementing line numbers (GH-99422)

1 parentbc3a11d commit1acdfecCopy full SHA for 1acdfec

File tree

+20

-0

lines changed

+20

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -237,6 +237,12 @@ def increment_lineno(node, n=1):`
`237`	`237`	`location in a file.`
`238`	`238`	`"""`
`239`	`239`	`forchildinwalk(node):`
	`240`	`+# TypeIgnore is a special case where lineno is not an attribute`
	`241`	`+# but rather a field of the node itself.`
	`242`	`+ifisinstance(child,TypeIgnore):`
	`243`	`+child.lineno=getattr(child,'lineno',0)+n`
	`244`	`+continue`
	`245`	`+`
`240`	`246`	`if'lineno'inchild._attributes:`
`241`	`247`	`child.lineno=getattr(child,'lineno',0)+n`
`242`	`248`	`if (`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1036,6 +1036,18 @@ def test_increment_lineno(self):`
`1036`	`1036`	`self.assertEqual(ast.increment_lineno(src).lineno,2)`
`1037`	`1037`	`self.assertIsNone(ast.increment_lineno(src).end_lineno)`
`1038`	`1038`
	`1039`	`+deftest_increment_lineno_on_module(self):`
	`1040`	`+src=ast.parse(dedent("""\`
	`1041`	`+ a = 1`
	`1042`	`+ b = 2 # type: ignore`
	`1043`	`+ c = 3`
	`1044`	`+ d = 4 # type: ignore@tag`
	`1045`	`+ """),type_comments=True)`
	`1046`	`+ast.increment_lineno(src,n=5)`
	`1047`	`+self.assertEqual(src.type_ignores[0].lineno,7)`
	`1048`	`+self.assertEqual(src.type_ignores[1].lineno,9)`
	`1049`	`+self.assertEqual(src.type_ignores[1].tag,'@tag')`
	`1050`	`+`
`1039`	`1051`	`deftest_iter_fields(self):`
`1040`	`1052`	`node=ast.parse('foo()',mode='eval')`
`1041`	`1053`	`d=dict(ast.iter_fields(node.body))`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix:func:`ast.increment_lineno` to also cover:class:`ast.TypeIgnore` when
	`2`	`+changing line numbers.`

Comments

(0)