Rename function inline_ranges to regions_to_ranges

This commit is contained in:
Darren Burns
2022-03-03 16:40:29 +00:00
parent f541c26587
commit 1cac666cb2
2 changed files with 16 additions and 16 deletions

View File

@@ -15,7 +15,7 @@ class InlineRange(NamedTuple):
end: int
def inline_ranges(regions: Iterable[Region]) -> Iterable[InlineRange]:
def regions_to_ranges(regions: Iterable[Region]) -> Iterable[InlineRange]:
"""Converts the regions to non-overlapping horizontal strips, where each strip
represents the region on a single line. Combining the resulting strips therefore
results in a shape identical to the combined original regions.

View File

@@ -1,44 +1,44 @@
from textual._region_group import inline_ranges, InlineRange
from textual._region_group import regions_to_ranges, InlineRange
from textual.geometry import Region
def test_inline_ranges_no_regions():
assert list(inline_ranges([])) == []
def test_regions_to_ranges_no_regions():
assert list(regions_to_ranges([])) == []
def test_inline_ranges_single_region():
def test_regions_to_ranges_single_region():
regions = [Region(0, 0, 3, 2)]
assert list(inline_ranges(regions)) == [InlineRange(0, 0, 2), InlineRange(1, 0, 2)]
assert list(regions_to_ranges(regions)) == [InlineRange(0, 0, 2), InlineRange(1, 0, 2)]
def test_inline_ranges_partially_overlapping_regions():
def test_regions_to_ranges_partially_overlapping_regions():
regions = [Region(0, 0, 2, 2), Region(1, 1, 2, 2)]
assert list(inline_ranges(regions)) == [
assert list(regions_to_ranges(regions)) == [
InlineRange(0, 0, 1), InlineRange(1, 0, 2), InlineRange(2, 1, 2),
]
def test_inline_ranges_fully_overlapping_regions():
def test_regions_to_ranges_fully_overlapping_regions():
regions = [Region(1, 1, 3, 3), Region(2, 2, 1, 1), Region(0, 2, 3, 1)]
assert list(inline_ranges(regions)) == [
assert list(regions_to_ranges(regions)) == [
InlineRange(1, 1, 3), InlineRange(2, 0, 3), InlineRange(3, 1, 3)
]
def test_inline_ranges_disjoint_regions_different_lines():
def test_regions_to_ranges_disjoint_regions_different_lines():
regions = [Region(0, 0, 2, 1), Region(2, 2, 2, 1)]
assert list(inline_ranges(regions)) == [InlineRange(0, 0, 1), InlineRange(2, 2, 3)]
assert list(regions_to_ranges(regions)) == [InlineRange(0, 0, 1), InlineRange(2, 2, 3)]
def test_inline_ranges_disjoint_regions_same_line():
def test_regions_to_ranges_disjoint_regions_same_line():
regions = [Region(0, 0, 1, 2), Region(2, 0, 1, 1)]
assert list(inline_ranges(regions)) == [
assert list(regions_to_ranges(regions)) == [
InlineRange(0, 0, 0), InlineRange(0, 2, 2), InlineRange(1, 0, 0)
]
def test_inline_ranges_directly_adjacent_ranges_merged():
def test_regions_to_ranges_directly_adjacent_ranges_merged():
regions = [Region(0, 0, 1, 2), Region(1, 0, 1, 2)]
assert list(inline_ranges(regions)) == [
assert list(regions_to_ranges(regions)) == [
InlineRange(0, 0, 1), InlineRange(1, 0, 1)
]