Merge pull request #9 from badsyntax/tree-refresh

Fix refresh migrations

package.json

@@ -16,6 +16,7 @@
     "entity",
     "framework",
     "migrations",
+    "entity framework",
     ".net",
     "dotnet",
     "core",

src/actions/AddMigrationAction.ts

@@ -1,15 +1,21 @@
 import * as vscode from 'vscode';
+import { CommandProvider } from '../commands/CommandProvider';
+import { RefreshTreeCommand } from '../commands/RefreshTreeCommand';
 import { getCommandsConfig } from '../config/config';
 
 import type { TerminalProvider } from '../terminal/TerminalProvider';
+import {
+  dbContextsCache,
+  DbContextTreeItem,
+} from '../treeView/DbContextTreeItem';
 import { TerminalAction } from './TerminalAction';
 
 export class AddMigrationAction extends TerminalAction {
   constructor(
     terminalProvider: TerminalProvider,
-    workspaceRoot: string,
-    dbContext: string,
-    project: string,
+    private readonly workspaceRoot: string,
+    private readonly dbContext: string,
+    private readonly project: string,
   ) {
     super(
       terminalProvider,
@@ -31,9 +37,19 @@ export class AddMigrationAction extends TerminalAction {
     if (!migrationName) {
       return;
     }
-    return super.run({
+    await super.run({
       ...this.params,
       migrationName,
     });
+    const cacheId = DbContextTreeItem.getCacheId(
+      this.workspaceRoot,
+      this.project,
+      this.dbContext,
+    );
+    dbContextsCache.clear(cacheId);
+    await vscode.commands.executeCommand(
+      CommandProvider.getCommandName(RefreshTreeCommand.commandName),
+      false,
+    );
   }
 }

src/actions/RemoveMigrationAction.ts

@@ -1,13 +1,20 @@
+import * as vscode from 'vscode';
+import { CommandProvider } from '../commands/CommandProvider';
+import { RefreshTreeCommand } from '../commands/RefreshTreeCommand';
 import { getCommandsConfig } from '../config/config';
 import type { TerminalProvider } from '../terminal/TerminalProvider';
+import {
+  dbContextsCache,
+  DbContextTreeItem,
+} from '../treeView/DbContextTreeItem';
 import { TerminalAction } from './TerminalAction';
 
 export class RemoveMigrationAction extends TerminalAction {
   constructor(
     terminalProvider: TerminalProvider,
-    workspaceRoot: string,
-    dbContext: string,
-    project: string,
+    private readonly workspaceRoot: string,
+    private readonly dbContext: string,
+    private readonly project: string,
   ) {
     super(
       terminalProvider,
@@ -19,4 +26,18 @@ export class RemoveMigrationAction extends TerminalAction {
       workspaceRoot,
     );
   }
+
+  public async run() {
+    await super.run();
+    const cacheId = DbContextTreeItem.getCacheId(
+      this.workspaceRoot,
+      this.project,
+      this.dbContext,
+    );
+    dbContextsCache.clear(cacheId);
+    await vscode.commands.executeCommand(
+      CommandProvider.getCommandName(RefreshTreeCommand.commandName),
+      false,
+    );
+  }
 }

src/extension.ts

@@ -3,7 +3,6 @@ import type * as vscode from 'vscode';
 import { TreeDataProvider } from './treeView/TreeDataProvider';
 import { CommandProvider } from './commands/CommandProvider';
 import { MigrationTreeItemDecorationProvider } from './treeView/MigrationTreeItemDecorationProvider';
-import { DbContextModelSnapshotWatcher } from './util/DbContextModelSnapshotWatcher';
 import { SolutionFinder } from './solution/SolutionProvider';
 import { Terminal } from './terminal/Terminal';
 import { TerminalProvider } from './terminal/TerminalProvider';
@@ -12,9 +11,6 @@ const subscriptions: vscode.Disposable[] = [];
 
 export async function activate(_context: vscode.ExtensionContext) {
   const solutionFiles = await SolutionFinder.getSolutionFiles();
-  const dbContextModelContextWatcher = new DbContextModelSnapshotWatcher(
-    solutionFiles,
-  );
   const migrationTreeItemDecorationProvider =
     new MigrationTreeItemDecorationProvider();
   const treeDataProvider = new TreeDataProvider(solutionFiles);
@@ -23,9 +19,7 @@ export async function activate(_context: vscode.ExtensionContext) {
     treeDataProvider,
     terminalProvider,
   );
-
   subscriptions.push(
-    dbContextModelContextWatcher,
     migrationTreeItemDecorationProvider,
     treeDataProvider,
     commandProvider,