iterm2 2.29__tar.gz → 2.30__tar.gz

{iterm2-2.29 → iterm2-2.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iterm2
-Version: 2.29
+Version: 2.30
 Summary: Python interface to iTerm2's scripting API
 Home-page: http://github.com/gnachman/iTerm2
 Author: George Nachman

{iterm2-2.29 → iterm2-2.30}/iterm2/_version.py

@@ -1,3 +1,3 @@
 """Gives the module version."""
 
-__version__ = "2.29"
+__version__ = "2.30"

{iterm2-2.29 → iterm2-2.30}/iterm2/selection.py

@@ -290,11 +290,11 @@ class Selection:
                 indexes |= indexes_to_add
 
                 # In multipart windowed ranges, add connectors for the endpoint
-                # of all but the last # range. Each enumerated range is on its
+                # of all but the last range. Each enumerated range is on its
                 # own line.
                 if (
                     outer.windowed_coord_range.hasWindow
-                    and outer_range.end == outer.windowed_coord_range.coordRange.end
+                    and outer_range.end != outer.windowed_coord_range.coordRange.end
                     and the_range.length > 0
                 ):
                     connectors |= {the_range.max}
@@ -328,13 +328,14 @@ class Selection:
 
         sorted_ranges = sorted(all_ranges, key=range_key)
         for idx, sorted_range in enumerate(sorted_ranges):
+            # Make the end exclusive, as connectors are, before finding its index.
+            sorted_range.end.x += 1
             end_index = (
                 sorted_range.start.x
                 + sorted_range.start.y * width
                 + sorted_range.length(width)
             )
             eol = (end_index not in connectors) and idx + 1 < len(sorted_ranges)
-            sorted_range.end.x += 1
             stop = await callback(WindowedCoordRange(sorted_range), eol)
             if stop:
                 break

{iterm2-2.29 → iterm2-2.30}/iterm2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iterm2
-Version: 2.29
+Version: 2.30
 Summary: Python interface to iTerm2's scripting API
 Home-page: http://github.com/gnachman/iTerm2
 Author: George Nachman

{iterm2-2.29 → iterm2-2.30}/iterm2.egg-info/SOURCES.txt

@@ -57,6 +57,7 @@ tests/test_init.py
 tests/test_mainmenu.py
 tests/test_profile.py
 tests/test_registration.py
+tests/test_selection.py
 tests/test_session.py
 tests/test_triggers.py
 tests/test_util.py

iterm2-2.30/tests/test_selection.py

@@ -0,0 +1,52 @@
+"""Tests for iterm2.selection."""
+
+import asyncio
+
+from iterm2.selection import Selection, SelectionMode, SubSelection
+from iterm2.util import CoordRange, Point, Range, WindowedCoordRange
+
+
+def test_windowed_lines_are_joined_but_end_with_a_newline():
+    """Like iTerm2, each line of a windowed selection but the last is connected."""
+    windowed = SubSelection(
+        WindowedCoordRange(CoordRange(Point(12, 0), Point(15, 2)), Range(10, 10)),
+        SelectionMode.CHARACTER,
+        False,
+    )
+    later = SubSelection(
+        WindowedCoordRange(CoordRange(Point(0, 5), Point(4, 5))),
+        SelectionMode.CHARACTER,
+        False,
+    )
+    eols = []
+
+    async def callback(_coord_range, eol):
+        eols.append(eol)
+        return False
+
+    asyncio.run(Selection([windowed, later]).async_enumerate_ranges(80, callback))
+
+    assert eols == [False, False, True, False]
+
+
+def test_connected_sub_selection_is_joined_to_the_next():
+    """A connected sub-selection gets no newline after it."""
+    first = SubSelection(
+        WindowedCoordRange(CoordRange(Point(0, 0), Point(5, 0))),
+        SelectionMode.CHARACTER,
+        True,
+    )
+    second = SubSelection(
+        WindowedCoordRange(CoordRange(Point(0, 1), Point(5, 1))),
+        SelectionMode.CHARACTER,
+        False,
+    )
+    eols = []
+
+    async def callback(_coord_range, eol):
+        eols.append(eol)
+        return False
+
+    asyncio.run(Selection([first, second]).async_enumerate_ranges(80, callback))
+
+    assert eols == [False, False]