Merge branch 'st4107'

SublimeText · May 31, 2023 · bb697c2 · bb697c2
2 parents 2e50ef3 + 6e78453
commit bb697c2
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 0 deletions.
diff --git a/Syntaxes/Slim.sublime-syntax b/Syntaxes/Slim.sublime-syntax
@@ -678,6 +678,8 @@ contexts:
 
   ruby-expression:
     - meta_scope: meta.embedded.slim source.ruby.rails.embedded.slim
+    - match: (?=[])}])
+      pop: 1
     - include: ruby-expressions
     - include: immediately-pop
 

diff --git a/tests/syntax_test_slim.slim b/tests/syntax_test_slim.slim
@@ -975,6 +975,54 @@ div {
 /               ^ - meta.embedded
 / ^ punctuation.section.embedded.slim
 
+div[foo=]
+/ <- meta.tag.slim entity.name.tag.slim
+/^^ meta.tag.slim entity.name.tag.slim
+/  ^^^^^^ meta.tag.slim meta.brackets.slim
+/        ^ - meta.tag
+
+div[foo=]
+  div.example
+/ ^^^^^^^^^^^ meta.tag.slim
+
+div[foo=()]
+/ <- meta.tag.slim entity.name.tag.slim
+/^^ meta.tag.slim entity.name.tag.slim
+/  ^^^^^^^^ meta.tag.slim meta.brackets.slim
+/          ^ - meta.tag
+
+div[foo=()]
+  div.example
+/ ^^^^^^^^^^^ meta.tag.slim
+
+div[foo=("bar" if baz?)]
+/ <- meta.tag.slim entity.name.tag.slim
+/^^ meta.tag.slim entity.name.tag.slim
+/  ^^^^^^^^^^^^^^^^^^^^^ meta.tag.slim meta.brackets.slim
+/                       ^ - meta.tag
+
+div[foo=("bar" if baz?)]
+  div.example
+/ ^^^^^^^^^^^ meta.tag.slim
+
+div.cls[foo=("bar" if baz?)]
+/ <- meta.tag.slim entity.name.tag.slim
+/^^^^^^ meta.tag.slim - meta.brackets
+/      ^^^^^^^^^^^^^^^^^^^^^ meta.tag.slim meta.brackets.slim
+/                           ^ - meta.tag
+
+div.cls[foo=("bar" if baz?)]
+  div.example
+/ ^^^^^^^^^^^ meta.tag.slim
+
+div.cls[
+    foo=(
+      "bar" if baz?
+    )
+  ]
+  div.example
+/ ^^^^^^^^^^^ meta.tag.slim
+
 .splat *method_which_returns_hash = place.name
 / <- meta.tag.slim punctuation.definition.attribute.class.slim
 /^^^^^^ meta.tag.slim - meta.embedded