ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-05 17:23:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix cloud shell (#15452)

Browse Source 
* fix cloud shell

* better logic for dimensions

* fix dimension type

* change terminate to close
This commit is contained in:
Aditya Bist
2021-05-13 12:01:11 -07:00
committed by GitHub
parent 558dfd693c
commit 0e24fc09b5
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/azurecore/src/azureResource/services/terminalService.ts
View File

@@ -103,7 +103,7 @@ export class AzureTerminalService implements IAzureTerminalService {
}
}
const shells = [new ShellType('PowerShell', 'pwsh'), new ShellType('Bash', 'bash'),];
const shells = [new ShellType('PowerShell', 'pwsh'), new ShellType('Bash', 'bash')];
const idx = shells.findIndex(s => s.value === preferredShell);
const prefShell = shells.splice(idx, 1);
@@ -157,7 +157,7 @@ class AzureTerminal implements vscode.Pseudoterminal {
}
async open(initialDimensions: vscode.TerminalDimensions): Promise<void> {
this.setDimensions(initialDimensions);
await this.setDimensions(initialDimensions);
}
close(): void {
@@ -167,14 +167,19 @@ class AzureTerminal implements vscode.Pseudoterminal {
this.socket.removeAllListeners('message');
this.socket.removeAllListeners('close');
this.socket.terminate();
this.socket.close();
if (this.intervalTimer) {
clearInterval(this.intervalTimer);
}
}
private areSameDimensions(oldDimensions: vscode.TerminalDimensions | undefined, newDimensions: vscode.TerminalDimensions): boolean {
return oldDimensions?.columns === newDimensions.columns && oldDimensions?.rows === newDimensions.rows;
}
async setDimensions(dimensions: vscode.TerminalDimensions): Promise<void> {
if (!dimensions) {
if (!dimensions || this.areSameDimensions(this.terminalDimensions, dimensions)) {
return;
}
this.terminalDimensions = dimensions;