@@ -504,20 +504,21 @@ function flatten(data::Vector, lidict::LineInfoDict)
504
504
end
505
505
506
506
const SRC_DIR = normpath (joinpath (Sys. BUILD_ROOT_PATH, " src" ))
507
- const LIB_DIR = normpath (joinpath (Sys. BUILD_ROOT_PATH, " usr" , " lib" ))
508
507
509
508
# Take a file-system path and try to form a concise representation of it
510
509
# based on the package ecosystem
511
510
function short_path (spath:: Symbol , filenamecache:: Dict{Symbol, Tuple{String,String,String}} )
512
511
return get! (filenamecache, spath) do
513
512
path = Base. fixup_stdlib_path (string (spath))
513
+ path_norm = normpath (path)
514
514
possible_base_path = normpath (joinpath (Sys. BINDIR, Base. DATAROOTDIR, " julia" , " base" , path))
515
- if startswith (path, SRC_DIR)
516
- remainder = only (split (path, SRC_DIR, keepempty= false ))
517
- return (isfile (path) ? path : " " ), " @src" , remainder
518
- elseif startswith (path, LIB_DIR)
519
- remainder = only (split (path, LIB_DIR, keepempty= false ))
520
- return (isfile (path) ? path : " " ), " @lib" , remainder
515
+ lib_dir = abspath (Sys. BINDIR, Base. LIBDIR)
516
+ if startswith (path_norm, SRC_DIR)
517
+ remainder = only (split (path_norm, SRC_DIR, keepempty= false ))
518
+ return (isfile (path_norm) ? path_norm : " " ), " @juliasrc" , remainder
519
+ elseif startswith (path_norm, lib_dir)
520
+ remainder = only (split (path_norm, lib_dir, keepempty= false ))
521
+ return (isfile (path_norm) ? path_norm : " " ), " @julialib" , remainder
521
522
elseif isabspath (path)
522
523
if ispath (path)
523
524
# try to replace the file-system prefix with a short "@Module" one,
0 commit comments