refactored file watcher: activate it only once filters are loaded from Deepcode server

Author: Arvid Paeglit

src/deepcode/constants/filesConstants.ts

@@ -17,5 +17,3 @@ export const FILE_CURRENT_STATUS = {
   same: "same",
   created: "created"
 };
-
-export const SUPPORTED_WATCH_FILES = ['*.jsx', '*.es6', '*.vue', '*.hpp', '*.html', '*.htm', '*.tsx', '*.cxx', '*.es', '*.ts', '*.c', '*.cc', '*.hxx', '*.py', '*.java', '*.h', '*.cpp', '*.js', '.pylintrc', 'tslint.json', '.eslintrc.yml', '.pmdrc.xml', '.ruleset.xml', '.eslintrc.js', '.eslintrc.json', 'ruleset.xml', 'pylintrc'];

src/deepcode/lib/modules/BundlesModule.ts

@@ -4,7 +4,6 @@ import DeepCode from "../../../interfaces/DeepCodeInterfaces";
 import { IQueueAnalysisCheckResult } from "@deepcode/tsc";
 import { window, ProgressLocation, Progress } from "vscode";
 import { deepCodeMessages } from "../../messages/deepCodeMessages";
-import { processServerFilesFilterList } from "../../utils/filesUtils";
 import { checkIfBundleIsEmpty } from "../../utils/bundlesUtils";
 import { startFilesUpload } from "../../utils/packageUtils";
 import { BUNDLE_EVENTS } from "../../constants/events";
@@ -122,14 +121,13 @@ class BundlesModule extends LoginModule
 
   // procesing filter list of files, acceptable for server
   public async createFilesFilterList(): Promise<void> {
-    const { extensions, configFiles } = await http.getFilters(this.baseURL, this.token);
-    const processedFilters = processServerFilesFilterList({ extensions, configFiles });
-    this.serverFilesFilterList = { ...processedFilters };
+    this.serverFilesFilterList = await http.getFilters(this.baseURL, this.token);
   }
 
   public async performBundlesActions(path: string): Promise<void> {
     if (!Object.keys(this.serverFilesFilterList).length) {
       await this.createFilesFilterList();
+      this.filesWatcher.activate(this);
 
       if (!Object.keys(this.serverFilesFilterList).length) {
         return;

src/deepcode/lib/modules/DeepCodeLib.ts

@@ -6,7 +6,7 @@ import BundlesModule from "./BundlesModule";
 export default class DeepCodeLib extends BundlesModule implements DeepCode.DeepCodeLibInterface {
 
   public activateAll(): void {
-    this.filesWatcher.activate(this);
+    // this.filesWatcher.activate(this);
     this.workspacesWatcher.activate(this);
     this.editorsWatcher.activate(this);
     this.settingsWatcher.activate(this);

src/deepcode/lib/watchers/DeepCodeFilesWatcher.ts

@@ -2,27 +2,21 @@ import * as vscode from "vscode";
 import { compareFileChanges, acceptFileToBundle, isFileChangingBundle } from "../../utils/filesUtils";
 import {
   FILE_CURRENT_STATUS,
-  GIT_FILENAME,
-  SUPPORTED_WATCH_FILES
+  GIT_FILENAME
 } from "../../constants/filesConstants";
 import { errorsLogs } from "../../messages/errorsServerLogMessages";
 import DeepCode from "../../../interfaces/DeepCodeInterfaces";
 
 class DeepCodeFilesWatcher implements DeepCode.DeepCodeWatcherInterface {
   private changedFilesList: Array<string> = [];
-  private watcher: vscode.FileSystemWatcher;
+  private watcher: vscode.FileSystemWatcher | null = null;
   private FILES_TO_SAVE_LIST_FIRST_ELEMENT: number = 1;
   private filesForUpdatingServerBundle: {
     [key: string]: Array<{
       [key: string]: string;
     }>
   } = {};
 
-  constructor() {
-    const globPattern: vscode.GlobPattern = `**/\{${SUPPORTED_WATCH_FILES.join(',')}\}`;
-    this.watcher = vscode.workspace.createFileSystemWatcher(globPattern);
-  }
-
   private emptyChangedFilesLists(): void {
     // clear files lists
     this.changedFilesList.length = 0;
@@ -185,6 +179,19 @@ class DeepCodeFilesWatcher implements DeepCode.DeepCodeWatcherInterface {
   }
 
   public activate(extension: DeepCode.ExtensionInterface): void {
+    if (!Object.keys(extension.serverFilesFilterList).length) {
+      console.error('Empty watch list');
+      return;
+    }
+
+    const watchFiles = [
+      ...(extension.serverFilesFilterList.extensions || []).map(e => `*${e}`),
+      ...(extension.serverFilesFilterList.configFiles || [])
+    ];
+    
+    const globPattern: vscode.GlobPattern = `**/\{${watchFiles.join(',')}\}`;
+    this.watcher = vscode.workspace.createFileSystemWatcher(globPattern);
+
     const { created, modified, deleted } = FILE_CURRENT_STATUS;
     this.watcher.onDidChange((documentUri: vscode.Uri) => {
       this.filesChangesHandler(documentUri.fsPath, extension, modified);

src/deepcode/utils/filesUtils.ts

@@ -125,19 +125,6 @@ export const compareFileChanges = async (
   return response;
 };
 
-export const processServerFilesFilterList = (
-  filterList: DeepCode.AllowedServerFilterListInterface
-): DeepCode.AllowedServerFilterListInterface => {
-  const { configFiles } = filterList;
-  if (configFiles) {
-    const processedConfigFiles = configFiles.map((item: string) =>
-      item.slice(1)
-    );
-    return { ...filterList, configFiles: processedConfigFiles };
-  }
-  return filterList;
-};
-
 export const processPayloadSize = (
   payload: Array<DeepCode.PayloadMissingFileInterface>
 ): {