fixed opening treminal

Author: daimor

src/extension.ts

@@ -48,7 +48,7 @@ import { ObjectScriptExplorerProvider } from "./explorer/explorer";
 import { WorkspaceNode } from "./explorer/models/workspaceNode";
 import { FileSystemProvider } from "./providers/FileSystemPovider/FileSystemProvider";
 import { WorkspaceSymbolProvider } from "./providers/WorkspaceSymbolProvider";
-import { currentWorkspaceFolder, outputChannel, portFromDockerCompose, terminalWithDocker } from "./utils";
+import { currentWorkspaceFolder, outputChannel, portFromDockerCompose, terminalWithDocker, notNull } from "./utils";
 import { ObjectScriptDiagnosticProvider } from "./providers/ObjectScriptDiagnosticProvider";
 import { DocumentRangeFormattingEditProvider } from "./providers/DocumentRangeFormattingEditProvider";
 
@@ -287,12 +287,14 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     diagnosticProvider.updateDiagnostics(vscode.window.activeTextEditor.document);
   }
 
-  const proposed = packageJson.enableProposedApi
-    ? [
-        vscode.workspace.registerFileSearchProvider(FILESYSTEM_SCHEMA, new FileSearchProvider()),
-        vscode.workspace.registerTextSearchProvider(FILESYSTEM_SCHEMA, new TextSearchProvider()),
-      ]
-    : [];
+  const proposed = [
+    packageJson.enableProposedApi && typeof vscode.workspace.registerFileSearchProvider === "function"
+      ? vscode.workspace.registerFileSearchProvider(FILESYSTEM_SCHEMA, new FileSearchProvider())
+      : null,
+    packageJson.enableProposedApi && typeof vscode.workspace.registerTextSearchProvider === "function"
+      ? vscode.workspace.registerTextSearchProvider(FILESYSTEM_SCHEMA, new TextSearchProvider())
+      : null,
+  ].filter(notNull);
 
   context.subscriptions.push(
     reporter,

src/utils/index.ts

@@ -179,9 +179,8 @@ export function terminalWithDocker() {
   const workspace = currentWorkspaceFolder();
 
   const terminalName = `ObjectScript:${workspace}`;
-  let terminal = vscode.window.terminals.find(el => el.name === terminalName);
+  let terminal = vscode.window.terminals.find(el => el.name === terminalName && terminal.exitStatus == undefined);
   if (!terminal) {
-    outputChannel.appendLine("Open terminal");
     terminal = vscode.window.createTerminal(terminalName, "docker-compose", [
       "-f",
       file,
@@ -191,8 +190,6 @@ export function terminalWithDocker() {
       "-c",
       `command -v ccontrol >/dev/null 2>&1 && (ccontrol session $ISC_PACKAGE_INSTANCENAME -U ${ns} || iris session $ISC_PACKAGE_INSTANCENAME -U ${ns})`,
     ]);
-  } else {
-    outputChannel.appendLine("terminal already exists");
   }
   terminal.show();
   return terminal;