Merge pull request #882 from lorenzwalthert/issue-881

- Fix alignment detection for quoted keys

Author: lorenzwalthert

NEWS.md

@@ -1,21 +1,11 @@
 # styler 1.6.2.9000 (Development version)
 
-* Piped function without brackets `substitute(x %>% y)` don't get `()` added
-  anymore, as this can change outcome of the code (#876).
-* Alignment detection respects stylerignore (#850).
-* Add vignette on distributing style guide (#846, #861).
-* Enable pre-commit.ci (#843).
+**API changes**
+
 * new R option `styler.cache_root` (defaulting to `"styler"`) that determines 
   the sub-directory under the {R.cache} cache directory that {styler} uses. Non-
   default caches won't be cleaned up by {styler}. We suggest `"styler-perm"` 
   (also used by {precommit}).
-* rename default branch to main (#859).
-* Fix argument name `filetype` in Example for `style_dir()` (#855).
-* ensure a trailing blank line also if the input is cached (#867).
-* Bump minimal R requirement to 3.4 in line with the [tidyverse](https://www.tidyverse.org/blog/2019/04/r-version-support/), which 
-  allowed to remove the dependency at {backports} and some exception handling.
-* Remove dependency on {xfun} (#866).
-* use pre-commit via GitHub Actions (#872).
 
 * stylerignore markers are now interpreted as regular expressions instead of 
   comments that must match exactly. This allows to specify multiple markers in 
@@ -35,6 +25,28 @@
 * the built package size has been reduced by ~50% by listing `*-in_tree` files
   in `.Rbuildignore` (#879).
 
+* Bump minimal R requirement to 3.4 in line with the [tidyverse](https://www.tidyverse.org/blog/2019/04/r-version-support/), which 
+  allowed to remove the dependency at {backports} and some exception handling.
+
+**Other changes**
+
+* Piped function without brackets `substitute(x %>% y)` don't get `()` added
+  anymore, as this can change outcome of the code (#876).
+* Alignment detection respects stylerignore (#850).
+* Unaligned expressions with quoted key (e.g. `c("x" = 2)`) are now correctly
+  detected (#881).
+* Add vignette on distributing style guide (#846, #861).
+* ensure a trailing blank line also if the input is cached (#867).
+* Fix argument name `filetype` in Example for `style_dir()` (#855).
+
+**Infrastructure**
+
+* Remove dependency on {xfun} (#866).
+* rename default branch to main (#859).
+* Enable pre-commit.ci (#843).
+* use pre-commit via GitHub Actions (#872).
+
+
 # styler 1.6.2
 
 * clean up cache files older than one week (#842).

R/detect-alignment-utils.R

@@ -80,7 +80,8 @@ alignment_col1_all_named <- function(relevant_pd_by_line) {
     if (nrow(x) < 3) {
       return(FALSE)
     }
-    identical(x$token[c(1, 3)], c("SYMBOL_SUB", "expr")) &&
+    x$token[3] == "expr" &&
+      x$token[1] %in% c("SYMBOL_SUB", "STR_CONST") &&
       x$token[2] %in% c(
         "EQ_SUB", "SPECIAL-IN", "LT", "GT", "EQ", "NE"
       )

tests/testthat/alignment/quoted-names-in.R

@@ -0,0 +1,7 @@
+df <- dplyr::rename(df,
+  "xValues" =   "Time",
+  "xUnit" = "TimeUnit",
+  "yValues"   = "simulationValues",
+  "yUnit" = "unit",
+  "yDimension"  = "dimension"
+)

tests/testthat/alignment/quoted-names-in_tree

@@ -0,0 +1,7 @@
+df <- dplyr::rename(df,
+  "xValues" = "Time",
+  "xUnit" = "TimeUnit",
+  "yValues" = "simulationValues",
+  "yUnit" = "unit",
+  "yDimension" = "dimension"
+)