From 48e372915f26d0ce7acd5f1a21ea56c5414edcc1 Mon Sep 17 00:00:00 2001
From: Bastien <kylekatarnls@github.com>
Date: Wed, 4 Jun 2014 11:34:45 +0200
Subject: [PATCH] Ignore {} after ->

---
 src/sbp/sbp.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/sbp/sbp.php b/src/sbp/sbp.php
index 344cb0c..3e49e97 100644
--- a/src/sbp/sbp.php
+++ b/src/sbp/sbp.php
@@ -268,9 +268,9 @@ static public function isBlock(&$line, &$grouped, $iRead = 0)
 				$content = substr($content, 1);
 				$find = self::findLastBlock($content);
 				$pos = $find ?: 0;
-				return $find !== false && substr_count($content, '{', $pos) === 0;
+				return $find !== false && !preg_match('#(?<!->)\s*\{#U', substr($content, $pos));
 			}
-			return $find !== false && substr_count($line, '{', $pos) === 0;
+			return $find !== false && !preg_match('#(?<!->)\s*\{#U', substr($line, $pos));
 		}
 
 		static public function contentTab($match)
@@ -1057,19 +1057,19 @@ function ($value)
 				'#(?<![a-zA-Z0-9_\x7f-\xff\$])function(\s[^{]*);#'
 					=> 'function$1 {}',
 
-				'#(?<![a-zA-Z0-9_\x7f-\xff\$])('.self::IF_BLOKCS.')(?:[\t ]+(\S.*))?\s*\{#U'
+				'#(?<![a-zA-Z0-9_\x7f-\xff\$])('.self::IF_BLOKCS.')(?:[\t ]+(\S.*))?(?<!->)\s*\{#U'
 					=> '$1 ($2) {',
 
-				'#(?<![a-zA-Z0-9_\x7f-\xff\$])(function[\t ]+'.self::VALIDNAME.')(?:[\t ]+(array[\t ].+|_*[A-Z\$\&\\\\].+))?\s*\{#U'
+				'#(?<![a-zA-Z0-9_\x7f-\xff\$])(function[\t ]+'.self::VALIDNAME.')(?:[\t ]+(array[\t ].+|_*[A-Z\$\&\\\\].+))?(?<!->)\s*\{#U'
 					=> '$1 ($2) {',
 
-				'#(?<![a-zA-Z0-9_\x7f-\xff\$])function[\t ]+(array[\t ].+|_*[A-Z\$\&\\\\].+)?\s*\{#U'
+				'#(?<![a-zA-Z0-9_\x7f-\xff\$])function[\t ]+(array[\t ].+|_*[A-Z\$\&\\\\].+)?(?<!->)\s*\{#U'
 					=> 'function ($1) {',
 
 				'#(?<![a-zA-Z0-9_\x7f-\xff\$])function\s+use(?![a-zA-Z0-9_\x7f-\xff])#U'
 					=> 'function () use',
 
-				'#(?<![a-zA-Z0-9_\x7f-\xff\$])(function.*[^a-zA-Z0-9_\x7f-\xff\$])use[\t ]*((array[\t ].+|_*[A-Z\$\&\\\\].+)\{)#U'
+				'#(?<![a-zA-Z0-9_\x7f-\xff\$])(function.*[^a-zA-Z0-9_\x7f-\xff\$])use[\t ]*((array[\t ].+|_*[A-Z\$\&\\\\].+)(?<!->)[\t ]*\{)#U'
 					=> '$1 ) use ( $2',
 
 				'#\((\([^\(\)]+\))\)#'