Fixed issue with Poly not showing when no workspace is open

Author: wladimiiir

packages/vscode-extension/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.1.6
+* Fixed issue with Poly not showing when no workspace is open
+* Updated auto restart of TS server
+
 ### 0.1.5
 * Updated extension activity bar icon
 * Only Copy action in context menu

packages/vscode-extension/package.json

@@ -3,7 +3,7 @@
   "displayName": "Poly Assistant",
   "description": "Poly AI assistant for VS Code",
   "icon": "resources/poly-logo.png",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "publisher": "Poly API Corp",
   "engines": {
     "vscode": "^1.75.0"
@@ -16,7 +16,9 @@
     "url": "https://github.com/polyapi/poly-alpha",
     "directory": "packages/vscode-extension"
   },
-  "activationEvents": [],
+  "activationEvents": [
+    "onStartupFinished"
+  ],
   "main": "./build/extension.js",
   "contributes": {
     "menus": {

packages/vscode-extension/src/extension.ts

@@ -1,36 +1,12 @@
 import * as vscode from 'vscode';
-import * as fs from 'fs';
 import ChatViewProvider from './chat-view-provider';
 
-const watchWorkspaceFolder = (folder: vscode.WorkspaceFolder) => {
-  const polyIndexFilePath = `${folder.uri.fsPath}/node_modules/.poly/lib/index.js`;
-  if (fs.existsSync(polyIndexFilePath)) {
-    console.log('POLY: Poly index file found, watching for changes...');
-    const changeListener = (event) => {
-      if (event !== 'change') {
-        return;
-      }
-
-      console.log('POLY: Poly index file changed, restarting TS server...');
-      vscode.commands.executeCommand('typescript.restartTsServer');
-
-      if (!fs.existsSync(polyIndexFilePath)) {
-        console.log('POLY: Poly index file deleted, reapplying watch...');
-        fs.unwatchFile(polyIndexFilePath, changeListener);
-        watchWorkspaceFolder(folder);
-      }
-    };
-    fs.watch(polyIndexFilePath, changeListener);
-  } else {
-    console.log('POLY: Poly index file not found, waiting...');
-    setTimeout(() => watchWorkspaceFolder(folder), 5000);
-  }
-};
+import { start as startFileWatcher } from './file-watcher';
 
 export async function activate(context: vscode.ExtensionContext) {
   const provider = new ChatViewProvider(context);
 
-  vscode.workspace.workspaceFolders.forEach(watchWorkspaceFolder);
+  startFileWatcher();
 
   context.subscriptions.push(vscode.commands.registerCommand('poly.focusMessageInput', () => {
     provider.focusMessageInput();

packages/vscode-extension/src/file-watcher.ts

@@ -0,0 +1,60 @@
+import vscode from 'vscode';
+import fs, { Stats } from 'fs';
+
+type Info = {
+  timeoutID: NodeJS.Timeout;
+  changeListener: (curr: Stats, prev: Stats) => void;
+};
+
+const watchedWorkspaceInfos = new Map<vscode.WorkspaceFolder, Info>();
+
+export const start = () => {
+  vscode.workspace.onDidChangeWorkspaceFolders((event) => {
+    event.added.forEach(watchWorkspace);
+    event.removed.forEach(unwatchWorkspace);
+  });
+  vscode.workspace.workspaceFolders?.forEach(watchWorkspace);
+};
+
+const getPolyIndexFilePath = (folder: vscode.WorkspaceFolder) => `${folder.uri.fsPath}/node_modules/.poly/lib/index.js`;
+
+const watchWorkspace = (folder: vscode.WorkspaceFolder) => {
+  const polyIndexFilePath = getPolyIndexFilePath(folder);
+  if (fs.existsSync(polyIndexFilePath)) {
+    console.log('POLY: Poly index file found, watching for changes...');
+
+    const changeListener = (event) => {
+      if (event !== 'change') {
+        return;
+      }
+
+      console.log('POLY: Poly index file changed, restarting TS server...');
+      vscode.commands.executeCommand('typescript.restartTsServer');
+
+      if (!fs.existsSync(polyIndexFilePath)) {
+        console.log('POLY: Poly index file deleted, reapplying watch...');
+        fs.unwatchFile(polyIndexFilePath, changeListener);
+        watchWorkspace(folder);
+      }
+    };
+    fs.watch(polyIndexFilePath, changeListener);
+    watchedWorkspaceInfos.set(folder, { timeoutID: null, changeListener });
+  } else {
+    console.log('POLY: Poly index file not found, waiting...');
+    const timeoutID = setTimeout(() => watchWorkspace(folder), 5000);
+    watchedWorkspaceInfos.set(folder, { timeoutID, changeListener: null });
+  }
+};
+
+const unwatchWorkspace = (folder: vscode.WorkspaceFolder) => {
+  const info = watchedWorkspaceInfos.get(folder);
+  if (info) {
+    if (info.timeoutID) {
+      clearTimeout(info.timeoutID);
+    }
+    if (info.changeListener) {
+      fs.unwatchFile(getPolyIndexFilePath(folder), info.changeListener);
+    }
+    watchedWorkspaceInfos.delete(folder);
+  }
+};

packages/vscode-extension/yarn.lock

@@ -273,7 +273,7 @@ asynckit@^0.4.0:
 
 axios@^1.3.4:
   version "1.3.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.4.tgz#f5760cefd9cfb51fd2481acf88c05f67c4523024"
+  resolved "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz"
   integrity sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==
   dependencies:
     follow-redirects "^1.15.0"