support csolution new merge messages accross path formats

Author: mguzmanm

src/solutions/solution-problems.test.ts

@@ -301,6 +301,11 @@ describe('SolutionProblems', () => {
         });
     });
 
+    it('treats Windows-style merge paths as absolute', () => {
+        expect(solutionProblems['isAbsoluteFilePath']('C:/CubeMX/CubeMX/RTE/CMSIS/RTX_Config.c')).toBe(true);
+        expect(solutionProblems['isAbsoluteFilePath']('relative-config.c')).toBe(false);
+    });
+
     it('returns undefined merge diagnostic action for non-merge messages', () => {
         const result = solutionProblems['createMergeDiagnosticAction'](
             "component 'Arm::Device@2.3.4' is missing",

src/solutions/solution-problems.ts

@@ -355,14 +355,18 @@ export class SolutionProblemsImpl implements SolutionProblems {
         return vscode.Uri.parse(`command:${MERGE_FILE_COMMAND_ID}?${args}`);
     }
 
+    private isAbsoluteFilePath(filePath: string): boolean {
+        return path.isAbsolute(filePath) || path.win32.isAbsolute(filePath);
+    }
+
     private createMergeDiagnosticAction(message: string, diagnosticFilePath: string): { message: string; code: NonNullable<vscode.Diagnostic['code']> } | undefined {
         const merge = this.parseMergeMessage(message);
         if (!merge) {
             return undefined;
         }
 
         const componentId = mergeComponentRegex.exec(message)?.[1];
-        const localPath = path.isAbsolute(merge.localPath) ? merge.localPath : diagnosticFilePath;
+        const localPath = this.isAbsoluteFilePath(merge.localPath) ? merge.localPath : diagnosticFilePath;
         const formattedMessage = this.createMergeDiagnosticMessage(localPath, merge.updateLevel, componentId);
 
         return {