Remove dependency on PowerShell Extension.

ironmansoftware · Oct 12, 2023 · a955788 · a955788
1 parent c457865
commit a955788
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/src/commands/debugger.ts b/src/commands/debugger.ts
@@ -44,11 +44,14 @@ export class UniversalDebugAdapter implements vscode.DebugAdapter {
             const protocolMessage = JSON.parse(message) as DebugProtocol.ProtocolMessage;
             this.handleMessage(protocolMessage);
         });
+
+        this.hubConnection.onclose(() => {
+            vscode.window.showInformationMessage("Disconnected from PowerShell Universal Debugger.");
+        });
     }
 
     private hubConnection: HubConnection;
     private sendMessage = new vscode.EventEmitter<DebugProtocol.ProtocolMessage>();
-    private sequence: number = 1;
 
     readonly onDidSendMessage: vscode.Event<DebugProtocol.ProtocolMessage> = this.sendMessage.event;
 

diff --git a/src/extension.ts b/src/extension.ts
@@ -27,20 +27,6 @@ import { registerModuleCommands } from './commands/modules';
 import { registerDebuggerCommands } from './commands/debugger';
 
 export async function activate(context: vscode.ExtensionContext) {
-
-	var extension = vscode.extensions.getExtension("ms-vscode.PowerShell");
-	if (!extension) {
-		extension = vscode.extensions.getExtension("ms-vscode.PowerShell-Preview");
-	}
-
-	if (!extension) {
-		vscode.window.showErrorMessage("PowerShell Universal requires the Microsoft PowerShell or PowerShell Preview extension.");
-		return;
-	}
-
-	if (!extension.isActive)
-		await extension.activate();
-
 	registerConnectCommands(context);
 
 	const universal = new Universal(context);

diff --git a/src/universal.ts b/src/universal.ts
@@ -90,6 +90,11 @@ export class Universal {
                     }
                 }
 
+                if (!vscode.window.terminals.find(x => x.name === "PowerShell Extension")) {
+                    Container.connected = true;
+                    return;
+                }
+
                 Container.universal.sendTerminalCommand(`Import-Module (Join-Path '${__dirname}' 'Universal.VSCode.psm1')`);
                 Container.universal.sendTerminalCommand(`Install-UniversalModule -Version '${version}'`);
                 Container.universal.sendTerminalCommand(`Connect-PSUServer -ComputerName '${url}' -AppToken '${appToken}'`);