Skip to content

Handle errors in getAliases.R #1334

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
renkun-ken merged 2 commits into from
Mar 24, 2023
Merged

Handle errors in getAliases.R #1334

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
540b86e
Update getAliases.R
csaybar Mar 21, 2023
26af9cc
Report error
renkun-ken Mar 24, 2023
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
11 changes: 10 additions & 1 deletion R/help/getAliases.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,19 @@ ret <- lapply(rownames(ip), function(row) {
aliases = NULL
)
if (file.exists(filename)) {
info[["aliases"]] <- as.list(readRDS(filename))
res <- tryCatch(
expr = as.list(readRDS(filename)),
error = conditionMessage
)
if (is.list(res)) {
info$aliases <- res
} else {
info$error <- res
}
}
info
})

names(ret) <- rownames(ip)

lim <- Sys.getenv("VSCR_LIM")
Expand Down
16 changes: 12 additions & 4 deletions src/helpViewer/helpProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,8 @@ interface PackageAliases {
aliasFile?: string;
aliases?: {
[key: string]: string;
}
},
error?: string
}
interface AllPackageAliases {
[key: string]: PackageAliases
Expand Down Expand Up @@ -221,9 +222,16 @@ export class AliasProvider {

// flatten aliases into one list:
const allAliases: rHelp.Alias[] = [];
for(const pkg in allPackageAliases){
const pkgName = allPackageAliases[pkg].package || pkg;
const pkgAliases = allPackageAliases[pkg].aliases || {};
for (const pkg in allPackageAliases) {
const item = allPackageAliases[pkg];
const pkgName = item.package || pkg;

if (item.error) {
void window.showErrorMessage(`An error occurred while reading the aliases file for package ${pkgName}: ${item.error}. The package files may be corrupted. Try reinstalling the package.`);
continue;
}

const pkgAliases = item.aliases || {};
for(const fncName in pkgAliases){
allAliases.push({
name: pkgAliases[fncName],
Expand Down