Skip to content

Commit 46b8b6c

Browse files
authored
Merge pull request #255 from r-devel/feature/fix-html-help-r-devel
Fix: Ensure VS Code uses r-devel help docs when switched with which_r
2 parents cc55318 + 252d7e3 commit 46b8b6c

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.devcontainer/devcontainer.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,16 @@
1919
"workbench.editorAssociations": {
2020
"*.md": "vscode.markdown.preview.editor"
2121
},
22-
"workbench.welcomePage.walkthroughs.openOnInstall": false
22+
"workbench.welcomePage.walkthroughs.openOnInstall": false,
23+
"r.libPaths": ["/usr/local/lib/R/site-library"]
2324
},
2425
"extensions": [
2526
"REditorSupport.r",
2627
"mads-hartmann.bash-ide-vscode",
2728
"johnstoncode.svn-scm",
2829
"ms-vscode.cpptools",
29-
"MS-vsliveshare.vsliveshare"
30+
"MS-vsliveshare.vsliveshare",
31+
"natqe.reload"
3032
]
3133
}
3234
},

docs/tutorials/contribution_workflow.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ make
6767
may skip this step while you are iterating on a bug fix or other development,
6868
until you are ready to [create a patch](./patch_update.md).
6969

70-
- To use the re-built R, simply open a new R terminal.
70+
- To use the re-built R, simply open a new R terminal. If you have made changes
71+
to the help files, click "Reload" in the VS Code status bar (bottom right) to
72+
reload your VS Code window.
7173

7274
#### 4. Cross check and Re-running Code
7375

scripts/which_r.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ which_r() {
6060
fi
6161

6262
# Update settings.json with the chosen R path
63-
updated_settings_data=$(cat "$settings_file_path" | jq --arg subdir "$selected_version" '."r.rterm.linux"=$subdir')
63+
updated_settings_data=$(cat "$settings_file_path" | jq --arg subdir "$selected_version" '."r.rterm.linux"=$subdir | ."r.rpath.linux"=$subdir')
6464
echo "$updated_settings_data" > "$settings_file_path"
6565

6666
echo "R terminal will now use version: $selected_version"
67+
echo "To update the HTML help, click \"Reload\" in the VS Code status bar (bottom right) to reload your VS Code window."
6768
}

0 commit comments

Comments
 (0)