Skip to content

Update regular expresion to detect new message format from csolution#198

Merged
mguzmanm merged 3 commits into
mainfrom
pw_open_merge_view
Apr 17, 2026
Merged

Update regular expresion to detect new message format from csolution#198
mguzmanm merged 3 commits into
mainfrom
pw_open_merge_view

Conversation

@mguzmanm
Copy link
Copy Markdown
Contributor

@mguzmanm mguzmanm commented Apr 17, 2026

Fixes

Changes

Screenshots

Checklist

  • 🤖 This change is covered by unit tests (if applicable).
  • 🤹 Manual testing has been performed (if necessary).
  • 🛡️ Security impacts have been considered (if relevant).
  • 📖 Documentation updates are complete (if required).
  • 🧠 Third-party dependencies and TPIP updated (if required).

@mguzmanm mguzmanm force-pushed the pw_open_merge_view branch from 1dcbe69 to b7df24b Compare April 17, 2026 12:53
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 17, 2026

Dependency Review

✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.

Scanned Files

None

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates merge-message parsing in the CMSIS Solution VS Code extension so that Problems diagnostics can detect the newer csolution/toolbox “update … for file …” wording and still offer the “Open in Merge View” action.

Changes:

  • Replaced the single merge-message regex with an ordered set of regex patterns to support multiple message wordings.
  • Updated merge-message parsing to iterate through patterns and extract path/update level accordingly.
  • Added unit tests covering the new toolbox wording and update-level variants.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File Description
src/solutions/solution-problems.ts Expands merge-message detection to support the new toolbox output format via multiple regex patterns.
src/solutions/solution-problems.test.ts Adds unit tests to validate merge diagnostic actions/messages for the new wording and levels.

Comment thread src/solutions/solution-problems.ts
@qltysh
Copy link
Copy Markdown

qltysh Bot commented Apr 17, 2026

Qlty


Coverage Impact

⬆️ Merging this pull request will increase total coverage on main by 0.01%.

Modified Files with Diff Coverage (1)

RatingFile% DiffUncovered Line #s
Coverage rating: A Coverage rating: A
src/solutions/solution-problems.ts100.0%
Total100.0%
🚦 See full report on Qlty Cloud »

🛟 Help
  • Diff Coverage: Coverage for added or modified lines of code (excludes deleted files). Learn more.

  • Total Coverage: Coverage for the whole repository, calculated as the sum of all File Coverage. Learn more.

  • File Coverage: Covered Lines divided by Covered Lines plus Missed Lines. (Excludes non-executable lines including blank lines and comments.)

    • Indirect Changes: Changes to File Coverage for files that were not modified in this PR. Learn more.

@mguzmanm mguzmanm requested a review from brondani April 17, 2026 13:36
Copy link
Copy Markdown
Collaborator

@brondani brondani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mguzmanm mguzmanm merged commit c7b53e4 into main Apr 17, 2026
12 checks passed
@mguzmanm mguzmanm deleted the pw_open_merge_view branch April 17, 2026 14:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants