KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix edit-in-kitty not working with editors that use file replace to save changes

Browse Source
This commit is contained in:
Kovid Goyal 2022-06-28 11:51:03 +05:30
parent 295fbe42ad
commit 1e49038747
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kitty/launch.py
View File

@ -620,11 +620,10 @@ class EditCmd:
self.file_localpath = os.path.join(self.tdir, self.file_name) self.file_localpath = os.path.join(self.tdir, self.file_name)
with open(self.file_localpath, 'wb') as f: with open(self.file_localpath, 'wb') as f:
f.write(self.file_data) f.write(self.file_data)
self.file_obj = open(self.file_localpath, 'rb')
self.file_data = b'' self.file_data = b''
self.last_mod_time = self.file_mod_time self.last_mod_time = self.file_mod_time
if not self.opts.cwd: if not self.opts.cwd:
self.opts.cwd = os.path.dirname(self.file_obj.name) self.opts.cwd = os.path.dirname(self.file_localpath)
def __del__(self) -> None: def __del__(self) -> None:
if self.tdir: if self.tdir:
@ -633,12 +632,12 @@ class EditCmd:
self.tdir = '' self.tdir = ''
def read_data(self) -> bytes: def read_data(self) -> bytes:
self.file_obj.seek(0) with open(self.file_localpath, 'rb') as f:
return self.file_obj.read() return f.read()
@property @property
def file_mod_time(self) -> int: def file_mod_time(self) -> int:
return os.stat(self.file_obj.fileno()).st_mtime_ns return os.stat(self.file_localpath).st_mtime_ns
def schedule_check(self) -> None: def schedule_check(self) -> None:
if not self.abort_signaled: if not self.abort_signaled:
@ -733,7 +732,7 @@ def remote_edit(msg: str, window: Window) -> None:
if q is not None: if q is not None:
q.abort_signaled = c.abort_signaled q.abort_signaled = c.abort_signaled
return return
cmdline = get_editor(path_to_edit=c.file_obj.name, line_number=c.line_number) cmdline = get_editor(path_to_edit=c.file_localpath, line_number=c.line_number)
w = launch(get_boss(), c.opts, cmdline, active=window) w = launch(get_boss(), c.opts, cmdline, active=window)
if w is not None: if w is not None:
c.source_window_id = window.id c.source_window_id = window.id