Remove extra command

Author: mguzmanm

src/manifest.ts

@@ -44,7 +44,7 @@ export const OUTPUT_DIRECTORY = 'outputDirectory';
 export const CONFIG_AUTO_DEBUG_LAUNCH = 'autoDebugLaunch';
 export const CONFIG_BUILD_OUTPUT_VERBOSITY = 'buildOutputVerbosity';
 export const MANAGE_COMPONENTS_PACKS_COMMAND_ID = `${PACKAGE_NAME}.manageComponentsPacks`;
-export const MERGE_FILE_FROM_PATH_COMMAND_ID = `${PACKAGE_NAME}.mergeFileFromPath`;
+export const MERGE_FILE_COMMAND_ID = `${PACKAGE_NAME}.mergeFile`;
 
 export const MIN_TOOLBOX_VERSION = '2.12.0';
 

src/solutions/solution-problems.test.ts

@@ -17,7 +17,7 @@
 import { describe, it, expect, beforeEach } from '@jest/globals';
 import * as vscode from 'vscode';
 import { ExtensionContext } from 'vscode';
-import { MANAGE_COMPONENTS_PACKS_COMMAND_ID, MERGE_FILE_FROM_PATH_COMMAND_ID } from '../manifest';
+import { MANAGE_COMPONENTS_PACKS_COMMAND_ID, MERGE_FILE_COMMAND_ID } from '../manifest';
 import * as fsUtils from '../utils/fs-utils';
 import * as vscodeUtils from '../utils/vscode-utils';
 import { solutionManagerFactory, MockSolutionManager } from './solution-manager.factories';
@@ -258,15 +258,15 @@ describe('SolutionProblems', () => {
 
         expect(diagnostic?.message).toBe("update required for config file 'config.c' from component 'Device'.");
         expect(code.value).toBe('Open in Merge View');
-        expect(command).toBe(`command:${MERGE_FILE_FROM_PATH_COMMAND_ID}`);
+        expect(command).toBe(`command:${MERGE_FILE_COMMAND_ID}`);
         expect(JSON.parse(decodeURIComponent(args))).toEqual(['/packs/Component/config.c']);
     });
 
     it('creates a merge command uri with encoded local path', () => {
         const result = solutionProblems['createMergeCommandUri']('/packs/Component/config.c');
         const [command, args] = result.toString().split('?');
 
-        expect(command).toBe(`command:${MERGE_FILE_FROM_PATH_COMMAND_ID}`);
+        expect(command).toBe(`command:${MERGE_FILE_COMMAND_ID}`);
         expect(JSON.parse(decodeURIComponent(args))).toEqual(['/packs/Component/config.c']);
     });
 
@@ -280,7 +280,7 @@ describe('SolutionProblems', () => {
             message: "update required for config file 'config.c' from component 'Device'.",
             code: {
                 value: 'Open in Merge View',
-                target: vscode.Uri.parse(`command:${MERGE_FILE_FROM_PATH_COMMAND_ID}?${encodeURIComponent(JSON.stringify(['/packs/Component/config.c']))}`),
+                target: vscode.Uri.parse(`command:${MERGE_FILE_COMMAND_ID}?${encodeURIComponent(JSON.stringify(['/packs/Component/config.c']))}`),
             },
         });
     });
@@ -318,7 +318,7 @@ describe('SolutionProblems', () => {
         expect(uri.fsPath).toContain('mylayer.clayer.yml');
         expect(diagnostic?.message).toBe("update recommended for config file 'mylayer.clayer.yml' has a new version available for merge.");
         expect(code.value).toBe('Open in Merge View');
-        expect(command).toBe(`command:${MERGE_FILE_FROM_PATH_COMMAND_ID}`);
+        expect(command).toBe(`command:${MERGE_FILE_COMMAND_ID}`);
         expect(JSON.parse(decodeURIComponent(args))).toEqual([layerPath]);
     });
 

src/solutions/solution-problems.ts

@@ -17,7 +17,7 @@
 import * as path from 'node:path';
 import * as vscode from 'vscode';
 import { constructor } from '../generic/constructor';
-import { MANAGE_COMPONENTS_PACKS_COMMAND_ID, MERGE_FILE_FROM_PATH_COMMAND_ID } from '../manifest';
+import { MANAGE_COMPONENTS_PACKS_COMMAND_ID, MERGE_FILE_COMMAND_ID } from '../manifest';
 import { LogMessages } from '../json-rpc/csolution-rpc-client';
 import * as fsUtils from '../utils/fs-utils';
 import { getFileNameFromPath } from '../utils/path-utils';
@@ -337,7 +337,7 @@ export class SolutionProblemsImpl implements SolutionProblems {
 
     private createMergeCommandUri(localPath: string): vscode.Uri {
         const args = this.encodeCommandArgs([localPath]);
-        return vscode.Uri.parse(`command:${MERGE_FILE_FROM_PATH_COMMAND_ID}?${args}`);
+        return vscode.Uri.parse(`command:${MERGE_FILE_COMMAND_ID}?${args}`);
     }
 
     private createMergeDiagnosticAction(message: string, diagnosticFilePath: string): { message: string; code: NonNullable<vscode.Diagnostic['code']> } | undefined {

src/views/solution-outline/commands/merge-command.test.ts

@@ -100,23 +100,43 @@ describe('MergeCommand', () => {
         it('registers the command on activation', async () => {
             await command.activate(extensionContextFactory());
 
-            expect(commandsProvider.registerCommand).toHaveBeenCalledTimes(2);
+            expect(commandsProvider.registerCommand).toHaveBeenCalledTimes(1);
             expect(commandsProvider.registerCommand).toHaveBeenCalledWith(MergeCommand.mergeFile, expect.any(Function), expect.anything());
-            expect(commandsProvider.registerCommand).toHaveBeenCalledWith(MergeCommand.mergeFileFromPath, expect.any(Function), expect.anything());
         });
 
-        it('forwards the mergeFileFromPath command argument to the merge handler', async () => {
+        it('forwards string command argument to the merge handler', async () => {
             const runVSCodeMergeFromPathSpy = jest.spyOn(
                 command as unknown as { runVSCodeMergeFromPath: (localPath: string) => Promise<void> },
                 'runVSCodeMergeFromPath',
             ).mockResolvedValue();
             const localPath = path.join(tmpDir, 'component.c');
 
             await command.activate(extensionContextFactory());
-            await commandsProvider.mockRunRegistered(MergeCommand.mergeFileFromPath, localPath);
+            await commandsProvider.mockRunRegistered(MergeCommand.mergeFile, localPath);
 
             expect(runVSCodeMergeFromPathSpy).toHaveBeenCalledWith(localPath);
         });
+
+        it('forwards COutlineItem command argument to the node merge handler', async () => {
+            const runVSCodeMergeSpy = jest.spyOn(
+                command as unknown as { runVSCodeMerge: (node: COutlineItem) => Promise<void> },
+                'runVSCodeMerge',
+            ).mockResolvedValue();
+
+            await command.activate(extensionContextFactory());
+            await commandsProvider.mockRunRegistered(MergeCommand.mergeFile, fileNode);
+
+            expect(runVSCodeMergeSpy).toHaveBeenCalledWith(fileNode);
+        });
+
+        it('shows error for unsupported command argument type', async () => {
+            const showErrorMessageSpy = jest.spyOn(vscode.window, 'showErrorMessage');
+
+            await command.activate(extensionContextFactory());
+            await commandsProvider.mockRunRegistered(MergeCommand.mergeFile, undefined);
+
+            expect(showErrorMessageSpy).toHaveBeenCalledWith('Cannot open merge view: unsupported command argument.');
+        });
     });
 
     describe('merge file discovery', () => {

src/views/solution-outline/commands/merge-command.ts

@@ -28,7 +28,6 @@ import * as fsUtils from '../../../utils/fs-utils';
 
 export class MergeCommand {
     public static readonly mergeFile = `${PACKAGE_NAME}.mergeFile`;
-    public static readonly mergeFileFromPath = `${PACKAGE_NAME}.mergeFileFromPath`;
     private static readonly disallowedCmdChars = /[\r\n&|<>^%"']/;
 
     constructor(
@@ -38,15 +37,24 @@ export class MergeCommand {
 
     public async activate(context: Pick<vscode.ExtensionContext, 'subscriptions'>) {
         context.subscriptions.push(
-            this.commandsProvider.registerCommand(MergeCommand.mergeFile, (node: COutlineItem) => {
-                this.runVSCodeMerge(node);
-            }, this),
-            this.commandsProvider.registerCommand(MergeCommand.mergeFileFromPath, (localPath: string) => {
-                this.runVSCodeMergeFromPath(localPath);
-            }, this),
+            this.commandsProvider.registerCommand(MergeCommand.mergeFile, this.handleMergeCommand, this),
         );
     }
 
+    private async handleMergeCommand(commandArg: COutlineItem | string | undefined): Promise<void> {
+        if (commandArg instanceof COutlineItem) {
+            await this.runVSCodeMerge(commandArg);
+            return;
+        }
+
+        if (typeof commandArg === 'string') {
+            await this.runVSCodeMergeFromPath(commandArg);
+            return;
+        }
+
+        vscode.window.showErrorMessage('Cannot open merge view: unsupported command argument.');
+    }
+
     private async runVSCodeMergeFromPath(localPath: string): Promise<void> {
         if (!localPath) {
             vscode.window.showErrorMessage('Cannot open merge view: merge file path is missing.');