Rename JS regexp grammar for consistency…

…plus a couple other related fixes.

packages/language-javascript/grammars/tree-sitter-2-regex.cson

@@ -1,5 +1,5 @@
 name: 'JavaScript RegExp'
-scopeName: 'source.regexp.js'
+scopeName: 'source.js.regexp'
 type: 'modern-tree-sitter'
 parser: 'tree-sitter-regex'
 

packages/language-javascript/grammars/ts/regex/highlights.scm

@@ -3,8 +3,6 @@
 ; * No support for lookbehind as of March 2023 (waiting on
 ; https://github.com/tree-sitter/tree-sitter-regex/pull/15)
 
-(pattern) @string.regexp
-
 (non_capturing_group) @meta.group.non-capturing.regexp
 
 [

packages/language-javascript/lib/main.js

@@ -48,7 +48,7 @@ exports.activate = function () {
 
   atom.grammars.addInjectionPoint('source.js', {
     type: 'regex_pattern',
-    language(regex) {
+    language() {
       return 'js-regex';
     },
     content(regex) {