!squash

Author: tony

poetry.lock

@@ -59,7 +59,7 @@ def freeze(session):
         wconf = {
             "options": w.show_window_options(),
             "window_name": w.name,
-            "layout": w.layout,
+            "layout": w.window_layout,
             "panes": [],
         }
         if w.get("window_active", "0") == "1":
@@ -68,21 +68,21 @@ def freeze(session):
         # If all panes have same path, set 'start_directory' instead
         # of using 'cd' shell commands.
         def pane_has_same_path(p):
-            return w.panes[0].current_path == p.current_path
+            return w.panes[0].pane_current_path == p.pane_current_path
 
         if all(pane_has_same_path(p) for p in w.panes):
-            wconf["start_directory"] = w.panes[0].current_path
+            wconf["start_directory"] = w.panes[0].pane_current_path
 
         for p in w.panes:
             pconf = {"shell_command": []}
 
             if "start_directory" not in wconf:
-                pconf["shell_command"].append("cd " + p.current_path)
+                pconf["shell_command"].append("cd " + p.pane_current_path)
 
             if p.get("pane_active", "0") == "1":
                 pconf["focus"] = "true"
 
-            current_cmd = p.current_command
+            current_cmd = p.pane_current_command
 
             def filter_interpretters_and_shells():
                 return current_cmd.startswith("-") or any(

src/tmuxp/workspace/freezer.py

@@ -195,7 +195,7 @@ def test_load_symlinked_workspace(
     assert session.name == "samplesimple"
 
     assert pane is not None
-    assert pane.current_path == str(realtemp)
+    assert pane.pane_current_path == str(realtemp)
 
 
 if t.TYPE_CHECKING:

tests/test_cli.py

@@ -108,11 +108,11 @@ def f():
         nonlocal p
         p = w.attached_pane
         p.server._update_panes()
-        return p.current_path == pane_path
+        return p.pane_current_path == pane_path
 
     assert retry_until(f)
 
-    assert p.current_path == pane_path
+    assert p.pane_current_path == pane_path
 
     proc = session.cmd("show-option", "-gv", "base-index")
     base_index = int(proc.stdout[0])
@@ -128,11 +128,11 @@ def f():
         nonlocal p
         p = window3.attached_pane
         p.server._update_panes()
-        return p.current_path == pane_path
+        return p.pane_current_path == pane_path
 
     assert retry_until(f)
 
-    assert p.current_path == pane_path
+    assert p.pane_current_path == pane_path
 
 
 @pytest.mark.skip(
@@ -415,7 +415,7 @@ def test_environment_variables_logs(session: Session, caplog: pytest.LogCaptureF
         sum(
             1
             for record in caplog.records
-            if 'Cannot set environment for new panes and windows.' in record.msg
+            if "Cannot set environment for new panes and windows." in record.msg
         )
         # From both_overrides_in_first_pane.
         == 1
@@ -443,11 +443,11 @@ def test_automatic_rename_option(session):
         for p in builder.iter_create_panes(w, wconf):
             w.select_layout("tiled")  # fix glitch with pane size
             p = p
-            assert len(session._windows), window_count
+            assert len(session.windows), window_count
         assert isinstance(w, Window)
         assert w.show_window_option("automatic-rename") == "on"
 
-        assert len(session._windows) == window_count
+        assert len(session.windows) == window_count
 
         window_count += 1
         w.select_layout(wconf["layout"])
@@ -525,7 +525,7 @@ def test_start_directory(session, tmp_path: pathlib.Path):
 
             def f():
                 p.server._update_panes()
-                pane_path = p.current_path
+                pane_path = p.pane_current_path
                 return path in pane_path or pane_path == path
 
             # handle case with OS X adding /private/ to /tmp/ paths
@@ -576,7 +576,7 @@ def test_start_directory_relative(session, tmp_path: pathlib.Path):
             def f():
                 p.server._update_panes()
                 # Handle case where directories resolve to /private/ in OSX
-                pane_path = p.current_path
+                pane_path = p.pane_current_path
                 return path in pane_path or pane_path == path
 
             assert retry_until(f)
@@ -651,7 +651,7 @@ def test_pane_order(session):
 
             def f():
                 p.server._update_panes()
-                return p.current_path == pane_path
+                return p.pane_current_path == pane_path
 
             assert retry_until(f)
 
@@ -1244,7 +1244,7 @@ def test_first_pane_start_directory(session, tmp_path: pathlib.Path):
 
         def f():
             p.server._update_panes()
-            pane_path = p.current_path
+            pane_path = p.pane_current_path
             return path in pane_path or pane_path == path
 
         # handle case with OS X adding /private/ to /tmp/ paths
@@ -1268,10 +1268,10 @@ def test_layout_main_horizontal(session):
     main_horizontal_pane, *panes = window.panes
 
     def height(p):
-        return int(p._info["pane_height"])
+        return int(p.pane_height)
 
     def width(p):
-        return int(p._info["pane_width"])
+        return int(p.pane_width)
 
     main_horizontal_pane_height = height(main_horizontal_pane)
     pane_heights = [height(pane) for pane in panes]