From 77bc9bdf8012281d580f12c0d727dc85e7dabee8 Mon Sep 17 00:00:00 2001
From: Josh Davis <josh@joshldavis.com>
Date: Sat, 29 Mar 2014 16:28:00 -0500
Subject: [PATCH 1/7] Add support for rnoweb filetype

Rnoweb is a filetype that combines LaTeX and R. It's used by systems like Sweave and Knitr.
---
 UltiSnips/rnoweb.snippets | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 UltiSnips/rnoweb.snippets

diff --git a/UltiSnips/rnoweb.snippets b/UltiSnips/rnoweb.snippets
new file mode 100644
index 000000000..37eece620
--- /dev/null
+++ b/UltiSnips/rnoweb.snippets
@@ -0,0 +1,3 @@
+priority -50
+
+extends tex

From 53f8dd5a7ad3acc4f3e7a6c87e9936a1905a3890 Mon Sep 17 00:00:00 2001
From: Josh Davis <josh@joshldavis.com>
Date: Sat, 29 Mar 2014 16:46:23 -0500
Subject: [PATCH 2/7] Add in r.snippets file

I converted these over from the snipMate r.snippets in the snippets/ directory and removed some ones.
---
 UltiSnips/r.snippets | 136 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 136 insertions(+)
 create mode 100644 UltiSnips/r.snippets

diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
new file mode 100644
index 000000000..bbfbaaa68
--- /dev/null
+++ b/UltiSnips/r.snippets
@@ -0,0 +1,136 @@
+snippet #! "Hashbang for Rscript"
+#!/usr/bin/env Rscript
+endsnippet
+
+# includes
+snippet lib "Import a library"
+library(${0:package})
+endsnippet
+
+snippet req "Require a file"
+require(${0:package})
+endsnippet
+
+snippet source "Source a file"
+source('${0:file}')
+endsnippet
+
+# conditionals
+snippet if "If statement"
+if (${1:condition}) {
+	${0}
+}
+endsnippet
+
+snippet el "Else statement"
+else {
+	${0}
+}
+endsnippet
+
+snippet ei "Else-If statement"
+else if (${1:condition}) {
+	${0}
+}
+endsnippet
+
+# functions
+snippet fun "Function definition"
+${1:name} = function (${2:variables}) {
+	${0}
+}
+endsnippet
+
+snippet ret "Return call"
+return(${0})
+endsnippet
+
+# dataframes, lists, etc
+snippet df "Data frame"
+${1:name}[${2:rows}, ${0:cols}]
+endsnippet
+
+snippet c "C function"
+c(${0:items})
+endsnippet
+
+snippet li "List function"
+list(${0:items})
+endsnippet
+
+snippet mat "Matrix function"
+matrix(${1:data}, nrow=${2:rows}, ncol=${0:cols})
+endsnippet
+
+# apply functions
+snippet apply "Apply function"
+apply(${1:array}, ${2:margin}, ${0:function})
+endsnippet
+
+snippet lapply "lapply function"
+lapply(${1:list}, ${0:function})
+endsnippet
+
+snippet sapply "sapply function"
+lapply(${1:list}, ${0:function})
+endsnippet
+
+snippet vapply "vapply function"
+vapply(${1:list}, ${2:function}, ${0:type})
+endsnippet
+
+snippet mapply "mapply function"
+mapply(${1:function}, ${0:...})
+endsnippet
+
+snippet tapply "tapply function"
+tapply(${1:vector}, ${2:index}, ${0:function})
+endsnippet
+
+snippet rapply "rapply function"
+rapply(${1:list}, ${0:function})
+endsnippet
+
+# plot functions
+snippet pl "Plot function"
+plot(${1:x}, ${0:y})
+endsnippet
+
+snippet ggp "ggplot2 plot"
+ggplot(${1:data}, aes(${0:aesthetics}))
+endsnippet
+
+snippet img "Output an image"
+${1:(jpeg,bmp,png,tiff)}(filename="${2:filename}", width=${3}, height=${4}, unit="${5}")
+${0:plot}
+dev.off()
+endsnippet
+
+# statistical test functions
+snippet fis "Fisher test"
+fisher.test(${1:x}, ${0:y})
+endsnippet
+
+snippet chi "Chi Squared test"
+chisq.test(${1:x}, ${0:y})
+endsnippet
+
+snippet tt "t-test"
+t.test(${1:x}, ${0:y})
+endsnippet
+
+snippet wil "Wilcox test"
+wilcox.test(${1:x}, ${0:y})
+endsnippet
+
+snippet cor "Correlation test"
+cor.test(${1:x}, ${0:y})
+endsnippet
+
+snippet fte "FTE test"
+var.test(${1:x}, ${0:y})
+endsnippet
+
+snippet kvt "KV test"
+kv.test(${1:x}, ${0:y})
+endsnippet

From 55887f0db48c5f44afdcd76841aaf246b169a75e Mon Sep 17 00:00:00 2001
From: Josh Davis <josh@joshldavis.com>
Date: Sat, 29 Mar 2014 16:52:21 -0500
Subject: [PATCH 3/7] Add R snippets to Rnoweb

---
 UltiSnips/rnoweb.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/rnoweb.snippets b/UltiSnips/rnoweb.snippets
index 37eece620..773b9aa9d 100644
--- a/UltiSnips/rnoweb.snippets
+++ b/UltiSnips/rnoweb.snippets
@@ -1,3 +1,3 @@
 priority -50
 
-extends tex
+extends tex, r

From bd8ef3d11053562632dde8804f7b4d0ac65929db Mon Sep 17 00:00:00 2001
From: Josh Davis <josh@joshldavis.com>
Date: Sun, 30 Mar 2014 01:04:00 -0500
Subject: [PATCH 4/7] Tidy up some parts of r.snippets

---
 UltiSnips/r.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
index bbfbaaa68..5fafb3c06 100644
--- a/UltiSnips/r.snippets
+++ b/UltiSnips/r.snippets
@@ -36,7 +36,7 @@ endsnippet
 
 # functions
 snippet fun "Function definition"
-${1:name} = function (${2:variables}) {
+${1:name} <- function (${2:variables}) {
 	${0}
 }
 endsnippet
@@ -59,7 +59,7 @@ list(${0:items})
 endsnippet
 
 snippet mat "Matrix function"
-matrix(${1:data}, nrow=${2:rows}, ncol=${0:cols})
+matrix(${1:data}, nrow = ${2:rows}, ncol = ${0:cols})
 endsnippet
 
 # apply functions
@@ -88,8 +88,8 @@ tapply(${1:vector}, ${2:index}, ${0:function})
 endsnippet
 
 snippet rapply "rapply function"
-rapply(${1:list}, ${0:function})
 endsnippet
+rapply(${1:list}, ${0:function})
 
 # plot functions
 snippet pl "Plot function"
@@ -101,7 +101,7 @@ ggplot(${1:data}, aes(${0:aesthetics}))
 endsnippet
 
 snippet img "Output an image"
-${1:(jpeg,bmp,png,tiff)}(filename="${2:filename}", width=${3}, height=${4}, unit="${5}")
+${1:(jpeg,bmp,png,tiff)}(filename = "${2:filename}", width = ${3}, height = ${4}, unit = "${5}")
 ${0:plot}
 dev.off()
 endsnippet

From d1f23164d514b095f1a090b742c48efc9405091d Mon Sep 17 00:00:00 2001
From: Josh Davis <josh@joshldavis.com>
Date: Sun, 30 Mar 2014 11:39:03 -0500
Subject: [PATCH 5/7] Add a few more snippets, fix errors as per #332

Hopefully this looks better, @SirVer!
---
 UltiSnips/r.snippets | 92 +++++++++++++++++++++++++-------------------
 1 file changed, 53 insertions(+), 39 deletions(-)

diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
index 5fafb3c06..625ed642e 100644
--- a/UltiSnips/r.snippets
+++ b/UltiSnips/r.snippets
@@ -1,69 +1,91 @@
-snippet #! "Hashbang for Rscript"
+priority -50
+
+snippet #! "Hashbang for Rscript (#!)" b
 #!/usr/bin/env Rscript
 endsnippet
 
-# includes
-snippet lib "Import a library"
+snippet lib "Import a library (lib)"
 library(${0:package})
 endsnippet
 
-snippet req "Require a file"
+snippet req "Require a file (req)"
 require(${0:package})
 endsnippet
 
-snippet source "Source a file"
+snippet source "Source a file (source)"
 source('${0:file}')
 endsnippet
 
-# conditionals
-snippet if "If statement"
-if (${1:condition}) {
+snippet if "If statement (if)"
+if (${1}) {
 	${0}
 }
 endsnippet
 
-snippet el "Else statement"
+snippet eif "Else-If statement (eif)"
+else if (${1}) {
+	${0}
+}
+
+snippet el "Else statement (el)"
 else {
 	${0}
 }
 endsnippet
 
-snippet ei "Else-If statement"
-else if (${1:condition}) {
+snippet eif "Else-If statement (eif)"
+else if (${1}) {
 	${0}
 }
 endsnippet
 
-# functions
-snippet fun "Function definition"
-${1:name} <- function (${2:variables}) {
+snippet ife "if .. else (ife)"
+if (${1}) {
+	${2}
+} else {
+	${3}
+}
+endsnippet
+
+snippet wh "while loop (wh)"
+while(${1}) {
+	${2}
+}
+endsnippet
+
+snippet for "for loop (for)"
+for ({${1:item} in ${2:list}) {
+	${3}
+}
+endsnippet
+
+snippet fun "Function definition (fun)"
+${1:name} <- function (${2}) {
 	${0}
 }
 endsnippet
 
-snippet ret "Return call"
+snippet ret "Return call (ret)"
 return(${0})
 endsnippet
 
-# dataframes, lists, etc
-snippet df "Data frame"
+snippet df "Data frame (df)"
 ${1:name}[${2:rows}, ${0:cols}]
 endsnippet
 
-snippet c "C function"
+snippet c "c function (c)"
 c(${0:items})
 endsnippet
 
-snippet li "List function"
+snippet li "list function (li)"
 list(${0:items})
 endsnippet
 
-snippet mat "Matrix function"
+snippet mat "matrix function (mat)"
 matrix(${1:data}, nrow = ${2:rows}, ncol = ${0:cols})
 endsnippet
 
-# apply functions
-snippet apply "Apply function"
+snippet apply "apply function"
 apply(${1:array}, ${2:margin}, ${0:function})
 endsnippet
 
@@ -91,46 +113,38 @@ snippet rapply "rapply function"
 endsnippet
 rapply(${1:list}, ${0:function})
 
-# plot functions
-snippet pl "Plot function"
+snippet pl "Plot function (pl)"
 plot(${1:x}, ${0:y})
 endsnippet
 
-snippet ggp "ggplot2 plot"
+snippet ggp "ggplot2 plot (ggp)"
 ggplot(${1:data}, aes(${0:aesthetics}))
 endsnippet
 
-snippet img "Output an image"
-${1:(jpeg,bmp,png,tiff)}(filename = "${2:filename}", width = ${3}, height = ${4}, unit = "${5}")
-${0:plot}
-dev.off()
-endsnippet
-
-# statistical test functions
-snippet fis "Fisher test"
+snippet fis "Fisher test (fis)"
 fisher.test(${1:x}, ${0:y})
 endsnippet
 
-snippet chi "Chi Squared test"
+snippet chi "Chi Squared test (chi)"
 chisq.test(${1:x}, ${0:y})
 endsnippet
 
-snippet tt "t-test"
+snippet tt "t-test (tt)"
 t.test(${1:x}, ${0:y})
 endsnippet
 
-snippet wil "Wilcox test"
+snippet wil "Wilcox test (wil)"
 wilcox.test(${1:x}, ${0:y})
 endsnippet
 
-snippet cor "Correlation test"
+snippet cor "Correlation test (cor)"
 cor.test(${1:x}, ${0:y})
 endsnippet
 
-snippet fte "FTE test"
+snippet fte "FTE test (fte)"
 var.test(${1:x}, ${0:y})
 endsnippet
 
-snippet kvt "KV test"
+snippet kvt "KV test (kvt)"
 kv.test(${1:x}, ${0:y})
 endsnippet

From 6b5d7d3377bd464676387ae28c59d80cfee6e7f0 Mon Sep 17 00:00:00 2001
From: Josh Davis <josh@joshldavis.com>
Date: Sun, 30 Mar 2014 15:32:13 -0500
Subject: [PATCH 6/7] Remove duplicate snippet

---
 UltiSnips/r.snippets | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
index 625ed642e..ec8ee91bf 100644
--- a/UltiSnips/r.snippets
+++ b/UltiSnips/r.snippets
@@ -33,12 +33,6 @@ else {
 }
 endsnippet
 
-snippet eif "Else-If statement (eif)"
-else if (${1}) {
-	${0}
-}
-endsnippet
-
 snippet ife "if .. else (ife)"
 if (${1}) {
 	${2}

From 8c7bb5d4aa5c4c4f5e7ca9c2d7e3ba07a9837bec Mon Sep 17 00:00:00 2001
From: Josh Davis <josh@joshldavis.com>
Date: Mon, 31 Mar 2014 21:11:47 -0500
Subject: [PATCH 7/7] Remove trigger from the end of the description

---
 UltiSnips/r.snippets | 48 ++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
index ec8ee91bf..771450f75 100644
--- a/UltiSnips/r.snippets
+++ b/UltiSnips/r.snippets
@@ -4,36 +4,36 @@ snippet #! "Hashbang for Rscript (#!)" b
 #!/usr/bin/env Rscript
 endsnippet
 
-snippet lib "Import a library (lib)"
+snippet lib "Import a library"
 library(${0:package})
 endsnippet
 
-snippet req "Require a file (req)"
+snippet req "Require a file"
 require(${0:package})
 endsnippet
 
-snippet source "Source a file (source)"
+snippet source "Source a file"
 source('${0:file}')
 endsnippet
 
-snippet if "If statement (if)"
+snippet if "If statement"
 if (${1}) {
 	${0}
 }
 endsnippet
 
-snippet eif "Else-If statement (eif)"
+snippet eif "Else-If statement"
 else if (${1}) {
 	${0}
 }
 
-snippet el "Else statement (el)"
+snippet el "Else statement"
 else {
 	${0}
 }
 endsnippet
 
-snippet ife "if .. else (ife)"
+snippet ife "if .. else"
 if (${1}) {
 	${2}
 } else {
@@ -41,41 +41,41 @@ if (${1}) {
 }
 endsnippet
 
-snippet wh "while loop (wh)"
+snippet wh "while loop"
 while(${1}) {
 	${2}
 }
 endsnippet
 
-snippet for "for loop (for)"
+snippet for "for loop"
 for ({${1:item} in ${2:list}) {
 	${3}
 }
 endsnippet
 
-snippet fun "Function definition (fun)"
+snippet fun "Function definition"
 ${1:name} <- function (${2}) {
 	${0}
 }
 endsnippet
 
-snippet ret "Return call (ret)"
+snippet ret "Return call"
 return(${0})
 endsnippet
 
-snippet df "Data frame (df)"
+snippet df "Data frame"
 ${1:name}[${2:rows}, ${0:cols}]
 endsnippet
 
-snippet c "c function (c)"
+snippet c "c function"
 c(${0:items})
 endsnippet
 
-snippet li "list function (li)"
+snippet li "list function"
 list(${0:items})
 endsnippet
 
-snippet mat "matrix function (mat)"
+snippet mat "matrix function"
 matrix(${1:data}, nrow = ${2:rows}, ncol = ${0:cols})
 endsnippet
 
@@ -107,38 +107,38 @@ snippet rapply "rapply function"
 endsnippet
 rapply(${1:list}, ${0:function})
 
-snippet pl "Plot function (pl)"
+snippet pl "Plot function"
 plot(${1:x}, ${0:y})
 endsnippet
 
-snippet ggp "ggplot2 plot (ggp)"
+snippet ggp "ggplot2 plot"
 ggplot(${1:data}, aes(${0:aesthetics}))
 endsnippet
 
-snippet fis "Fisher test (fis)"
+snippet fis "Fisher test"
 fisher.test(${1:x}, ${0:y})
 endsnippet
 
-snippet chi "Chi Squared test (chi)"
+snippet chi "Chi Squared test"
 chisq.test(${1:x}, ${0:y})
 endsnippet
 
-snippet tt "t-test (tt)"
+snippet tt "t-test"
 t.test(${1:x}, ${0:y})
 endsnippet
 
-snippet wil "Wilcox test (wil)"
+snippet wil "Wilcox test"
 wilcox.test(${1:x}, ${0:y})
 endsnippet
 
-snippet cor "Correlation test (cor)"
+snippet cor "Correlation test"
 cor.test(${1:x}, ${0:y})
 endsnippet
 
-snippet fte "FTE test (fte)"
+snippet fte "FTE test"
 var.test(${1:x}, ${0:y})
 endsnippet
 
-snippet kvt "KV test (kvt)"
+snippet kvt "KV test"
 kv.test(${1:x}, ${0:y})
 endsnippet