Remove the regex match in strings.

This commit just comments out the contexts for regex match in strings. A lot of people seem to use `/` in strings that wasn't signalling the start of a regex match causing the highlighting to go haywire. This will be something that will be improved in the future. Partially resolves #12.
Sublime-Instincts · Oct 29, 2021 · e0bec1c · e0bec1c
1 parent 5d95adb
commit e0bec1c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,4 +45,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.0.5] - 2021-05-24
 ### Removed
-- Keybindings to come out of empty statements/expression blocks.
+- Keybindings to come out of empty statements/expression blocks.
+
+## [1.0.6] - 2021-10-29
+### Removed
+- Regex highlighting in strings.
diff --git a/resources/syntax/Twig.sublime-syntax b/resources/syntax/Twig.sublime-syntax
@@ -361,25 +361,25 @@ contexts:
     - include: double_string_regex_match
     - include: double_quoted_string
 
-  single_string_regex_match:
-    - match: (')(?:/)
-      captures:
-        1: punctuation.definition.string.begin.twig
-      embed: scope:source.regexp
-      embed_scope: string.quoted.single.twig
-      escape: (?:/{{regex_modifiers}})(')
-      escape_captures:
-        1: punctuation.definition.string.end.twig
-
-  double_string_regex_match:
-    - match: (")(?:/)
-      captures:
-        1: punctuation.definition.string.begin.twig
-      embed: scope:source.regexp
-      embed_scope: string.quoted.double.twig
-      escape: (?:/{{regex_modifiers}})(")
-      escape_captures:
-        1: punctuation.definition.string.end.twig
+  # single_string_regex_match:
+  #   - match: (')(?:/)
+  #     captures:
+  #       1: punctuation.definition.string.begin.twig
+  #     embed: scope:source.regexp
+  #     embed_scope: string.quoted.single.twig
+  #     escape: (?:/{{regex_modifiers}})(')
+  #     escape_captures:
+  #       1: punctuation.definition.string.end.twig
+
+  # double_string_regex_match:
+  #   - match: (")(?:/)
+  #     captures:
+  #       1: punctuation.definition.string.begin.twig
+  #     embed: scope:source.regexp
+  #     embed_scope: string.quoted.double.twig
+  #     escape: (?:/{{regex_modifiers}})(")
+  #     escape_captures:
+  #       1: punctuation.definition.string.end.twig
 
   single_quoted_string:
     - match: \'

diff --git a/resources/syntax/tests/syntax_test_expressions.twig b/resources/syntax/tests/syntax_test_expressions.twig
@@ -241,14 +241,6 @@
 ##         ^^^ variable.other.twig
 ##        ^ punctuation.accessor.dot.twig
 
-    {{ '/^[\\d\\.]+$/' "/^[\\d\\.]+$/" }}
-##       ^^^^^^^^^^^ source.regexp
-##                       ^^^^^^^^^^^ source.regexp
-
-    {{ '/^[\\d\\.]+$/iu' "/^[\\d\\.]+$/iu" }}
-##       ^^^^^^^^^^^ source.regexp
-##                         ^^^^^^^^^^^ source.regexp
-
     {{ foo ? 'yes' : 'no' }}
 ##  ^^^^^^^^^^^^^^^^^^^^^^^^ meta.placeholder.twig
 ##  ^^ punctuation.definition.placeholder.begin.twig

diff --git a/resources/syntax/tests/syntax_test_statements.twig b/resources/syntax/tests/syntax_test_statements.twig
@@ -192,13 +192,6 @@
 ##                   ^ keyword.operator.assignment.twig
 ##                           ^ punctuation.separator.parameters.twig
 
-    {% '/^[\\d\\.]+$/' "/^[\\d\\.]+$/" %}
-##       ^^^^^^^^^^^ source.regexp
-##                       ^^^^^^^^^^^ source.regexp
-
-    {% '/^[\\d\\.]+$/iu' "/^[\\d\\.]+$/iu" %}
-##       ^^^^^^^^^^^ source.regexp
-##                         ^^^^^^^^^^^ source.regexp
 
     {% [1 + 2 - 3 * 4 / 5 // 6 % 7 ** 9] %}
 ##  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.statement.twig