Remove special ↩ handling

In favor of built-in snippet from the Source bundle, also support empty braces.

Author: infininight

Snippets/Special: Return Inside parentheses.tmSnippet

@@ -147,7 +147,7 @@
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#empty-parentheses</string>
+					<string>#empty-blocks</string>
 				</dict>
 				<dict>
 					<key>include</key>
@@ -459,20 +459,49 @@
 				</dict>
 			</array>
 		</dict>
-		<key>empty-parentheses</key>
+		<key>empty-blocks</key>
 		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
+			<key>patterns</key>
+			<array>
 				<dict>
+					<key>captures</key>
+					<dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.parentheses.begin.scala</string>
+						</dict>
+						<key>2</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.parentheses.end.scala</string>
+						</dict>
+					</dict>
+					<key>match</key>
+					<string>(\()(\))</string>
 					<key>name</key>
-					<string>meta.bracket.scala</string>
+					<string>meta.parentheses.scala</string>
 				</dict>
-			</dict>
-			<key>match</key>
-			<string>(\(\))</string>
-			<key>name</key>
-			<string>meta.parentheses.scala</string>
+				<dict>
+					<key>captures</key>
+					<dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.parentheses.begin.scala</string>
+						</dict>
+						<key>2</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.parentheses.end.scala</string>
+						</dict>
+					</dict>
+					<key>match</key>
+					<string>(\{)(\})</string>
+					<key>name</key>
+					<string>meta.braces.scala</string>
+				</dict>
+			</array>
 		</dict>
 		<key>imports</key>
 		<dict>

Syntaxes/Scala.tmLanguage

@@ -8,10 +8,6 @@
 	<string>Mads Hartmann</string>
 	<key>mainMenu</key>
 	<dict>
-		<key>excludedItems</key>
-		<array>
-			<string>E364F26E-C766-4068-BAAF-C010FA1F5F92</string>
-		</array>
 		<key>items</key>
 		<array>
 			<string>DDFBBCF9-D333-4077-8D4F-EF6F2CA62220</string>