Use REFRESH_COMMAND_ID

Author: mguzmanm

src/desktop/extension.ts

@@ -221,7 +221,7 @@ export const activate = async (context: ExtensionContext): Promise<CsolutionExte
     const fileDecorationProviderManager = new FileDecorationProviderManagerImpl();
     const treeViewProviderImpl = new TreeViewProviderImpl(SolutionOutlineView.treeViewId);
     const treeViewFileDecorationProvider = new TreeViewFileDecorationProvider(fileDecorationProviderManager, themeProvider);
-    const mergeSessionCoordinator = new MergeSessionCoordinatorImpl(solutionManager);
+    const mergeSessionCoordinator = new MergeSessionCoordinatorImpl(commandsProvider);
     const mergeCommand = new MergeCommand(commandsProvider, mergeSessionCoordinator);
     const buildCommand = new BuildCommand(buildTaskProvider, commandsProvider, buildTaskDefinitionBuilder);
     const runGeneratorCommand = new GeneratorCommand(commandsProvider, solutionManager, outputChannelProvider, cmsisToolboxManager);

src/views/solution-outline/commands/merge-session-coordinator.test.ts

@@ -21,11 +21,13 @@ import * as vscode from 'vscode';
 import { TestDataHandler } from '../../../__test__/test-data';
 import { MergeSessionCoordinatorImpl } from './merge-session-coordinator';
 import * as fsUtils from '../../../utils/fs-utils';
+import { commandsProviderFactory, MockCommandsProvider } from '../../../vscode-api/commands-provider.factories';
+import { REFRESH_COMMAND_ID } from '../../../manifest';
 
 describe('MergeSessionCoordinator', () => {
     const testDataHandler = new TestDataHandler();
     let tmpDir: string;
-    let solutionManager: { refresh: jest.Mock<Promise<void>, []> };
+    let commandsProvider: MockCommandsProvider;
     let coordinator: MergeSessionCoordinatorImpl;
     let saveEmitter: vscode.EventEmitter<vscode.TextDocument>;
 
@@ -39,11 +41,10 @@ describe('MergeSessionCoordinator', () => {
         saveEmitter = new vscode.EventEmitter<vscode.TextDocument>();
         (vscode.workspace as unknown as { onDidSaveTextDocument: vscode.Event<vscode.TextDocument> }).onDidSaveTextDocument = saveEmitter.event;
 
-        solutionManager = {
-            refresh: jest.fn().mockResolvedValue(),
-        };
+        commandsProvider = commandsProviderFactory();
+        commandsProvider.executeCommand.mockResolvedValue(undefined);
 
-        coordinator = new MergeSessionCoordinatorImpl(solutionManager);
+        coordinator = new MergeSessionCoordinatorImpl(commandsProvider);
 
         await coordinator.activate({ subscriptions: [] } as unknown as vscode.ExtensionContext);
     });
@@ -76,7 +77,8 @@ describe('MergeSessionCoordinator', () => {
         expect(fsUtils.fileExists(update)).toBeTruthy();
         expect(fsUtils.fileExists(`${local}.bak`)).toBeFalsy();
 
-        expect(solutionManager.refresh).toHaveBeenCalledTimes(1);
+        expect(commandsProvider.executeCommand).toHaveBeenCalledTimes(1);
+        expect(commandsProvider.executeCommand).toHaveBeenCalledWith(REFRESH_COMMAND_ID);
     });
 
     it('ignores save events for unrelated files', async () => {
@@ -96,7 +98,7 @@ describe('MergeSessionCoordinator', () => {
             handleDidSaveTextDocument: (document: vscode.TextDocument) => Promise<void>
         }).handleDidSaveTextDocument({ uri: { fsPath: path.join(tmpDir, 'other.c') } } as vscode.TextDocument);
 
-        expect(solutionManager.refresh).not.toHaveBeenCalled();
+        expect(commandsProvider.executeCommand).not.toHaveBeenCalled();
         expect(fsUtils.fileExists(merged)).toBeTruthy();
     });
 
@@ -118,7 +120,7 @@ describe('MergeSessionCoordinator', () => {
             handleDidSaveTextDocument: (document: vscode.TextDocument) => Promise<void>
         }).handleDidSaveTextDocument({ uri: { fsPath: merged } } as vscode.TextDocument);
 
-        expect(solutionManager.refresh).not.toHaveBeenCalled();
+        expect(commandsProvider.executeCommand).not.toHaveBeenCalled();
         expect(fsUtils.fileExists(merged)).toBeTruthy();
     });
 
@@ -138,6 +140,7 @@ describe('MergeSessionCoordinator', () => {
 
         expect(fsUtils.fileExists(local)).toBeTruthy();
         expect(fsUtils.readTextFile(local)).toContain('// merged');
-        expect(solutionManager.refresh).toHaveBeenCalledTimes(1);
+        expect(commandsProvider.executeCommand).toHaveBeenCalledTimes(1);
+        expect(commandsProvider.executeCommand).toHaveBeenCalledWith(REFRESH_COMMAND_ID);
     });
 });

src/views/solution-outline/commands/merge-session-coordinator.ts

@@ -16,9 +16,10 @@
 
 import * as path from 'path';
 import * as vscode from 'vscode';
-import type { SolutionManager } from '../../../solutions/solution-manager';
+import { REFRESH_COMMAND_ID } from '../../../manifest';
 import * as fsUtils from '../../../utils/fs-utils';
 import { pathsEqual } from '../../../utils/path-utils';
+import type { CommandsProvider } from '../../../vscode-api/commands-provider';
 
 export interface MergeSessionFiles {
     local: string;
@@ -40,7 +41,7 @@ export class MergeSessionCoordinatorImpl implements MergeSessionCoordinator {
     private finalizing = false;
 
     constructor(
-        private readonly solutionManager: Pick<SolutionManager, 'refresh'>,
+        private readonly commandsProvider: Pick<CommandsProvider, 'executeCommand'>,
     ) {
     }
 
@@ -77,7 +78,7 @@ export class MergeSessionCoordinatorImpl implements MergeSessionCoordinator {
         }
         // Keep save handling non-destructive while the merge editor is still open.
         // The actual file rename/delete operations are performed on merge process exit.
-        await this.solutionManager.refresh();
+        void this.commandsProvider.executeCommand(REFRESH_COMMAND_ID);
     }
 
     private async tryFinalizeOnExit(): Promise<void> {
@@ -95,7 +96,9 @@ export class MergeSessionCoordinatorImpl implements MergeSessionCoordinator {
         try {
             this.performPostMergeOperations(session);
             this.activeSession = undefined;
-            await this.solutionManager.refresh();
+            // Await is required here so merge finalization is not reported complete
+            // before the refresh command has finished processing.
+            await this.commandsProvider.executeCommand(REFRESH_COMMAND_ID);
         } finally {
             this.finalizing = false;
         }