Reset osc order

Author: edvilme

python_files/pythonrc.py

@@ -94,10 +94,10 @@ def __str__(self):
             # For non-windows allow recent_command history.
             # fmt: off
             if sys.platform != "win32":
-                result = "{soh}{command_line}{pre_execution}{execution_finished}{prompt_start}{stx}{prompt}{soh}{prompt_end}{stx}".format(  # noqa: UP032
+                result = "{soh}{pre_execution}{command_line}{execution_finished}{prompt_start}{stx}{prompt}{soh}{prompt_end}{stx}".format(  # noqa: UP032
                     soh=ShellIntegrationSequence.soh,
-                    command_line=ShellIntegrationSequence.command_line(get_last_command()),
                     pre_execution=ShellIntegrationSequence.pre_execution(),
+                    command_line=ShellIntegrationSequence.command_line(get_last_command()),
                     execution_finished=ShellIntegrationSequence.execution_finished(last_exit_code),
                     prompt_start=ShellIntegrationSequence.prompt_start(),
                     stx=ShellIntegrationSequence.stx,

python_files/tests/test_shell_integration.py

@@ -28,7 +28,7 @@ def test_decoration_success():
         result = str(ps1)
         assert (
             result
-            == "\x01\x1b]633;E;None\x07\x1b]633;C\x07\x1b]633;D;0\x07\x1b]633;A\x07\x02>>> \x01\x1b]633;B\x07\x02"
+            == "\x01\x1b]633;C\x07\x1b]633;E;None\x07\x1b]633;D;0\x07\x1b]633;A\x07\x02>>> \x01\x1b]633;B\x07\x02"
         )
 
 
@@ -40,7 +40,7 @@ def test_decoration_failure():
         result = str(ps1)
         assert (
             result
-            == "\x01\x1b]633;E;None\x07\x1b]633;C\x07\x1b]633;D;1\x07\x1b]633;A\x07\x02>>> \x01\x1b]633;B\x07\x02"
+            == "\x01\x1b]633;C\x07\x1b]633;E;None\x07\x1b]633;D;1\x07\x1b]633;A\x07\x02>>> \x01\x1b]633;B\x07\x02"
         )
 
 
@@ -103,7 +103,7 @@ def test_prompt_survives_shadowed_builtins_under_pythonstartup():
     result = str(ps1)
     assert (
         result
-        == "\x01\x1b]633;E;None\x07\x1b]633;C\x07\x1b]633;D;0\x07\x1b]633;A\x07\x02>>> \x01\x1b]633;B\x07\x02"
+        == "\x01\x1b]633;C\x07\x1b]633;E;None\x07\x1b]633;D;0\x07\x1b]633;A\x07\x02>>> \x01\x1b]633;B\x07\x02"
     )