[JavaScript] Simplify indentation rules

By utilizing the improved selector scoring of build 4173, we can simply
have the two rules override each other based on the last meta scope on
the stack.

Author: FichteFoll

JavaScript/Indentation Rules - Values.tmPreferences

@@ -3,18 +3,10 @@
 <dict>
 	<key>scope</key>
 	<string>
-		(source.js meta.mapping, source.js meta.sequence) - source.js meta.function,
-		source.js meta.function meta.mapping,
-		source.js meta.function meta.sequence,
-		(source.jsx meta.mapping, source.jsx meta.sequence) - source.jsx meta.function,
-		source.jsx meta.function meta.mapping,
-		source.jsx meta.function meta.sequence,
-		(source.ts meta.mapping, source.ts meta.sequence) - source.ts meta.function,
-		source.ts meta.function meta.mapping,
-		source.ts meta.function meta.sequence,
-		(source.tsx meta.mapping, source.tsx meta.sequence) - source.tsx meta.function,
-		source.tsx meta.function meta.mapping,
-		source.tsx meta.function meta.sequence
+		source.js meta.mapping, source.js meta.sequence,
+		source.jsx meta.mapping, source.jsx meta.sequence,
+		source.ts meta.mapping, source.ts meta.sequence,
+		source.tsx meta.mapping, source.tsx meta.sequence
 	</string>
 	<key>settings</key>
 	<dict>
@@ -72,6 +64,9 @@
 				($|/[/*])
 			)
 		</string>
+		<!-- Reset for value rules -->
+		<key>bracketIndentNextLinePattern</key>
+		<string></string>
 	</dict>
 </dict>
 </plist>

JavaScript/Indentation Rules.tmPreferences

@@ -1,16 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plist version="1.0">
 <dict>
+	<!--
+		The meta.function scopes are used
+		to re-override the separate mapping and sequence-sepcific patterns
+		defined in `Indentation Rules - Values.tmPreferences`.
+		This relies on a scope selector scoring adjustment in 4173.
+		See also: https://github.com/sublimehq/sublime_text/issues/2152
+	-->
 	<key>scope</key>
 	<string>
-		source.js - source.js meta.mapping - source.js meta.sequence - source.js meta.string,
-		source.js meta.function,
-		source.jsx - source.jsx meta.mapping - source.jsx meta.sequence - source.jsx meta.string,
-		source.jsx meta.function,
-		source.ts - source.ts meta.mapping - source.ts meta.sequence - source.ts meta.string,
-		source.ts meta.function,
-		source.tsx - source.tsx meta.mapping - source.tsx meta.sequence - source.tsx meta.string,
-		source.tsx meta.function
+		source.js - source.js meta.string,
+		source.js meta.function - source.js meta.string,
+		source.jsx - source.jsx meta.string,
+		source.jsx meta.function - source.jsx meta.string,
+		source.ts - source.ts meta.string,
+		source.ts meta.function - source.ts meta.string,
+		source.tsx - source.tsx meta.string,
+		source.tsx meta.function - source.tsx meta.string
 	</string>
 	<key>settings</key>
 	<dict>