Skip to content

Commit

Permalink
fix: Resolve PTY errors in linux
Browse files Browse the repository at this point in the history
  • Loading branch information
tomlin7 committed Jan 15, 2024
1 parent 28688d1 commit c56856e
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
5 changes: 1 addition & 4 deletions biscuit/core/components/lsp/io.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,7 @@ def start(self, *_) -> None:
self.cmd,
stdout=subprocess.PIPE,
stdin=subprocess.PIPE,
stderr=subprocess.PIPE,
startupinfo=subprocess.STARTUPINFO(
dwFlags=subprocess.STARTF_USESHOWWINDOW
))
stderr=subprocess.PIPE)
self.base.logger.info(f"PID: {self.p.pid} CMD: {self.cmd} CWD: {self.cwd}")

Thread(target=self._process_in, daemon=True).start()
Expand Down
6 changes: 2 additions & 4 deletions biscuit/core/components/views/panel/terminal/terminal.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from threading import Thread

if os.name == 'nt':
from winpty import PTY
from winpty import PtyProcess as PTY
else:
from ptyprocess import PtyProcessUnicode as PTY

Expand Down Expand Up @@ -63,9 +63,7 @@ def start_service(self, *_) -> None:
self.alive = True
self.last_command = None

self.p = PTY(80, 25)
self.p.spawn(self.shell)

self.p = PTY.spawn([self.shell])
Thread(target=self.write_loop, daemon=True).start()

def destroy(self, *_) -> None:
Expand Down
10 changes: 7 additions & 3 deletions biscuit/core/layout/base/sidebar/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,18 @@ def show_explorer(self) -> None:
"Show explorer view."
self.show_view(self.default_views[0])

def show_outline(self) -> None:
"Show outline view."
self.show_view(self.default_views[1])

def show_search(self) -> None:
"Show search view."
self.show_view(self.default_views[1])
self.show_view(self.default_views[2])

def show_source_control(self) -> None:
"Show source control view."
self.show_view(self.default_views[2])
self.show_view(self.default_views[3])

def show_extensions(self) -> None:
"Show extensions view."
self.show_view(self.default_views[3])
self.show_view(self.default_views[4])
1 change: 1 addition & 0 deletions biscuit/core/layout/menubar/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ def add_view_menu(self) -> None:
self.view_menu = self.add_menu("View")
self.view_menu.add_item("Command Palette...", lambda: self.base.palette.show_prompt(">"))
self.view_menu.add_item("Explorer", events.show_explorer)
self.view_menu.add_item("Outline", events.show_outline)
self.view_menu.add_item("Search", events.show_search)
self.view_menu.add_item("Source Control", events.show_source_control)
self.view_menu.add_item("Extensions", events.show_extensions)
Expand Down
3 changes: 3 additions & 0 deletions biscuit/core/utils/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@ def duplicate_selection(self, *_) -> None:
def show_explorer(self, *_) -> None:
self.base.sidebar.show_explorer()

def show_outline(self, *_) -> None:
self.base.sidebar.show_outline()

def show_search(self, *_) -> None:
self.base.sidebar.show_search()

Expand Down

0 comments on commit c56856e

Please sign in to comment.