Skip to content

Remove whole logic related to x / ! / ? merge symbols and add decoration N#158

Merged
edriouk merged 3 commits intomainfrom
ow_inline_merge_command
Apr 7, 2026
Merged

Remove whole logic related to x / ! / ? merge symbols and add decoration N#158
edriouk merged 3 commits intomainfrom
ow_inline_merge_command

Conversation

@mguzmanm
Copy link
Copy Markdown
Contributor

@mguzmanm mguzmanm commented Apr 2, 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).

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 2, 2026

Dependency Review

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

Snapshot Warnings

⚠️: No snapshots were found for the head SHA be7c524.
Ensure that dependencies are being submitted on PR branches and consider enabling retry-on-snapshot-warnings. See the documentation for more information and troubleshooting advice.

Scanned Files

None

@qltysh
Copy link
Copy Markdown

qltysh Bot commented Apr 2, 2026

Qlty

Coverage Impact

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

Modified Files with Diff Coverage (3)

RatingFile% DiffUncovered Line #s
Coverage rating: A Coverage rating: A
.../solution-outline/tree-structure/solution-outline-file-item.ts100.0%
Coverage rating: B Coverage rating: B
...ution-outline/tree-structure/solution-outline-project-items.ts100.0%
Coverage rating: A Coverage rating: A
src/views/solution-outline/treeview-decoration-provider.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 force-pushed the ow_inline_merge_command branch from 69ae30c to 263f741 Compare April 2, 2026 14:27
@mguzmanm mguzmanm force-pushed the ow_inline_merge_command branch from 0607e4e to 5b75d78 Compare April 7, 2026 12:35
@mguzmanm mguzmanm changed the title Remove whole logic related to x / ! / ? merge symbols and add decorat… Remove whole logic related to x / ! / ? merge symbols and add decoration N Apr 7, 2026
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

This PR updates the Solution Outline UI to remove the previous merge-status symbol/tooltip logic ((?), (!), (X)) and instead indicate merge-relevant files via a dedicated VS Code file decoration badge (N), aligning with Issue #87’s request to move away from (?) markers.

Changes:

  • Added a new file decoration (N) for items with the merge feature/context and defined its priority relative to excluded/pack-sourced decorations.
  • Removed merge-status symbol/tooltip generation logic from solution-outline tree building utilities and related builders.
  • Updated/expanded unit tests to reflect the new decoration behavior and the removal of merge-status descriptions/tooltips.

Reviewed changes

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

Show a summary per file
File Description
src/views/solution-outline/treeview-decoration-provider.ts Adds merge file decoration (N) and prioritization logic.
src/views/solution-outline/treeview-decoration-provider.test.ts Adds tests for merge decoration and decoration priority ordering.
src/views/solution-outline/tree-structure/solution-outline-utils.ts Removes merge-status symbol/tooltip helper functions.
src/views/solution-outline/tree-structure/solution-outline-tree.ts Removes merge-status description/tooltip logic at project level.
src/views/solution-outline/tree-structure/solution-outline-project-items.ts Removes merge-status aggregation/tooltip logic at component grouping level.
src/views/solution-outline/tree-structure/solution-outline-hardware-item.test.ts Updates test expectations by removing merge-status tooltip assertion.
src/views/solution-outline/tree-structure/solution-outline-file-item.ts Stops setting merge-status description/tooltip on file nodes; keeps merge context.
src/views/solution-outline/tree-structure/solution-outline-file-item.test.ts Updates expectations to no longer require merge-status description/tooltip.
package.json Renames the merge command title to “Open Merge View”.
Comments suppressed due to low confidence (1)

src/views/solution-outline/tree-structure/solution-outline-project-items.ts:33

  • _lastPrioritizedComponentList and its public getter no longer appear to be referenced anywhere in the repo after the merge-status description logic was removed. Consider removing both to avoid leaving a stale/always-empty API surface.
export class ProjectItemsBuilder extends SolutionOutlineItemBuilder {
    private readonly _lastPrioritizedComponentList: COutlineItem[] = [];

    public get lastPrioritizedComponentList(): COutlineItem[] {
        return this._lastPrioritizedComponentList;
    }

Comment thread src/views/solution-outline/treeview-decoration-provider.ts
@mguzmanm mguzmanm requested a review from edriouk April 7, 2026 14:03
Copy link
Copy Markdown
Collaborator

@edriouk edriouk left a comment

Choose a reason for hiding this comment

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

LGTM

@edriouk edriouk merged commit 9b169de into main Apr 7, 2026
16 checks passed
@edriouk edriouk deleted the ow_inline_merge_command branch April 7, 2026 14:09
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