Merge branch 'r-lib:main' into patch-1

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,126 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at codeofconduct@posit.co. 
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+<https://www.contributor-covenant.org/version/2/1/code_of_conduct.html>.
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][https://github.com/mozilla/inclusion].
+
+For answers to common questions about this code of conduct, see the FAQ at
+<https://www.contributor-covenant.org/faq>. Translations are available at <https://www.contributor-covenant.org/translations>.
+
+[homepage]: https://www.contributor-covenant.org

.github/SUPPORT.md

@@ -57,7 +57,7 @@ Armed with your reprex, the next step is to figure out [where to ask](https://ww
     problem _is_ a bug or a feature request, you can easily return here and 
     report it. 
 
-Before opening a new issue, be sure to [search issues and pull requests](https://github.com/tidyverse/roxygen2/issues) to make sure the 
+Before opening a new issue, be sure to [search issues and pull requests](https://github.com/r-lib/roxygen2/issues) to make sure the 
 bug hasn't been reported and/or already fixed in the development version. By 
 default, the search will be pre-populated with `is:issue is:open`. You can 
 [edit the qualifiers](https://help.github.com/articles/searching-issues-and-pull-requests/) 

.github/workflows/R-CMD-check.yaml

@@ -22,30 +22,29 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest,   r: 'release'}
+          - {os: macos-latest,   r: 'release'}
 
           - {os: windows-latest, r: 'release'}
           # Use 3.6 to trigger usage of RTools35
           - {os: windows-latest, r: '3.6'}
+          # use 4.1 to check with rtools40's older compiler
+          - {os: windows-latest, r: '4.1'}
 
-          # Use older ubuntu to maximise backward compatibility
-          - {os: ubuntu-18.04,   r: 'devel', http-user-agent: 'release'}
-          - {os: ubuntu-18.04,   r: 'release'}
-          - {os: ubuntu-18.04,   r: 'oldrel-1'}
-          - {os: ubuntu-18.04,   r: 'oldrel-2'}
-          - {os: ubuntu-18.04,   r: 'oldrel-3'}
-          - {os: ubuntu-18.04,   r: 'oldrel-4'}
+          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-latest,   r: 'release'}
+          - {os: ubuntu-latest,   r: 'oldrel-1'}
+          - {os: ubuntu-latest,   r: 'oldrel-2'}
+          - {os: ubuntu-latest,   r: 'oldrel-3'}
+          - {os: ubuntu-latest,   r: 'oldrel-4'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: r-lib/actions/setup-pandoc@v2
-        with:
-          pandoc-version: 2.17.1
 
       - uses: r-lib/actions/setup-r@v2
         with:

.github/workflows/pkgdown.yaml

@@ -20,7 +20,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -39,7 +39,7 @@ jobs:
 
       - name: Deploy to GitHub pages 🚀
         if: github.event_name != 'pull_request'
-        uses: JamesIves/github-pages-deploy-action@4.1.4
+        uses: JamesIves/github-pages-deploy-action@v4.4.1
         with:
           clean: false
           branch: gh-pages

.github/workflows/pr-commands.yaml

@@ -14,7 +14,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: r-lib/actions/pr-fetch@v2
         with:
@@ -51,7 +51,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: r-lib/actions/pr-fetch@v2
         with:

.github/workflows/test-coverage.yaml

@@ -15,7 +15,7 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: r-lib/actions/setup-r@v2
         with:
@@ -27,5 +27,24 @@ jobs:
           needs: coverage
 
       - name: Test coverage
-        run: covr::codecov(quiet = FALSE)
+        run: |
+          covr::codecov(
+            quiet = FALSE,
+            clean = FALSE,
+            install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
+          )
         shell: Rscript {0}
+
+      - name: Show testthat output
+        if: always()
+        run: |
+          ## --------------------------------------------------------------------
+          find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
+        shell: bash
+
+      - name: Upload test results
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage-test-failures
+          path: ${{ runner.temp }}/package

DESCRIPTION

@@ -1,13 +1,13 @@
 Package: roxygen2
 Title: In-Line Documentation for R
-Version: 7.2.1.9000
+Version: 7.2.3.9000
 Authors@R: c(
-    person("Hadley", "Wickham", , "hadley@rstudio.com", role = c("aut", "cre", "cph"),
+    person("Hadley", "Wickham", , "hadley@posit.co", role = c("aut", "cre", "cph"),
            comment = c(ORCID = "0000-0003-4757-117X")),
     person("Peter", "Danenberg", , "pcd@roxygen.org", role = c("aut", "cph")),
     person("Gábor", "Csárdi", , "csardi.gabor@gmail.com", role = "aut"),
     person("Manuel", "Eugster", role = c("aut", "cph")),
-    person("RStudio", role = c("cph", "fnd"))
+    person("Posit Software, PBC", role = c("cph", "fnd"))
   )
 Description: Generate your Rd documentation, 'NAMESPACE' file, and
     collation field using specially formatted comments. Writing
@@ -24,13 +24,12 @@ Imports:
     cli (>= 3.3.0),
     commonmark,
     desc (>= 1.2.0),
-    digest,
     knitr,
     methods,
     pkgload (>= 1.0.2),
-    purrr (>= 0.3.3),
+    purrr (>= 1.0.0),
     R6 (>= 2.1.2),
-    rlang (>= 1.0.0),
+    rlang (>= 1.0.6),
     stringi,
     stringr (>= 1.0.0),
     utils,
@@ -40,7 +39,7 @@ Suggests:
     covr,
     R.methodsS3,
     R.oo,
-    rmarkdown,
+    rmarkdown (>= 2.16),
     testthat (>= 3.1.2),
     yaml
 LinkingTo: 
@@ -52,5 +51,5 @@ Config/testthat/edition: 3
 Encoding: UTF-8
 Language: en-GB
 Roxygen: list(markdown = TRUE, load = "installed")
-RoxygenNote: 7.2.0.9000
+RoxygenNote: 7.2.2.9000
 SystemRequirements: C++11

NEWS.md

@@ -1,5 +1,20 @@
 # roxygen2 (development version)
 
+# roxygen2 7.2.3
+
+* roxygen2 now supports HTML blocks in markdown. They are only included
+  in the HTML manual. They can also be produced as the output of code
+  chunks.
+
+* Improved support for RStudio IDE.
+
+# roxygen2 7.2.2
+
+* `@includeRmd` calls `local_reproducible_output()` to make code run in
+  included `.Rmd`s more consistent with other sources (#1431).
+
+* Fix duplicated argument in `roxy_block()` to avoid CRAN removal.
+
 # roxygen2 7.2.1
 
 ## Tags

R/block.R

@@ -17,7 +17,7 @@
 #' @param object Optionally, the object associated with the block, found
 #'   by inspecting/evaluating `call`.
 #' @param block A `roxy_block` to manipulate.
-#' @param tag,tags Either a single tag name, or a character vector of tag names.
+#' @param tag A single tag name.
 #' @export
 #' @keywords internal
 #' @examples

R/markdown.R

@@ -491,20 +491,17 @@ mdxml_heading <- function(xml, state) {
 }
 
 mdxml_html_block <- function(xml, state) {
-  if (state$tag$tag != "includeRmd") {
-    return(mdxml_unsupported(xml, state$tag, "HTML blocks"))
-  }
+  txt <- xml_text(xml)
+  txt <- gsub("}", "\\}", txt, fixed = TRUE)
+  txt <- gsub("{", "\\{", txt, fixed = TRUE)
   paste0(
     "\\if{html}{\\out{\n",
-    gsub("}", "\\}", xml_text(xml), fixed = TRUE),
+    txt,
     "}}\n"
   )
 }
 
 mdxml_html_inline <- function(xml, state) {
-  if (state$tag$tag != "includeRmd") {
-    return(mdxml_unsupported(xml, state$tag, "inline HTML components"))
-  }
   paste0(
     "\\if{html}{\\out{",
     gsub("}", "\\}", xml_text(xml), fixed = TRUE),

R/namespace.R

@@ -326,7 +326,7 @@ namespace_exports <- function(path) {
     return(character())
   }
 
-  parsed <- parse(path, keep.source = TRUE)
+  parsed <- as.list(parse(path, keep.source = TRUE))
   is_import <- function(x) is_call(x, c("import", "importFrom", "importClassesFrom", "importMethodsFrom", "useDynLib"))
   export_lines <- attr(parsed, "srcref")[!map_lgl(parsed, is_import)]
   unlist(lapply(export_lines, as.character))

R/object-from-call.R

@@ -6,7 +6,7 @@ object_from_call <- function(call, env, block, file) {
       parser_data(call, env, file)
     }
   } else if (is.call(call)) {
-    call <- call_standardise(call, env)
+    call <- call_match(call, eval(call[[1]], env))
     name <- deparse(call[[1]])
     switch(name,
       "=" = ,