Skip to content

Commit

Permalink
suport 211
Browse files Browse the repository at this point in the history
  • Loading branch information
fatjyc committed Apr 13, 2021
1 parent 460c294 commit 6e5a63c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ intellij {
git4idea,
terminal,
"com.intellij.java",
"org.jetbrains.plugins.go:203.5981.114"
"org.jetbrains.plugins.go:211.6693.111"
)
setPlugins(*plugins.toTypedArray())
pluginName = "nocalhost-intellij-plugin"
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin.code.style=official
version=0.0.15-2020.3
ideaVersion=2020.3
version=0.0.15-2021.1
ideaVersion=2021.1
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
import com.intellij.terminal.JBTerminalWidget;
import com.jediterm.pty.PtyProcessTtyConnector;
import com.jediterm.terminal.TtyConnector;
import com.pty4j.PtyProcess;
Expand All @@ -15,6 +16,7 @@
import org.jetbrains.plugins.terminal.JBTerminalSystemSettingsProvider;
import org.jetbrains.plugins.terminal.LocalTerminalDirectRunner;
import org.jetbrains.plugins.terminal.ShellTerminalWidget;
import org.jetbrains.plugins.terminal.TerminalProcessOptions;

import java.io.IOException;
import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -144,11 +146,12 @@ private String selectContainer(List<String> containers) {
private void toTerminal(String cmd) {
try {
LocalTerminalDirectRunner localTerminalDirectRunner = LocalTerminalDirectRunner.createTerminalRunner(project);
PtyProcess ptyProcess = localTerminalDirectRunner.createProcess(project.getBasePath());
TtyConnector connector = new PtyProcessTtyConnector(ptyProcess, StandardCharsets.UTF_8);
TerminalProcessOptions options = new TerminalProcessOptions(project.getBasePath(), 0, 0);
JBTerminalSystemSettingsProvider settingsProvider = new JBTerminalSystemSettingsProvider();
JBTerminalWidget widget = new JBTerminalWidget(project, settingsProvider, new TermDisposable());
PtyProcess ptyProcess = localTerminalDirectRunner.createProcess(options, widget);
TtyConnector connector = new PtyProcessTtyConnector(ptyProcess, StandardCharsets.UTF_8);
ShellTerminalWidget terminal = new ShellTerminalWidget(project, settingsProvider, new TermDisposable());
Disposer.register(terminal, settingsProvider);
terminal.start(connector);
terminal.executeCommand(cmd);
panel = terminal;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<vendor url="https://nocalhost.dev/">Nocalhost</vendor>

<!-- please see http://confluence.jetbrains.net/display/IDEADEV/Build+Number+Ranges for description -->
<idea-version since-build="203.5981.155" until-build="203.*" />
<idea-version since-build="211.0" />

<!-- please see https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
on how to target different products -->
Expand Down

0 comments on commit 6e5a63c

Please sign in to comment.