From 5cbe1d0c8f6fef5e48c6ccf5745318723cce3059 Mon Sep 17 00:00:00 2001
From: Curt Sellmer <sellmerfud@gmail.com>
Date: Mon, 21 May 2012 16:10:03 -0500
Subject: [PATCH] Fix special id's more specific

Use a more specific matching pattern for special id after def/var/val
---
 Syntaxes/Scala.tmLanguage | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Syntaxes/Scala.tmLanguage b/Syntaxes/Scala.tmLanguage
index 5c17aee..7b2977f 100644
--- a/Syntaxes/Scala.tmLanguage
+++ b/Syntaxes/Scala.tmLanguage
@@ -385,7 +385,7 @@
 					<key>match</key>
 					<string>(?x)
 						\b(def)\s+
-						(`[^`]+`|[_$a-zA-Z][_$a-zA-Z0-9]*(?:_[^\s])(?=[(\t ])|[_$a-zA-Z][_$a-zA-Z0-9]*|[-?~&gt;&lt;^+*%:!#|/@\\]+)</string>
+						(`[^`]+`|[_$a-zA-Z][_$a-zA-Z0-9]*(?:_[^\t .,;()\[\]{}'"`\w])(?=[(\t ])|[_$a-zA-Z][_$a-zA-Z0-9]*|[-?~&gt;&lt;^+*%:!#|/@\\]+)</string>
 				</dict>
 				<dict>
 					<key>captures</key>
@@ -446,7 +446,7 @@
 						</dict>
 					</dict>
 					<key>match</key>
-					<string>\b(?:(val)|(var))\s+(?:(`[^`]+`|[_$a-zA-Z][_$a-zA-Z0-9]*(?:_[^\s])(?=[\t ])|[_$a-zA-Z][_$a-zA-Z0-9]*|[-?~&gt;&lt;^+*%:!#|/@\\]+)|(?=\())</string>
+					<string>\b(?:(val)|(var))\s+(?:(`[^`]+`|[_$a-zA-Z][_$a-zA-Z0-9]*(?:_[^\t .,;()\[\]{}'"`\w])(?=[\t ])|[_$a-zA-Z][_$a-zA-Z0-9]*|[-?~&gt;&lt;^+*%:!#|/@\\]+)|(?=\())</string>
 				</dict>
 				<dict>
 					<key>captures</key>