Skip to content

Remove duplicate filename display in displayFileContent #13999

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
pelikhan merged 2 commits into from
Feb 5, 2026
Merged

Remove duplicate filename display in displayFileContent #13999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1be4f4a
Initial plan
Copilot Feb 5, 2026
8739e2a
Fix displayFileContent filename duplication
Copilot Feb 5, 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
13 changes: 5 additions & 8 deletions actions/setup/js/display_file_helpers.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,15 @@ function displayFileContent(filePath, fileName, maxBytes = 64 * 1024) {
return;
}

// Display file size info
core.info(` ${fileName} (${stats.size} bytes)`);

// Handle empty files
if (stats.size === 0) {
core.info(` (empty file)`);
core.info(` ${fileName} (empty file)`);
return;
}

// Handle files too large to read
if (stats.size >= 1024 * 1024) {
core.info(` (file too large to display, ${stats.size} bytes)`);
core.info(` ${fileName} (file too large to display, ${stats.size} bytes)`);
return;
}

Expand All @@ -46,7 +43,7 @@ function displayFileContent(filePath, fileName, maxBytes = 64 * 1024) {
const shouldDisplayContent = displayExtensions.includes(fileExtension);

if (!shouldDisplayContent) {
core.info(` (content not displayed for ${fileExtension} files)`);
core.info(` ${fileName} (content not displayed for ${fileExtension} files)`);
return;
}

Expand All @@ -55,8 +52,8 @@ function displayFileContent(filePath, fileName, maxBytes = 64 * 1024) {
const contentToDisplay = content.length > maxBytes ? content.substring(0, maxBytes) : content;
const wasTruncated = content.length > maxBytes;

// Use collapsible group for file content with just the filename as title
core.startGroup(fileName);
// Use collapsible group for file content with filename and size as title
core.startGroup(`${fileName} (${stats.size} bytes)`);
const lines = contentToDisplay.split("\n");
for (const line of lines) {
core.info(line);
Expand Down
60 changes: 30 additions & 30 deletions actions/setup/js/display_file_helpers.test.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,9 @@ describe("display_file_helpers", () => {
try {
displayFileContent(filePath, "test.txt");

// Check file info was displayed
expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("test.txt"));
expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("bytes"));

// Check group was started with just the filename
expect(mockCore.startGroup).toHaveBeenCalledWith("test.txt");
// Check group was started with filename and size
expect(mockCore.startGroup).toHaveBeenCalledWith(expect.stringContaining("test.txt"));
expect(mockCore.startGroup).toHaveBeenCalledWith(expect.stringContaining("bytes"));

// Check content was displayed
expect(mockCore.info).toHaveBeenCalledWith("Line 1");
Expand All @@ -51,9 +48,8 @@ describe("display_file_helpers", () => {
try {
displayFileContent(filePath, "empty.txt");

// Check file info was displayed
expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("empty.txt"));
expect(mockCore.info).toHaveBeenCalledWith(" (empty file)");
// Check empty file message was displayed
expect(mockCore.info).toHaveBeenCalledWith(" empty.txt (empty file)");

// Should not start group for empty file
expect(mockCore.startGroup).not.toHaveBeenCalled();
Expand Down Expand Up @@ -135,6 +131,7 @@ describe("display_file_helpers", () => {
displayFileContent(filePath, "huge.txt");

// Check "too large" message was displayed
expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("huge.txt"));
expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("file too large to display"));

// Should not start group for too large file
Expand Down Expand Up @@ -171,12 +168,8 @@ describe("display_file_helpers", () => {
try {
displayFileContent(filePath, "test.pdf");

// Check file info was displayed
expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("test.pdf"));
expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("bytes"));

// Check message about not displaying content
expect(mockCore.info).toHaveBeenCalledWith(" (content not displayed for .pdf files)");
expect(mockCore.info).toHaveBeenCalledWith(" test.pdf (content not displayed for .pdf files)");

// Should not start group for unsupported file type
expect(mockCore.startGroup).not.toHaveBeenCalled();
Expand All @@ -200,8 +193,9 @@ describe("display_file_helpers", () => {
try {
displayFileContent(filePath, "test.json");

// Check group was started
expect(mockCore.startGroup).toHaveBeenCalledWith("test.json");
// Check group was started with filename and size
expect(mockCore.startGroup).toHaveBeenCalledWith(expect.stringContaining("test.json"));
expect(mockCore.startGroup).toHaveBeenCalledWith(expect.stringContaining("bytes"));

// Check content was displayed
expect(mockCore.info).toHaveBeenCalledWith('{"key": "value"}');
Expand All @@ -222,8 +216,9 @@ describe("display_file_helpers", () => {
try {
displayFileContent(filePath, "test.log");

// Check group was started
expect(mockCore.startGroup).toHaveBeenCalledWith("test.log");
// Check group was started with filename and size
expect(mockCore.startGroup).toHaveBeenCalledWith(expect.stringContaining("test.log"));
expect(mockCore.startGroup).toHaveBeenCalledWith(expect.stringContaining("bytes"));

// Check content was displayed
expect(mockCore.info).toHaveBeenCalledWith("Log entry 1");
Expand All @@ -245,8 +240,9 @@ describe("display_file_helpers", () => {
try {
displayFileContent(filePath, "test.md");

// Check group was started
expect(mockCore.startGroup).toHaveBeenCalledWith("test.md");
// Check group was started with filename and size
expect(mockCore.startGroup).toHaveBeenCalledWith(expect.stringContaining("test.md"));
expect(mockCore.startGroup).toHaveBeenCalledWith(expect.stringContaining("bytes"));

// Check content was displayed
expect(mockCore.info).toHaveBeenCalledWith("# Markdown Title");
Expand All @@ -268,8 +264,9 @@ describe("display_file_helpers", () => {
try {
displayFileContent(filePath, "config.yml");

// Check group was started
expect(mockCore.startGroup).toHaveBeenCalledWith("config.yml");
// Check group was started with filename and size
expect(mockCore.startGroup).toHaveBeenCalledWith(expect.stringContaining("config.yml"));
expect(mockCore.startGroup).toHaveBeenCalledWith(expect.stringContaining("bytes"));

// Check content was displayed
expect(mockCore.info).toHaveBeenCalledWith("key: value");
Expand All @@ -291,8 +288,9 @@ describe("display_file_helpers", () => {
try {
displayFileContent(filePath, "config.yaml");

// Check group was started
expect(mockCore.startGroup).toHaveBeenCalledWith("config.yaml");
// Check group was started with filename and size
expect(mockCore.startGroup).toHaveBeenCalledWith(expect.stringContaining("config.yaml"));
expect(mockCore.startGroup).toHaveBeenCalledWith(expect.stringContaining("bytes"));

// Check content was displayed
expect(mockCore.info).toHaveBeenCalledWith("name: test");
Expand All @@ -314,8 +312,9 @@ describe("display_file_helpers", () => {
try {
displayFileContent(filePath, "config.toml");

// Check group was started
expect(mockCore.startGroup).toHaveBeenCalledWith("config.toml");
// Check group was started with filename and size
expect(mockCore.startGroup).toHaveBeenCalledWith(expect.stringContaining("config.toml"));
expect(mockCore.startGroup).toHaveBeenCalledWith(expect.stringContaining("bytes"));

// Check content was displayed
expect(mockCore.info).toHaveBeenCalledWith("[package]");
Expand Down Expand Up @@ -349,10 +348,11 @@ describe("display_file_helpers", () => {
// Check directory group was started
expect(mockCore.startGroup).toHaveBeenCalledWith(expect.stringContaining(tmpDir));

// Check both files were displayed
const infoMessages = mockCore.info.mock.calls.map(call => call[0]).join("\n");
expect(infoMessages).toContain("file1.txt");
expect(infoMessages).toContain("file2.txt");
// Check both files were displayed in startGroup calls (with file size)
const startGroupMessages = mockCore.startGroup.mock.calls.map(call => call[0]).join("\n");
expect(startGroupMessages).toContain("file1.txt");
expect(startGroupMessages).toContain("file2.txt");
expect(startGroupMessages).toContain("bytes");

// Check group was ended
expect(mockCore.endGroup).toHaveBeenCalled();
Expand Down
Loading