From 40f14ec14a5bfb3198ffc1629480d50b74850337 Mon Sep 17 00:00:00 2001
From: Michael Sheets <git@whitefalls.org>
Date: Mon, 17 Nov 2014 00:35:41 -0600
Subject: [PATCH] Use separate block-comment rule, allowing for nesting

This allows for nested comments:

`/* Lorem ipsum dolor /* sit amet */ consectetur adipisicing elit */`

Also remove an effectively empty rule that could cause an infinite recursion loop.
---
 Syntaxes/Scala.tmLanguage | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/Syntaxes/Scala.tmLanguage b/Syntaxes/Scala.tmLanguage
index 7c1340c..170ac43 100644
--- a/Syntaxes/Scala.tmLanguage
+++ b/Syntaxes/Scala.tmLanguage
@@ -39,13 +39,6 @@
 					<key>include</key>
 					<string>#block-comments</string>
 				</dict>
-				<dict>
-					<key>match</key>
-					<string>(?x)
-			(?! /\*)
-			(?! \*/)
-		  </string>
-				</dict>
 			</array>
 		</dict>
 		<key>char-literal</key>
@@ -124,10 +117,6 @@
 					<key>include</key>
 					<string>#comments</string>
 				</dict>
-				<dict>
-					<key>include</key>
-					<string>#block-comments</string>
-				</dict>
 				<dict>
 					<key>include</key>
 					<string>#strings</string>
@@ -290,20 +279,8 @@
 					</array>
 				</dict>
 				<dict>
-					<key>begin</key>
-					<string>/\*</string>
-					<key>captures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.comment.scala</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>\*/</string>
-					<key>name</key>
-					<string>comment.block.scala</string>
+					<key>include</key>
+					<string>#block-comments</string>
 				</dict>
 				<dict>
 					<key>captures</key>