Merge branch 'oxfist/master'

CHANGELOG.rst

@@ -49,6 +49,11 @@ Added
    - `interpolation` (literal string interpolation)
    - `list_pattern`
    - `tuple_pattern`
+- Missing patterns for R:
+   -  `for`
+   -  `while`
+   -  `switch`
+   -  `function_definition`
 - Missing patterns for Rust:
    - `array_type`
 - Missing patterns for Starlark:

queries/r/rainbow-delimiters.scm

@@ -14,6 +14,23 @@
   "(" @delimiter
   ")" @delimiter @sentinel) @container
 
+(for
+  "(" @delimiter
+  ")" @delimiter @sentinel) @container
+
+(while
+  "(" @delimiter
+  ")" @delimiter @sentinel) @container
+
+(switch
+  "(" @delimiter
+  ")" @delimiter @sentinel) @container
+
+(function_definition
+  (formal_parameters
+    "(" @delimiter
+    ")" @delimiter @sentinel)) @container
+
 (brace_list
   "{" @delimiter
   "}" @delimiter @sentinel) @container

test/highlight/r/regular.r

@@ -12,3 +12,24 @@ if (var > 5) {
         print(paste(var, "is less than 10"))
     }
 }
+
+foobar <- function(num) {
+    for (i in 1:5) {
+      print(i)
+    }
+
+    while (TRUE) {
+        break
+    }
+
+    x <- "a"
+    v <- switch(x, "a"="apple", "b"="banana", "c"="cherry")
+
+    if (num > 0) {
+        return("Positive")
+    } else if (num < 0) {
+        return("Negative")
+    } else {
+        return("Zero")
+    }
+}