hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move TransformPath into FileLabelFor

Browse Source 
This way we don't have to remember to transform it at all call sites.
This commit is contained in:
Owen Mansel-Chan
2025-11-14 10:24:22 +00:00
parent 8668473916
commit 59ac2d3d3e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go/extractor/extractor.go
View File

@@ -815,12 +815,12 @@ func (extraction *Extraction) extractFileInfo(tw *trap.Writer, file string, isDu
displayPath = rawPath displayPath = rawPath
} }
if i == len(components)-1 { if i == len(components)-1 {
lbl := tw.Labeler.FileLabelFor(path) lbl := tw.Labeler.FileLabelFor(file)
dbscheme.FilesTable.Emit(tw, lbl, displayPath) dbscheme.FilesTable.Emit(tw, lbl, displayPath)
dbscheme.ContainerParentTable.Emit(tw, parentLbl, lbl) dbscheme.ContainerParentTable.Emit(tw, parentLbl, lbl)
dbscheme.HasLocationTable.Emit(tw, lbl, emitLocation(tw, lbl, 0, 0, 0, 0)) dbscheme.HasLocationTable.Emit(tw, lbl, emitLocation(tw, lbl, 0, 0, 0, 0))
extraction.Lock.Lock() extraction.Lock.Lock()
slbl := extraction.StatWriter.Labeler.FileLabelFor(path) slbl := extraction.StatWriter.Labeler.FileLabelFor(file)
if !isDummy { if !isDummy {
dbscheme.CompilationCompilingFilesTable.Emit(extraction.StatWriter, extraction.Label, extraction.GetFileIdx(file), slbl) dbscheme.CompilationCompilingFilesTable.Emit(extraction.StatWriter, extraction.Label, extraction.GetFileIdx(file), slbl)
} }

4
go/extractor/trap/labels.go
View File

@@ -69,14 +69,14 @@ func (l *Labeler) GlobalID(key string) Label {
// FileLabel returns the label for a file with path `path`. // FileLabel returns the label for a file with path `path`.
func (l *Labeler) FileLabel() Label { func (l *Labeler) FileLabel() Label {
if l.fileLabel == InvalidLabel { if l.fileLabel == InvalidLabel {
l.fileLabel = l.FileLabelFor(srcarchive.TransformPath(l.tw.path)) l.fileLabel = l.FileLabelFor(l.tw.path)
} }
return l.fileLabel return l.fileLabel
} }
// FileLabelFor returns the label for the file for which the trap writer `tw` is associated // FileLabelFor returns the label for the file for which the trap writer `tw` is associated
func (l *Labeler) FileLabelFor(path string) Label { func (l *Labeler) FileLabelFor(path string) Label {
return l.GlobalID(util.EscapeTrapSpecialChars(filepath.ToSlash(path)) + ";sourcefile") return l.GlobalID(util.EscapeTrapSpecialChars(filepath.ToSlash(srcarchive.TransformPath(path))) + ";sourcefile")
} }
// LocalID associates a label with the given AST node `nd` and returns it // LocalID associates a label with the given AST node `nd` and returns it