Remove whole logic related to x / ! / ? merge symbols and add decoration N#158
Remove whole logic related to x / ! / ? merge symbols and add decoration N#158
Conversation
Dependency Review✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.Snapshot WarningsEnsure 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 FilesNone |
|
Coverage Impact ⬆️ Merging this pull request will increase total coverage on Modified Files with Diff Coverage (3)
🛟 Help
|
69ae30c to
263f741
Compare
0607e4e to
5b75d78
Compare
There was a problem hiding this comment.
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
_lastPrioritizedComponentListand 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;
}

Fixes
Changes
Screenshots
Checklist