Add more subscopes for operators (#66)

michaelblyons · web-flow · commit 8c1f80aeb5b7 · 2025-04-26T18:10:52.000+02:00
Add more subscopes for operators
diff --git a/Terraform.sublime-syntax b/Terraform.sublime-syntax
@@ -309,13 +309,13 @@ contexts:
   # https://github.com/hashicorp/hcl2/blob/master/hcl/hclsyntax/spec.md#operations
   operators:
     - match: \>\=   # >=
-      scope: keyword.operator.terraform
+      scope: keyword.operator.comparison.terraform
     - match: \<\=   # <=
-      scope: keyword.operator.terraform
+      scope: keyword.operator.comparison.terraform
     - match: \=\=   # ==
-      scope: keyword.operator.terraform
+      scope: keyword.operator.comparison.terraform
     - match: \!\=   # !=
-      scope: keyword.operator.terraform
+      scope: keyword.operator.comparison.terraform
     - match: \+     # +
       scope: keyword.operator.arithmetic.terraform
     - match: \-     # -
@@ -333,15 +333,15 @@ contexts:
     - match: \!     # !
       scope: keyword.operator.logical.terraform
     - match: \>     # >
-      scope: keyword.operator.terraform
+      scope: keyword.operator.comparison.terraform
     - match: \<     # <
-      scope: keyword.operator.terraform
+      scope: keyword.operator.comparison.terraform
     - match: \?     # ?
-      scope: keyword.operator.terraform
+      scope: keyword.operator.ternary.terraform
     - match: \.\.\. # ...
       scope: keyword.operator.terraform
     - match: ':'  # :
-      scope: keyword.operator.terraform
+      scope: keyword.operator.ternary.terraform
 
   # Terraform "import" statements
   #
diff --git a/syntax_test_terraform-vars.tfvars b/syntax_test_terraform-vars.tfvars
@@ -76,13 +76,13 @@
 #         ^ meta.function-call.terraform punctuation.section.parens.begin.terraform
 #          ^^^^^^^^^ meta.function-call.terraform
 #                   ^ meta.function-call.terraform punctuation.section.parens.end.terraform
-#                     ^ keyword.operator.terraform
+#                     ^ keyword.operator.comparison.terraform
 #                       ^ constant.numeric.integer.terraform
-#                         ^ keyword.operator.terraform
+#                         ^ keyword.operator.ternary.terraform
 #                                    ^ punctuation.section.brackets.begin.terraform
 #                                     ^ constant.numeric.integer.terraform
 #                                      ^ punctuation.section.brackets.end.terraform
-#                                        ^ keyword.operator.terraform
+#                                        ^ keyword.operator.ternary.terraform
 
     [{a = 1}, {g = 2}]
 #   ^ punctuation.section.brackets.begin.terraform
diff --git a/syntax_test_terraform.tf b/syntax_test_terraform.tf
@@ -326,9 +326,9 @@
 #    ^^ punctuation.section.interpolation.begin.terraform
 #     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.interpolation.terraform
 #      ^^^^^^^^^^^^^^^^^^^^^^^^^^ source.terraform
-#                 ^ keyword.operator.terraform
+#                 ^ keyword.operator.ternary.terraform
 #                   ^^^^ meta.interpolation.terraform constant.language.terraform
-#                        ^ meta.interpolation.terraform keyword.operator.terraform
+#                        ^ meta.interpolation.terraform keyword.operator.ternary.terraform
 #                          ^^^^^ meta.interpolation.terraform constant.language.terraform
 #                                ^ meta.interpolation.terraform punctuation.section.interpolation.end.terraform
 #                                 ^ string.quoted.double.terraform punctuation.definition.string.end.terraform
@@ -495,7 +495,7 @@
 #      ^^ meta.interpolation.terraform punctuation.section.interpolation.begin.terraform
 #      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.interpolation.terraform
 #         ^^ meta.interpolation.terraform keyword.control.terraform
-#                 ^^ meta.interpolation.terraform keyword.operator.terraform
+#                 ^^ meta.interpolation.terraform keyword.operator.comparison.terraform
 #                    ^ source.terraform meta.interpolation.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform
 #                    ^^^^^^ source.terraform meta.interpolation.terraform string.quoted.double.terraform
 #                         ^ source.terraform meta.interpolation.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform
@@ -519,7 +519,7 @@
 #      ^^ meta.interpolation.terraform punctuation.section.interpolation.begin.terraform
 #      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.interpolation.terraform
 #         ^^ meta.interpolation.terraform keyword.control.terraform
-#                 ^^ meta.interpolation.terraform keyword.operator.terraform
+#                 ^^ meta.interpolation.terraform keyword.operator.comparison.terraform
 #                    ^ source.terraform meta.interpolation.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform
 #                    ^^^^^^ source.terraform meta.interpolation.terraform string.quoted.double.terraform
 #                         ^ source.terraform meta.interpolation.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform
@@ -576,32 +576,32 @@
 
     a == b
 #   ^ -keyword -operator
-#     ^^ keyword.operator.terraform
+#     ^^ keyword.operator.comparison.terraform
 #         ^ -keyword -operator
 
     a != b
 #   ^ -keyword -operator
-#     ^^ keyword.operator.terraform
+#     ^^ keyword.operator.comparison.terraform
 #         ^ -keyword -operator
 
     a < b
 #    ^ -keyword -operator
-#     ^ keyword.operator.terraform
+#     ^ keyword.operator.comparison.terraform
 #      ^ -keyword -operator
 
     a <= b
 #    ^ -keyword -operator
-#     ^^ keyword.operator.terraform
+#     ^^ keyword.operator.comparison.terraform
 #       ^ -keyword -operator
 
     a > b
 #    ^ -keyword -operator
-#     ^ keyword.operator.terraform
+#     ^ keyword.operator.comparison.terraform
 #      ^ -keyword -operator
 
     a >= b
 #    ^ -keyword -operator
-#     ^^ keyword.operator.terraform
+#     ^^ keyword.operator.comparison.terraform
 #       ^ -keyword -operator
 
 /////
@@ -666,13 +666,13 @@
 #         ^ meta.function-call.terraform punctuation.section.parens.begin.terraform
 #          ^^^^^^^^^ meta.function-call.terraform
 #                   ^ meta.function-call.terraform punctuation.section.parens.end.terraform
-#                     ^ keyword.operator.terraform
+#                     ^ keyword.operator.comparison.terraform
 #                       ^ constant.numeric.integer.terraform
-#                         ^ keyword.operator.terraform
+#                         ^ keyword.operator.ternary.terraform
 #                                    ^ punctuation.section.brackets.begin.terraform
 #                                     ^ constant.numeric.integer.terraform
 #                                      ^ punctuation.section.brackets.end.terraform
-#                                        ^ keyword.operator.terraform
+#                                        ^ keyword.operator.ternary.terraform
 
 /////
 // Ellipsis
@@ -2607,10 +2607,10 @@
 #      ^^^^^^^^ variable.other.readwrite.terraform
 #              ^ punctuation.accessor.dot.terraform
 #               ^^^^^^^^^ variable.other.member.terraform
-#                         ^^ keyword.operator.terraform
+#                         ^^ keyword.operator.comparison.terraform
 #                            ^ string.quoted.double.terraform punctuation.definition.string.begin.terraform
 #                             ^ string.quoted.double.terraform punctuation.definition.string.end.terraform
-#                               ^ keyword.operator.terraform
+#                               ^ keyword.operator.ternary.terraform
 #                                 ^^^^ meta.function-call.terraform support.function.builtin.terraform
 #                                     ^ meta.function-call.terraform punctuation.section.parens.begin.terraform
 #                                      ^^^^^^^^ meta.function-call.terraform
@@ -2621,7 +2621,7 @@
 #                                                                   ^ meta.function-call.terraform punctuation.accessor.dot.terraform
 #                                                                    ^^^^^^^^^ meta.function-call.terraform variable.other.member.terraform
 #                                                                             ^ meta.function-call.terraform punctuation.section.parens.end.terraform
-#                                                                               ^ keyword.operator.terraform
+#                                                                               ^ keyword.operator.ternary.terraform
 #                                                                                 ^^^^ meta.function-call.terraform support.function.builtin.terraform
 #                                                                                     ^ meta.function-call.terraform punctuation.section.parens.begin.terraform
 #                                                                                      ^^^^^^^^ meta.function-call.terraform
@@ -2653,18 +2653,18 @@
 #      ^^^^^^^^ variable.other.readwrite.terraform
 #              ^ punctuation.accessor.dot.terraform
 #               ^^^^^^^^^ variable.other.member.terraform
-#                         ^^ keyword.operator.terraform
+#                         ^^ keyword.operator.comparison.terraform
 #                            ^ string.quoted.double.terraform punctuation.definition.string.begin.terraform
 #                             ^ string.quoted.double.terraform punctuation.definition.string.end.terraform
-#                               ^ keyword.operator.terraform
+#                               ^ keyword.operator.ternary.terraform
 #                                 ^ punctuation.section.brackets.begin.terraform
 #                                          ^ punctuation.accessor.dot.terraform
 #                                           ^^^^^^^^^^ variable.other.member.terraform
 #                                                     ^ punctuation.separator.terraform
 #                                                               ^ punctuation.accessor.dot.terraform
 #                                                                ^^^^^^^^^ variable.other.member.terraform
 #                                                                         ^ punctuation.section.brackets.end.terraform
-#                                                                           ^ keyword.operator.terraform
+#                                                                           ^ keyword.operator.ternary.terraform
 #                                                                             ^ punctuation.section.brackets.begin.terraform
 #                                                                                      ^ punctuation.accessor.dot.terraform
 #                                                                                       ^^^^^^^^^^ variable.other.member.terraform
@@ -2692,7 +2692,7 @@
 #                               ^ meta.function-call.terraform punctuation.section.parens.end.terraform
 #                                 ^^ keyword.control.conditional.terraform
 #                                    ^ variable.other.readwrite.terraform
-#                                      ^^ keyword.operator.terraform
+#                                      ^^ keyword.operator.comparison.terraform
 #                                         ^ string.quoted.double.terraform punctuation.definition.string.begin.terraform
 #                                          ^ string.quoted.double.terraform punctuation.definition.string.end.terraform
 #                                           ^ punctuation.section.brackets.end.terraform
@@ -2722,7 +2722,7 @@
 #                                 ^ variable.other.readwrite.terraform
 #                                   ^^ keyword.control.conditional.terraform
 #                                      ^ variable.other.readwrite.terraform
-#                                        ^ keyword.operator.terraform
+#                                        ^ keyword.operator.comparison.terraform
 #                                          ^ constant.numeric.integer.terraform
 #                                           ^ punctuation.section.brackets.end.terraform
 
@@ -2803,7 +2803,7 @@
 #                                            ^^^ keyword.operator.terraform
 #                                                ^^ keyword.control.conditional.terraform
 #                                                   ^ variable.other.readwrite.terraform
-#                                                     ^^ keyword.operator.terraform
+#                                                     ^^ keyword.operator.comparison.terraform
 #                                                        ^ string.quoted.double.terraform punctuation.definition.string.begin.terraform
 #                                                         ^ string.quoted.double.terraform punctuation.definition.string.end.terraform
 #                                                          ^ punctuation.section.braces.end.terraform
