Skip to content

internal/graph: escape source filenames in DOT labels #1032

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

Open
jabrailkhalil wants to merge 13 commits into
base: main
Choose a base branch
from
+4 −4
Open

internal/graph: escape source filenames in DOT labels #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fee05a5
internal/graph: escape source filenames in DOT labels
jabrailkhalil Sep 30, 2026
0424813
internal/graph: consolidate filename escaping coverage
jabrailkhalil Oct 1, 2026
fdc18dd
Merge branch 'main' into fix/dot-source-filenames
jabrailkhalil Oct 1, 2026
b35da65
internal/graph: keep one golden file per compose test
jabrailkhalil Oct 2, 2026
1c95572
Merge remote-tracking branch 'origin/main' into fix/dot-source-filenames
jabrailkhalil Oct 2, 2026
ca75c96
Merge branch 'main' into fix/dot-source-filenames
aalexand Oct 4, 2026
9589544
fix: reconcile graph filename escaping with current main
jabrailkhalil Oct 10, 2026
cb195a7
test: consolidate filename escaping coverage
jabrailkhalil Oct 11, 2026
e2366c6
test: keep filename escaping regression concise
jabrailkhalil Oct 12, 2026
a06da72
Merge branch 'main' into fix/dot-source-filenames
aalexand Oct 12, 2026
3dda392
Merge branch 'main' into fix/dot-source-filenames
aalexand Oct 12, 2026
dacfc9e
Merge branch 'main' into fix/dot-source-filenames
aalexand Oct 13, 2026
37811fb
Merge branch 'main' into fix/dot-source-filenames
aalexand Oct 21, 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
2 changes: 1 addition & 1 deletion internal/graph/dotgraph.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ func multilinePrintableName(info *NodeInfo) string {
infoCopy.Name = strings.ReplaceAll(infoCopy.Name, "[...]", "[…]")
infoCopy.Name = strings.ReplaceAll(infoCopy.Name, ".", `\n`)
if infoCopy.File != "" {
infoCopy.File = filepath.Base(infoCopy.File)
infoCopy.File = escapeForDot(filepath.Base(infoCopy.File))
}
return strings.Join(infoCopy.NameComponents(), `\n`) + `\n`
}
Expand Down
2 changes: 1 addition & 1 deletion internal/graph/dotgraph_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func TestComposeWithStandardGraphAndURL(t *testing.T) {
func TestComposeWithNamesThatNeedEscaping(t *testing.T) {
g := baseGraph()
a, c := baseAttrsAndConfig()
g.Nodes[0].Info = NodeInfo{Name: `var"src"`}
g.Nodes[0].Info = NodeInfo{Name: `var"src"`, File: `src/file"name.cc`, Lineno: 10, Columnno: 2}
g.Nodes[1].Info = NodeInfo{Name: `var"#dest#"`}

var buf bytes.Buffer
Expand Down
4 changes: 2 additions & 2 deletions internal/graph/testdata/compose7.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
digraph "testtitle" {
node [style=filled fillcolor="#f8f8f8"]
subgraph cluster_L { "label1" [shape=box fontsize=16 label="label1\llabel2\llabel3: \"foo\"\l" tooltip="testtitle"] }
N1 [label="var\"src\"\n10 (10.00%)\nof 25 (25.00%)" id="node1" fontsize=22 shape=box tooltip="var\"src\" (25)" color="#b23c00" fillcolor="#edddd5"]
N1 [label="var\"src\"\nfile\"name.cc:10:2\n10 (10.00%)\nof 25 (25.00%)" id="node1" fontsize=22 shape=box tooltip="var\"src\" src/file\"name.cc:10:2 (25)" color="#b23c00" fillcolor="#edddd5"]
N2 [label="var\"#dest#\"\n15 (15.00%)\nof 25 (25.00%)" id="node2" fontsize=24 shape=box tooltip="var\"#dest#\" (25)" color="#b23c00" fillcolor="#edddd5"]
N1 -> N2 [label=" 10" weight=11 color="#b28559" tooltip="var\"src\" -> var\"#dest#\" (10)" labeltooltip="var\"src\" -> var\"#dest#\" (10)"]
N1 -> N2 [label=" 10" weight=11 color="#b28559" tooltip="var\"src\" src/file\"name.cc:10:2 -> var\"#dest#\" (10)" labeltooltip="var\"src\" src/file\"name.cc:10:2 -> var\"#dest#\" (10)"]
}
Loading