Snippet: Fix syntax tests by using embed

There was also an incorrect test case that has been fixed.

Package/Sublime Text Snippet/Sublime Text Snippet (Raw).sublime-syntax

@@ -48,28 +48,26 @@ contexts:
           pop: true
     - match: '/'
       scope: keyword.other.regex.start.snippet
-      push:
-        - match: '/'
-          scope: keyword.other.regex.mid.snippet
-          set:
-            - match: '/'
-              scope: keyword.other.regex.end.snippet
-              set:
-                - match: '[gims-]*' # x mode doesn't seem to work properly in snippets
-                  scope: constant.other.regex-modifier.snippet
-                - match: '(?=\})'
-                  pop: true
-                - match: '[^}]+'
-                  scope: invalid.illegal.unexpected-token.snippet
-            - match: ''
-              push: scope:source.regexp-replacement
-              with_prototype:
-                - match: (?=/)
-                  pop: true
-        - match: ''
-          push:
-            # Will not work if extended mode is enabled in the regex
-            - meta_scope: source.regexp.embedded
-            - match: (?=/)
-              pop: true
-            - include: scope:source.regexp#base-literal
+      push: inside_caret_pattern
+
+  inside_caret_pattern:
+    - match: '/'
+      scope: keyword.other.regex.mid.snippet
+      set: inside_caret_replacement
+    - match: ''
+      embed: scope:source.regexp
+      escape: (?<=[^\\]|\\\\)(?=/)
+
+  inside_caret_replacement:
+    - match: '/'
+      scope: keyword.other.regex.end.snippet
+      set:
+        - match: '[gims-]*'  # x mode doesn't seem to work properly in snippets
+          scope: constant.other.regex-modifier.snippet
+        - match: '(?=\})'
+          pop: true
+        - match: '[^}]+'
+          scope: invalid.illegal.unexpected-token.snippet
+    - match: ''
+      embed: scope:source.regexp-replacement
+      escape: (?<=[^\\]|\\\\)(?=/)

Package/Sublime Text Snippet/syntax_test_snippet.xml

@@ -46,7 +46,7 @@ Transformation: ${1/^(\w)|(?:_(\w))/(?1\u$1:)(?2 \u${2}:)/g}
 #               ^^ keyword.other.block
 #                 ^ constant.numeric
 #                  ^ keyword.other.regex.start
-#                   ^ keyword.control.anchors
+#                   ^ keyword.control.anchor
 #                    ^^^^ meta.group
 #                     ^^ keyword.control.character-class
 #                        ^ keyword.operator.alternation
@@ -207,10 +207,13 @@ It is possible to include a literal newline in the replacement: ${1/test/_
 # ^ keyword.other.block.end
 
 
-${TM_CURRENT_LINE/^\\s*((?:\\/\\/[\\/!]?|#|%|--|::|(?i:rem)|'|;)\\s*).*/$1/}
-#                            ^ meta.group.regexp meta.group.regexp meta.literal.regexp
-#                                                                      ^ keyword.other.regex.mid.snippet
+${TM_CURRENT_LINE/^\\s*((?:\/\/[\/!]?|#|%|--|::|(?i:rem)|'|;)\\s*).*/$1/}
+#                          ^^^^ constant.character.escape.regexp
+#                               ^^ constant.character.escape.regexp
+#                                                                      ^ keyword.other.regex.end.snippet
 
+${TM_CURRENT_LINE/^\\s*((?:\\/\1/}
+#                            ^ keyword.other.regex.mid.snippet
  ]]>snippet<</content>
 #^^^ meta.tag.cdata punctuation.definition.tag.end
 #   ^^^^^^^ source.sublime.snippet