Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename InterSystems WebSocket Terminal to InterSystems Lite Terminal #1418

Merged
merged 1 commit into from
Jul 30, 2024
Merged

Rename InterSystems WebSocket Terminal to InterSystems Lite Terminal #1418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,11 +1162,11 @@
{
"category": "ObjectScript",
"command": "vscode-objectscript.launchWebSocketTerminal",
"title": "Launch WebSocket Terminal"
"title": "Launch Lite Terminal"
},
{
"command": "vscode-objectscript.intersystems-servermanager.webterminal",
"title": "Launch WebSocket Terminal",
"title": "Launch Lite Terminal",
"icon": "$(terminal)"
},
{
Expand Down Expand Up @@ -1555,7 +1555,7 @@
"default": true
},
"objectscript.webSocketTerminal.syntaxColoring": {
"description": "Enable syntax coloring for command input in the InterSystems WebSocket Terminal.",
"description": "Enable syntax coloring for command input in the InterSystems Lite Terminal.",
"type": "boolean",
"default": true
},
Expand Down Expand Up @@ -1782,7 +1782,7 @@
"profiles": [
{
"id": "vscode-objectscript.webSocketTerminal",
"title": "InterSystems WebSocket Terminal",
"title": "InterSystems Lite Terminal",
"icon": "./images/fileIcon.svg"
}
]
Expand Down
14 changes: 7 additions & 7 deletions src/commands/webSocketTerminal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ class WebSocketTerminal implements vscode.Pseudoterminal {
outputChannel.appendLine("Check that the InterSystems server's web server supports WebSockets.");
outputChannel.show(true);
vscode.window.showErrorMessage(
"Failed to initialize WebSocket Terminal. Check 'ObjectScript' Output channel for details.",
"Failed to initialize Lite Terminal. Check 'ObjectScript' Output channel for details.",
"Dismiss"
);
this._closeEmitter.fire();
Expand All @@ -190,7 +190,7 @@ class WebSocketTerminal implements vscode.Pseudoterminal {
outputChannel.appendLine(`WebSocket error: ${error.toString()}`);
outputChannel.show(true);
vscode.window.showErrorMessage(
"WebSocket Terminal failed. Check 'ObjectScript' Output channel for details.",
"Lite Terminal failed. Check 'ObjectScript' Output channel for details.",
"Dismiss"
);
this._closeEmitter.fire();
Expand All @@ -212,7 +212,7 @@ class WebSocketTerminal implements vscode.Pseudoterminal {
outputChannel.appendLine(message.text);
outputChannel.show(true);
vscode.window.showErrorMessage(
"WebSocket Terminal failed. Check 'ObjectScript' Output channel for details.",
"Lite Terminal failed. Check 'ObjectScript' Output channel for details.",
"Dismiss"
);
this._closeEmitter.fire();
Expand Down Expand Up @@ -614,12 +614,12 @@ function terminalConfigForUri(
): vscode.ExtensionTerminalOptions | undefined {
// Make sure the server connection is active
if (!api.active || api.ns == "") {
reportError("WebSocket Terminal requires an active server connection.", throwErrors);
reportError("Lite Terminal requires an active server connection.", throwErrors);
return;
}
// Make sure the server has the terminal endpoint
if (api.config.apiVersion < 7) {
reportError("WebSocket Terminal requires InterSystems IRIS version 2023.2 or above.", throwErrors);
reportError("Lite Terminal requires InterSystems IRIS version 2023.2 or above.", throwErrors);
return;
}

Expand All @@ -642,7 +642,7 @@ async function workspaceUriForTerminal(throwErrors = false) {
let uri: vscode.Uri;
const workspaceFolders = vscode.workspace.workspaceFolders || [];
if (workspaceFolders.length == 0) {
reportError("WebSocket Terminal requires an open workspace.", throwErrors);
reportError("Lite Terminal requires an open workspace.", throwErrors);
} else if (workspaceFolders.length == 1) {
// Use the current connection
uri = workspaceFolders[0].uri;
Expand Down Expand Up @@ -696,7 +696,7 @@ export class WebSocketTerminalProfileProvider implements vscode.TerminalProfileP
const terminalOpts = terminalConfigForUri(new AtelierAPI(uri), uri, true);
return new vscode.TerminalProfile(terminalOpts);
} else {
throw new Error("WebSocket Terminal requires a selected workspace folder.");
throw new Error("Lite Terminal requires a selected workspace folder.");
}
}
}