[Fix emacs-ess#277] Better regex boundaries for prefixed blocks

e3bo · Nov 30, 2015 · 9cf747e · 9cf747e
1 parent a78e745
commit 9cf747e
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 1 deletion.
diff --git a/lisp/ess-r-syntax.el b/lisp/ess-r-syntax.el
@@ -280,7 +280,7 @@ into account."
              (ess-climb-block-prefix)))))))
 
 (defvar ess-prefixed-block-patterns
-  (mapcar (lambda (fun) (concat fun "\\b"))
+  (mapcar (lambda (fun) (concat fun "[ \t\n]*("))
           '("function" "if" "for" "while")))
 
 (defun ess-looking-at-prefixed-block-p (&optional call)

diff --git a/test/literate/syntax.R b/test/literate/syntax.R
@@ -36,3 +36,21 @@ text ¶# comment
 ##! (ess-climb-continuations)
 
 (¶!stuff1 || stuff2)
+
+
+##### Bare blocks
+
+### 1 ----------------------------------------------------------------
+
+function_call()
+¶
+
+##! (ess-climb-block-prefix)
+
+function_call()
+¶
+
+##! (ess-climb-block-prefix "function")
+
+function_call()
+¶
diff --git a/test/styles/C++.R b/test/styles/C++.R
@@ -465,6 +465,10 @@ fun_call(argument,
 }
 }
 
+## 22
+function_call()
+stuff
+
 
 ### Bracket indexing
 

diff --git a/test/styles/RRR+.R b/test/styles/RRR+.R
@@ -465,6 +465,10 @@ fun_call(argument,
          }
          }
 
+## 22
+function_call()
+stuff
+
 
 ### Bracket indexing
 

diff --git a/test/styles/RRR.R b/test/styles/RRR.R
@@ -465,6 +465,10 @@ fun_call(argument,
          }
 }
 
+## 22
+function_call()
+stuff
+
 
 ### Bracket indexing
 

diff --git a/test/styles/RStudio-.R b/test/styles/RStudio-.R
@@ -465,6 +465,10 @@ fun_call(argument,
   }
 }
 
+## 22
+function_call()
+stuff
+
 
 ### Bracket indexing
 

diff --git a/test/styles/misc1.R b/test/styles/misc1.R
@@ -465,6 +465,10 @@ fun_call(argument,
      }
      }
 
+## 22
+function_call()
+stuff
+
 
 ### Bracket indexing
-Original file line number
+Diff line change
@@ Expand Up / @@ -465,6 +465,10 @@ fun_call(argument, @@
     }
     }
+    ## 22
+    function_call()
+    stuff
     ### Bracket indexing
@@ Expand Down @@