Skip to content

Display resolved file names #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edriouk merged 3 commits into from
Mar 24, 2026
Merged

Display resolved file names #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
597cbb3
Display resolved file names
edriouk Mar 24, 2026
99bf5f7
Merge branch 'main' into fix-103
edriouk Mar 24, 2026
4f3720e
Lint
edriouk Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/views/solution-outline/tree-structure/solution-outline-file-item.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,21 @@ export class FileItemBuilder extends SolutionOutlineItemBuilder {

const hasCmsisPackRoot = fileValue.indexOf('${CMSIS_PACK_ROOT}') !== -1;
const resolvedFilePath = this.resolveFilePath(hasCmsisPackRoot, fileValue);
const fileBaseName = path.basename(fileValue);
const fileBaseName = path.basename(resolvedFilePath);
const resourcePath = hasCmsisPackRoot ? resolvedFilePath : f.resolvePath(resolvedFilePath);
const description = isApi ? ' (API)' : undefined;
const rootFileName = f.rootFileName;

const cfileItem = this.createFileItem(cgroupItem, fileBaseName, resourcePath, description);

// set special tooltip if sequences are resolved
if (!hasCmsisPackRoot && resolvedFilePath !== fileValue) {
const tooltip =
`- resolved: \`${resourcePath}\`\n` +
`- original: \`${fileValue}\``;
cfileItem.setAttribute('tooltip', tooltip);
}
Comment thread
edriouk marked this conversation as resolved.

// Check if file is excluded based on context restrictions
if (this.context && !matchesContext(f, this.context)) {
cfileItem.setAttribute('excluded', '1');
Expand Down
6 changes: 5 additions & 1 deletion test-data/solutions/USBD/CmsisViewTreeRef.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,21 @@ solution
projectUri=TEST_DIR/solutions/USBD/HID/HID.cproject.yml
expandable=1
file
label=$Dname$.test
label=STM32U585AIIx.test
expandable=0
resourcePath=TEST_DIR/solutions/USBD/HID/STM32U585AIIx.test
features=file
tooltip=- resolved: `TEST_DIR/solutions/USBD/HID/STM32U585AIIx.test`
- original: `$Dname$.test`
fileUri=$Dname$.test
projectUri=TEST_DIR/solutions/USBD/HID/HID.cproject.yml
file
label=testOutput.test
expandable=0
resourcePath=TEST_DIR/solutions/USBD/out/HID/B-U585I-IOT02A/Release/testOutput.test
features=file
tooltip=- resolved: `TEST_DIR/solutions/USBD/out/HID/B-U585I-IOT02A/Release/testOutput.test`
- original: `$OutDir()$/testOutput.test`
fileUri=$OutDir()$/testOutput.test
projectUri=TEST_DIR/solutions/USBD/HID/HID.cproject.yml
file
Expand Down
Loading