Skip to content

Commit 88b185a

Browse files
Python: Remove Location enums (#6553)
This mechanism from the Java implementation won't be used in the Python code.
1 parent 43169dd commit 88b185a

9 files changed

Lines changed: 414 additions & 895 deletions

File tree

rewrite-python/rewrite/src/rewrite/java/__init__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,4 @@
9393
'Wildcard',
9494
'Yield',
9595
'Unknown',
96-
97-
# Templating
98-
'CoordinateBuilder',
99-
'JavaCoordinates',
10096
]

rewrite-python/rewrite/src/rewrite/java/extensions.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313
J2 = TypeVar('J2', bound=J)
1414

1515

16-
def visit_container(v: 'JavaVisitor', container: Optional[JContainer[J2]], loc: JContainer.Location, p: P) -> Optional[JContainer[J2]]:
16+
def visit_container(v: 'JavaVisitor', container: Optional[JContainer[J2]], p: P) -> Optional[JContainer[J2]]:
1717
if container is None:
1818
return None
1919

2020
v.cursor = Cursor(v.cursor, container)
21-
before = v.visit_space(container.before, loc.before_location, p)
22-
js = list_map(lambda el: v.visit_right_padded(el, loc.element_location, p), container.padding.elements)
21+
before = v.visit_space(container.before, p)
22+
js = list_map(lambda el: v.visit_right_padded(el, p), container.padding.elements)
2323
v.cursor = v.cursor.parent
2424

2525
return container if js is container.padding.elements and before is container.before else JContainer(before, js, container.markers)
2626

2727

28-
def visit_right_padded(v: 'JavaVisitor', right: Optional[JRightPadded[T]], loc: JRightPadded.Location, p: P) -> Optional[JRightPadded[T]]:
28+
def visit_right_padded(v: 'JavaVisitor', right: Optional[JRightPadded[T]], p: P) -> Optional[JRightPadded[T]]:
2929
if right is None:
3030
return None
3131

@@ -39,17 +39,17 @@ def visit_right_padded(v: 'JavaVisitor', right: Optional[JRightPadded[T]], loc:
3939
return None
4040

4141
right = right.replace(element=t)
42-
right = right.replace(after=v.visit_space(right.after, loc, p))
42+
right = right.replace(after=v.visit_space(right.after, p))
4343
right = right.replace(markers=v.visit_markers(right.markers, p))
4444
return right
4545

4646

47-
def visit_left_padded(v: 'JavaVisitor', left: Optional[JLeftPadded[T]], loc: JLeftPadded.Location, p: P) -> Optional[JLeftPadded[T]]:
47+
def visit_left_padded(v: 'JavaVisitor', left: Optional[JLeftPadded[T]], p: P) -> Optional[JLeftPadded[T]]:
4848
if left is None:
4949
return None
5050

5151
v.cursor = Cursor(v.cursor, left)
52-
before = v.visit_space(left.before, loc.before_location, p)
52+
before = v.visit_space(left.before, p)
5353
t = left.element
5454
if isinstance(t, Tree):
5555
t = v.visit_and_cast(t, T, p)
@@ -63,7 +63,7 @@ def visit_left_padded(v: 'JavaVisitor', left: Optional[JLeftPadded[T]], loc: JLe
6363
return JLeftPadded(before, t, left.markers)
6464

6565

66-
def visit_space(v: 'JavaVisitor', space: Optional[Space], loc: Space.Location, p: P) -> Space:
66+
def visit_space(v: 'JavaVisitor', space: Optional[Space], p: P) -> Space:
6767
# FIXME support Javadoc
6868
return space
6969

0 commit comments

Comments
 (0)