bug fix (#72)

Co-authored-by: Nagarjun Sanji <[email protected]>
debricked · Oct 10, 2024 · e6a831c · e6a831c
1 parent d59b183
commit e6a831c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 43 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -68,8 +68,7 @@ export async function activate(context: vscode.ExtensionContext) {
         },
     );
     // Add file watcher for all manifest files
-    await watchers.registerWatcher(context);
-    providers.registerDependencyPolicyProvider(context); // after adding watcher and scanning we should add the policy provider
+    watchers.registerWatcher(context);
 }
 
 // This method is called when your extension is deactivated

diff --git a/src/providers/index.ts b/src/providers/index.ts
@@ -26,45 +26,6 @@ class Providers {
             Logger.logInfo("Command registration has been completed");
         }
     }
-
-    public async registerDependencyPolicyProvider(context: vscode.ExtensionContext) {
-        try {
-            Logger.logInfo("Started registering policy provider");
-            const selectedRepoName = await gitHelper.getUpstream();
-
-            if (selectedRepoName !== MessageStatus.UNKNOWN) {
-                const diagnosticCollection = vscode.languages.createDiagnosticCollection("dependencyPolicyChecker");
-                context.subscriptions.push(diagnosticCollection);
-
-                const provider = new DependencyPolicyProvider(diagnosticCollection);
-                //added to activate the policy violation provider when the manifest file is already open
-                if (vscode.window.activeTextEditor?.document) {
-                    provider.checkPolicyViolation(vscode.window.activeTextEditor?.document);
-                }
-
-                context.subscriptions.push(
-                    vscode.languages.registerCodeActionsProvider({ scheme: "file" }, provider, {
-                        providedCodeActionKinds: [vscode.CodeActionKind.QuickFix],
-                    }),
-                );
-
-                // Trigger the check when a file is opened or saved
-                context.subscriptions.push(
-                    vscode.workspace.onDidOpenTextDocument((doc) => provider.checkPolicyViolation(doc)),
-                    vscode.workspace.onDidSaveTextDocument((doc) => provider.checkPolicyViolation(doc)),
-                    vscode.window.onDidChangeActiveTextEditor((editor) => {
-                        if (editor) {
-                            provider.checkPolicyViolation(editor.document);
-                        }
-                    }),
-                );
-            }
-        } catch (error) {
-            errorHandler.handleError(error);
-        } finally {
-            Logger.logInfo("Command registration has been completed");
-        }
-    }
 }
 const providers = new Providers();
-export { DebrickedCommandsTreeDataProvider, ManifestDependencyHoverProvider, providers };
+export { DebrickedCommandsTreeDataProvider, ManifestDependencyHoverProvider, providers, DependencyPolicyProvider };
diff --git a/src/watcher/reportWatcher.ts b/src/watcher/reportWatcher.ts
@@ -9,7 +9,7 @@ export class ReportWatcher {
     public async start(context: vscode.ExtensionContext): Promise<void> {
         const reportFilePath = DebrickedCommands.SCAN.flags?.[2]?.report;
         if (!reportFilePath) {
-            console.log("No report file path found");
+            Logger.logInfo("No report file path found");
             return;
         }
 

diff --git a/src/watcher/workspaceWatcher.ts b/src/watcher/workspaceWatcher.ts
@@ -3,6 +3,7 @@ import { SupportedFilesToScan } from "../constants";
 import { scanService } from "services";
 import { errorHandler, globalStore, Logger, statusBarMessageHelper } from "../helpers";
 import * as path from "path";
+import { DependencyPolicyProvider } from "../providers";
 
 export class WorkSpaceWatcher {
     private context: vscode.ExtensionContext;
@@ -56,13 +57,25 @@ export class WorkSpaceWatcher {
 
         try {
             await scanService.scan();
+            this.updatePackageJsonContent(this.context);
         } catch (error) {
             errorHandler.handleError(error);
         } finally {
             globalStore.setScanningProgress(false);
         }
     }
 
+    private async updatePackageJsonContent(context: vscode.ExtensionContext): Promise<void> {
+        const diagnosticCollection = vscode.languages.createDiagnosticCollection("dependencyPolicyChecker");
+        context.subscriptions.push(diagnosticCollection);
+
+        const provider = new DependencyPolicyProvider(diagnosticCollection);
+        //added to activate the policy violation provider when the manifest file is already open
+        if (vscode.window.activeTextEditor?.document) {
+            await provider.checkPolicyViolation(vscode.window.activeTextEditor?.document);
+        }
+    }
+
     public dispose(): void {
         if (this.packageJsonWatcher) {
             this.packageJsonWatcher.dispose();