diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-06-17 10:44:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-06-17 10:44:39 -0700 |
| commit | 01148cafa4767be5fafcc315c6d8569c0a4e5414 (patch) | |
| tree | 0bbc331d42f7de72a8200c4cc3bb10dd28508eec | |
| parent | Merge branch 'ds/path-walk-2' (diff) | |
| parent | userdiff: add support for R programming language (diff) | |
| download | git-01148cafa4767be5fafcc315c6d8569c0a4e5414.tar.gz git-01148cafa4767be5fafcc315c6d8569c0a4e5414.zip | |
Merge branch 'rc/userdiff-r'
Userdiff patterns for the R language.
* rc/userdiff-r:
userdiff: add support for R programming language
| -rw-r--r-- | t/t4018/r-indent | 6 | ||||
| -rw-r--r-- | t/t4018/r-indent-nested | 10 | ||||
| -rw-r--r-- | t/t4018/r-noindent | 6 | ||||
| -rw-r--r-- | userdiff.c | 4 |
4 files changed, 26 insertions, 0 deletions
diff --git a/t/t4018/r-indent b/t/t4018/r-indent new file mode 100644 index 0000000000..9df440f2a4 --- /dev/null +++ b/t/t4018/r-indent @@ -0,0 +1,6 @@ +RIGHT <- function(a, b) { + c = mean(a, b) + d = c + 2 + ChangeMe() + return (d) +} diff --git a/t/t4018/r-indent-nested b/t/t4018/r-indent-nested new file mode 100644 index 0000000000..30412e6c79 --- /dev/null +++ b/t/t4018/r-indent-nested @@ -0,0 +1,10 @@ +LEFT = function(a, b) { + c = mean(a, b) + RIGHT = function(d, e) { + f = var(d, e) + g = f + 1 + ChangeMe() + return (g) + } + return (RIGHT(2, 3)) +} diff --git a/t/t4018/r-noindent b/t/t4018/r-noindent new file mode 100644 index 0000000000..6d9b01ffe3 --- /dev/null +++ b/t/t4018/r-noindent @@ -0,0 +1,6 @@ +RIGHT <- function(a, b) { +c = mean(a, b) +d = c + 2 +ChangeMe() +return (c) +} diff --git a/userdiff.c b/userdiff.c index 05776ccd10..fe710a68bf 100644 --- a/userdiff.c +++ b/userdiff.c @@ -327,6 +327,10 @@ PATTERNS("python", "|[-+0-9.e]+[jJlL]?|0[xX]?[0-9a-fA-F]+[lL]?" "|[-+*/<>%&^|=!]=|//=?|<<=?|>>=?|\\*\\*=?"), /* -- */ +PATTERNS("r", + "^[ \t]*([a-zA-z][a-zA-Z0-9_.]*[ \t]*(<-|=)[ \t]*function.*)$", + /* -- */ + "[^ \t]+"), PATTERNS("ruby", "^[ \t]*((class|module|def)[ \t].*)$", /* -- */ |