Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/webview/openshift-terminal/app/terminalInstance.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,21 @@ export const TerminalInstance = (props: {
return new FitAddon();
}, []);

// A workaround to https://github.com/microsoft/vscode/issues/186043
function handleLink(event: MouseEvent, uri: string): void {
window.vscodeApi.postMessage({
kind: 'openExternal',
data: {
uuid: props.uuid,
url: uri
},
});
}

// The xtermjs instance
const [term] = React.useState(() => {
const newTerm = new Terminal();
newTerm.loadAddon(new WebLinksAddon());
newTerm.loadAddon(new WebLinksAddon(handleLink));
newTerm.loadAddon(new WebglAddon());
newTerm.loadAddon(fitAddon);
newTerm.attachCustomKeyEventHandler((keyboardEvent: KeyboardEvent) => {
Expand Down
13 changes: 11 additions & 2 deletions src/webview/openshift-terminal/openShiftTerminal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ import {
WebviewView,
WebviewViewProvider,
WebviewViewResolveContext, window,
workspace
workspace,
env
} from 'vscode';
import { SerializeAddon } from 'xterm-addon-serialize';
import { Terminal } from 'xterm-headless';
Expand Down Expand Up @@ -412,7 +413,7 @@ export class OpenShiftTerminalManager implements WebviewViewProvider {
// - `closeTerminal(uuid): void`: the given webview terminal was closed; kill the process if needed and dispose of all the resources for the terminal in node
// - `termMuxUp(): void`: the webview has rendered for the first time and is ready to respond to `createTerminal` messages
this.webview.onDidReceiveMessage(
(event) => {
async (event) => {
const message = event as Message;
const terminal = this.openShiftTerminals.get(message?.data?.uuid);
if (terminal) {
Expand Down Expand Up @@ -442,6 +443,14 @@ export class OpenShiftTerminalManager implements WebviewViewProvider {
} else if (message.kind === 'closeTerminal') {
terminal.dispose();
this.openShiftTerminals.delete(message?.data?.uuid);
} else if (message.kind === 'openExternal') {
if (message?.data?.url) {
const result = await window.showInformationMessage(
'Do you want to open the external website?', 'Yes', 'No');
if (result === 'Yes') {
void env.openExternal(message?.data?.url);
}
}
}
} else if (message.kind === 'termMuxUp') {
// mark the webview as resolved, to signal to `createTerminal`
Expand Down