Skip to content

Commit 6778362

Browse files
committed
Migrate to new JediTerm version
1 parent aa6167c commit 6778362

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

ide/misc/languages/en/messages.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1055,4 +1055,6 @@ plugin.develnext.description=Base DevelNext Platform
10551055
plugin.php.name=PHP
10561056
plugin.php.description=This plugin add PHP language support
10571057
1058-
jppm.run.plugin.settings.name=Run & Build
1058+
jppm.run.plugin.settings.name=Run & Build
1059+
1060+
process.exit.message=Process exited with code %n.

ide/misc/languages/ru/messages.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1071,4 +1071,6 @@ plugin.develnext.description=Основная платформа DevelNext
10711071
plugin.php.name=PHP
10721072
plugin.php.description=Плагин добавляющий поддержку языка PHP
10731073

1074-
jppm.run.plugin.settings.name=Запуск и Сборка
1074+
jppm.run.plugin.settings.name=Запуск и Сборка
1075+
1076+
process.exit.message=Процесс завершен с кодом %n.

ide/src/ide/tasks/TaskPanel.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
use php\gui\layout\UXAnchorPane;
1111
use php\gui\layout\UXHBox;
1212
use php\gui\UXNode;
13-
use php\intellij\pty\PtyProcess;
13+
use php\intellij\tty\PtyProcess;
14+
use php\intellij\tty\PtyProcessConnector;
1415
use php\intellij\ui\JediTermWidget;
16+
use php\lib\str;
1517

1618
class TaskPanel {
1719
/**
@@ -63,8 +65,8 @@ public function setOnProcessExit(callable $callback) {
6365
public function makeUI(): UXNode {
6466
$this->process = PtyProcess::exec($this->processInfo->getProgram(), $this->processInfo->getEnvironment(), $this->processInfo->getDirectory());
6567

66-
$this->terminal = new JediTermWidget($this->process,
67-
ChangeThemeCommand::$instance->getCurrentTheme()->getTerminalTheme()->build());
68+
$this->terminal = new JediTermWidget(ChangeThemeCommand::$instance->getCurrentTheme()->getTerminalTheme()->build());
69+
$this->terminal->createTerminalSession(new PtyProcessConnector($this->process));
6870
$this->terminal->requestFocus();
6971
$this->terminal->start();
7072

@@ -119,6 +121,10 @@ public function destroy() {
119121

120122
private function triggerDestroyEvent() {
121123
uiLater(function () {
124+
$this->terminal->nextLine();
125+
$this->terminal->nextLine();
126+
$this->terminal->writeString( str::replace(((string)_("process.exit.message")), "%n", $this->process->getExitValue()));
127+
122128
call_user_func($this->onProcessExit, $this->process->getExitValue());
123129

124130
if (!$this->configurationProcessExitTriggered) {

0 commit comments

Comments
 (0)