@@ -651,29 +651,23 @@ checkSelectorNames <- function(selectors){
651651 invalid.chars <- c(" #" , " !" , " @" , " $" , " %" , " ^" , " &" , " *" , " =" , " |" , " \\ " , " /" , " '" , " \" " , " `" , " ?" , " <" , " >" , " (" , " )" , " [" , " ]" )
652652
653653 # # Check each selector name for invalid characters
654- has.invalid <- sapply(selector.names , function (name ) {
655- any(sapply(invalid.chars , function (char ) {
656- grepl(char , name , fixed = TRUE )
657- }))
658- })
654+ # # Check if any invalid character appears in each selector name
655+ has.invalid <- vapply(selector.names , function (name ) {
656+ any(vapply(invalid.chars , grepl , logical (1 ), x = name , fixed = TRUE ))
657+ }, logical (1 ))
659658
660659 if (any(has.invalid )){
661660 invalid.names <- selector.names [has.invalid ]
662661 # # Find which character(s) are problematic for each name
663662 problematic <- sapply(invalid.names , function (name ) {
664- found.chars <- invalid.chars [sapply(invalid.chars , function (char ) {
665- grepl(char , name , fixed = TRUE )
666- })]
663+ found.chars <- invalid.chars [sapply(invalid.chars , grepl , name , fixed = TRUE )]
667664 paste0(" '" , found.chars , " '" , collapse = " , " )
668665 })
669666
670- invalid.list <- paste0(" - '" , invalid.names , " ' contains " , problematic , collapse = " \n " )
671- error.msg <- paste0(
672- " Invalid character(s) in selector name(s). " ,
673- " Selector names cannot contain special characters that interfere with CSS selectors.\n " ,
674- " The following selector(s) contain invalid characters:\n " ,
675- invalid.list ,
676- " \n\n Please remove or replace these characters in your variable names."
667+ invalid.list <- paste(sprintf(" - '%s' contains %s" , invalid.names , problematic ), collapse = " \n " )
668+ error.msg <- sprintf(
669+ " Invalid character(s) in selector name(s). Selector names cannot contain special characters that interfere with CSS selectors.\n The following selector(s) contain invalid characters:\n %s\n\n Please remove or replace these characters in your variable names." ,
670+ invalid.list
677671 )
678672
679673 stop(error.msg )
0 commit comments