Fix pluralization, "and" in zoomed tables, no parens for join methods

- abort_unknown_option: pluralize Option/Options, use commas(dquote())
  without cli "and" for option lists
- abort_table_not_zoomed: use {.code {zoomed_tables}} to get "and" before
  last item in zoomed tables list
- abort_squash_limited: use {.code} instead of {.fn} for join method names
  (no parens: left_join not left_join())
- abort_apply_filters_first: same fix, {.code {join_name}} not {.fn}

Co-authored-by: krlmlr <1741643+krlmlr@users.noreply.github.com>

Author: Copilot

R/error-helpers.R

@@ -191,14 +191,14 @@ abort_what_a_weird_object <- function(class) {
 
 abort_squash_limited <- function() {
   cli::cli_abort(
-    "{.code dm_flatten_to_tbl(.recursive = TRUE)} only supports join methods {.fn left_join}, {.fn inner_join}, {.fn full_join}.",
+    "{.code dm_flatten_to_tbl(.recursive = TRUE)} only supports join methods {.code left_join}, {.code inner_join}, {.code full_join}.",
     class = dm_error_full("squash_limited")
   )
 }
 
 abort_apply_filters_first <- function(join_name) {
   cli::cli_abort(
-    "{.fn dm_..._to_tbl} with join method {.fn {join_name}} generally wouldn't produce the correct result when filters are set. Please consider calling {.fn dm_apply_filters} first.",
+    "{.fn dm_..._to_tbl} with join method {.code {join_name}} generally wouldn't produce the correct result when filters are set. Please consider calling {.fn dm_apply_filters} first.",
     class = dm_error_txt_apply_filters_first(join_name)
   )
 }
@@ -314,7 +314,7 @@ abort_no_table_provided <- function() {
 
 abort_table_not_zoomed <- function(table_name, zoomed_tables) {
   cli::cli_abort(
-    "In {.fn pull_tbl.dm_zoomed}: Table {.code {table_name}} not zoomed, zoomed tables: {commas(tick(zoomed_tables))}.",
+    "In {.fn pull_tbl.dm_zoomed}: Table {.code {table_name}} not zoomed, zoomed tables: {.code {zoomed_tables}}.",
     class = dm_error_full("table_not_zoomed")
   )
 }

R/paste.R

@@ -348,7 +348,7 @@ dquote <- function(x) {
 abort_unknown_option <- function(options, all_options) {
   bad_options <- setdiff(options, all_options)
   cli::cli_abort(
-    "Option unknown: {.val {bad_options}}. Must be one of {.val {all_options}}.",
+    "{qty(length(bad_options))}Option{?s} unknown: {commas(dquote(bad_options))}. Must be one of {commas(dquote(all_options))}.",
     class = dm_error_full("unknown_option")
   )
 }

tests/testthat/_snaps/error-helpers.md

@@ -137,12 +137,12 @@
       abort_squash_limited()
     Condition
       Error in `abort_squash_limited()`:
-      ! `dm_flatten_to_tbl(.recursive = TRUE)` only supports join methods `left_join()`, `inner_join()`, `full_join()`.
+      ! `dm_flatten_to_tbl(.recursive = TRUE)` only supports join methods `left_join`, `inner_join`, `full_join`.
     Code
       abort_apply_filters_first("join_tightly")
     Condition
       Error in `abort_apply_filters_first()`:
-      ! `dm_..._to_tbl()` with join method `join_tightly()` generally wouldn't produce the correct result when filters are set. Please consider calling `dm_apply_filters()` first.
+      ! `dm_..._to_tbl()` with join method `join_tightly` generally wouldn't produce the correct result when filters are set. Please consider calling `dm_apply_filters()` first.
     Code
       abort_no_flatten_with_nest_join()
     Condition
@@ -206,7 +206,7 @@
       abort_table_not_zoomed("blur", c("focus_1", "focus_2"))
     Condition
       Error in `abort_table_not_zoomed()`:
-      ! In `pull_tbl.dm_zoomed()`: Table `blur` not zoomed, zoomed tables: `focus_1`, `focus_2`.
+      ! In `pull_tbl.dm_zoomed()`: Table `blur` not zoomed, zoomed tables: `focus_1` and `focus_2`.
     Code
       abort_not_pulling_multiple_zoomed()
     Condition

tests/testthat/_snaps/paste.md

@@ -312,7 +312,7 @@
       writeLines(conditionMessage(expect_error(dm_paste(dm(), options = c("bogus",
         "all", "mad")))))
     Output
-      Option unknown: "bogus" and "mad". Must be one of "all", "tables", "keys", "select", and "color".
+      Options unknown: "bogus", "mad". Must be one of "all", "tables", "keys", "select", "color".
 
 # output 2