Skip to content

Commit 08ff9a5

Browse files
committed
Support current csolution merge message format only
1 parent 35c20bb commit 08ff9a5

2 files changed

Lines changed: 3 additions & 33 deletions

File tree

src/solutions/solution-problems.test.ts

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ describe('SolutionProblems', () => {
245245
logMessages: {
246246
success: true,
247247
errors: [],
248-
warnings: ["mylayer.clayer.yml - file '/packs/Component/config.c' update required from component 'Arm::Device@2.3.4'"],
248+
warnings: ["mylayer.clayer.yml - update required for file '/packs/Component/config.c' from component 'Arm::Device@2.3.4'"],
249249
info: [],
250250
},
251251
});
@@ -272,7 +272,7 @@ describe('SolutionProblems', () => {
272272

273273
it('creates merge diagnostic action for merge messages with component context', () => {
274274
const result = solutionProblems['createMergeDiagnosticAction'](
275-
"file '/packs/Component/config.c' update required from component 'Arm::Device@2.3.4'",
275+
"update required for file '/packs/Component/config.c' from component 'Arm::Device@2.3.4'",
276276
layerPath,
277277
);
278278

@@ -325,7 +325,7 @@ describe('SolutionProblems', () => {
325325
logMessages: {
326326
success: true,
327327
errors: [],
328-
warnings: ["mylayer.clayer.yml - file 'relative-config.c' update recommended"],
328+
warnings: ["mylayer.clayer.yml - update recommended for file 'relative-config.c'"],
329329
info: [],
330330
},
331331
});
@@ -343,31 +343,6 @@ describe('SolutionProblems', () => {
343343
expect(JSON.parse(decodeURIComponent(args))).toEqual([layerPath]);
344344
});
345345

346-
it.each(['required', 'recommended', 'suggested', 'mandatory'] as const)(
347-
'renders merge diagnostics for %s update levels',
348-
async updateLevel => {
349-
await solutionProblems.activate({ subscriptions: [] } as unknown as ExtensionContext);
350-
const setSpy = jest.spyOn(vscode.languages.createDiagnosticCollection(), 'set');
351-
352-
await eventHub.fireConvertCompleted({
353-
severity: 'warning',
354-
detection: false,
355-
logMessages: {
356-
success: true,
357-
errors: [],
358-
warnings: [`mylayer.clayer.yml - file '/packs/Component/${updateLevel}.c' update ${updateLevel}`],
359-
info: [],
360-
},
361-
});
362-
await waitTimeout();
363-
364-
const [, diagnostics] = setSpy.mock.calls[0] as unknown as [vscode.Uri, readonly vscode.Diagnostic[] | undefined];
365-
expect(diagnostics?.[0].message).toBe(
366-
`update ${updateLevel} for config file '${updateLevel}.c' has a new version available for merge.`
367-
);
368-
}
369-
);
370-
371346
it.each(['required', 'recommended', 'suggested', 'mandatory'] as const)(
372347
'renders merge diagnostics for current toolbox wording with %s update levels',
373348
async updateLevel => {

src/solutions/solution-problems.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,6 @@ export const enrichLogMessagesFromToolOutput = async (logMessages: LogMessages,
104104
export const MERGE_VIEW_LINK_LABEL = 'Open in Merge View';
105105
export type MergeUpdateLevel = 'required' | 'recommended' | 'suggested' | 'mandatory';
106106
const mergeMessagePatterns = [
107-
{
108-
pattern: /file\s+'([^']+)'\s+update\s+(required|recommended|suggested|mandatory)/i,
109-
getLocalPath: (match: RegExpExecArray) => match[1],
110-
getUpdateLevel: (match: RegExpExecArray) => match[2],
111-
},
112107
{
113108
pattern: /update\s+(required|recommended|suggested|mandatory)\s+for\s+file\s+'([^']+)'/i,
114109
getLocalPath: (match: RegExpExecArray) => match[2],

0 commit comments

Comments
 (0)