[Various] Scope in as keyword.control again (#4271)

This is a follow-up to 1e76a91, which introduced this new unified
`keyword.operator.iteration.in` scope. However, this `in` is a keyword
that is used in loop statements and not an operator and should thus be
scoped similar to `keyword.control.loop.for`. I opted to simply replace
`for` with `in` in the above as it allows for sufficient context of the
(loop-related control flow) keyword while not binding it to the `for`
like it was used in some instances before.

Author: FichteFoll

ASP/ASP.sublime-syntax

@@ -682,7 +682,7 @@ contexts:
   control_flow_foreach_in:
     - meta_scope: meta.for.block.asp
     - match: '\b(?i:In){{whitespace_or_end_of_statement}}'
-      scope: keyword.operator.iteration.in.asp
+      scope: keyword.control.loop.in.asp
       set: [inside_control_flow_for, expression_until_end_of_statement]
 
   control_flow_forto:

ASP/syntax_test_asp.asp

@@ -878,7 +878,7 @@
    '<- - meta.between-if-and-then.asp
    '^^^^^^^^ keyword.control.flow.asp
    '         ^^^^^^ variable.other.asp
-   '                ^^ keyword.operator.iteration.in.asp
+   '                ^^ keyword.control.loop.in.asp
    '                                  ^ meta.for.block.asp
         Response.Write(vbCrLf & cookie)
        '^^^^^^^^ support.class.asp
@@ -1231,7 +1231,7 @@ test = "hello%>
 <%
         for each item in list
        '^^^^^^^^ text.html.asp source.asp.embedded.html meta.method.asp meta.method.body.asp meta.for.block.asp keyword.control.flow.asp
-       '              ^^ text.html.asp source.asp.embedded.html meta.method.asp meta.method.body.asp meta.for.block.asp keyword.operator.iteration.in.asp
+       '              ^^ text.html.asp source.asp.embedded.html meta.method.asp meta.method.body.asp meta.for.block.asp keyword.control.loop.in.asp
             %><li><%= item %></li><%
                     '^^^^^^ text.html.asp source.asp.embedded.html meta.method.asp meta.method.body.asp meta.for.block.asp
            '  ^ punctuation.definition.tag.begin.html

Batch File/Batch File.sublime-syntax

@@ -495,7 +495,7 @@ contexts:
 
   ctl-for-in:
     - match: (?i:in){{keyword_break}}
-      scope: keyword.operator.iteration.in.dosbatch
+      scope: keyword.control.loop.in.dosbatch
       pop: 1
     - include: else-pop
 

Batch File/tests/syntax_test_batch_file.bat

@@ -1990,7 +1990,7 @@ is a #@$虎" strange label
 :: ^^^ keyword.control.loop.for.dosbatch
 ::     ^^ punctuation.definition.variable.dosbatch
 ::     ^^^ variable.other.readwrite.dosbatch
-::         ^^ keyword.operator.iteration.in.dosbatch
+::         ^^ keyword.control.loop.in.dosbatch
 ::            ^ punctuation.section.set.begin.dosbatch
 ::             ^ meta.number.integer.decimal.dosbatch constant.numeric.value.dosbatch
 ::              ^ punctuation.separator.comma.dosbatch
@@ -2006,7 +2006,7 @@ is a #@$虎" strange label
 ::        ^^ variable.parameter.option.recursive.dosbatch
 ::           ^^ punctuation.definition.variable.dosbatch
 ::           ^^^ variable.other.readwrite.dosbatch
-::               ^^ keyword.operator.iteration.in.dosbatch
+::               ^^ keyword.control.loop.in.dosbatch
 ::                  ^ punctuation.section.set.begin.dosbatch
 ::                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.set.dosbatch
 ::                          ^ punctuation.separator.comma.dosbatch
@@ -2026,7 +2026,7 @@ is a #@$虎" strange label
 ::    ^^ variable.parameter.option.recursive.dosbatch
 ::       ^^ punctuation.definition.variable.dosbatch
 ::       ^^^ variable.other.readwrite.dosbatch
-::           ^^ keyword.operator.iteration.in.dosbatch
+::           ^^ keyword.control.loop.in.dosbatch
 ::              ^ punctuation.section.set.begin.dosbatch
 ::              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.set.dosbatch
 ::                      ^ punctuation.separator.comma.dosbatch
@@ -2040,7 +2040,7 @@ is a #@$虎" strange label
    %%f IN (folder1, ..\folder2, C:\folder) DO command
 :: ^^ punctuation.definition.variable.dosbatch
 :: ^^^ variable.other.readwrite.dosbatch
-::     ^^ keyword.operator.iteration.in.dosbatch
+::     ^^ keyword.control.loop.in.dosbatch
 ::        ^ punctuation.section.set.begin.dosbatch
 ::        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.set.dosbatch
 ::                ^ punctuation.separator.comma.dosbatch
@@ -2053,7 +2053,7 @@ is a #@$虎" strange label
    /D /r ^
    %%f ^
    IN (folder1, ..\folder2, C:\folder) DO command
-:: ^^ keyword.operator.iteration.in.dosbatch
+:: ^^ keyword.control.loop.in.dosbatch
 ::    ^ punctuation.section.set.begin.dosbatch
 ::    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.set.dosbatch
 ::            ^ punctuation.separator.comma.dosbatch
@@ -2106,7 +2106,7 @@ is a #@$虎" strange label
 ::                 ^ punctuation.definition.string.end.dosbatch
 ::                   ^^ punctuation.definition.variable.dosbatch
 ::                   ^^^ variable.other.readwrite.dosbatch
-::                       ^^ keyword.operator.iteration.in.dosbatch
+::                       ^^ keyword.control.loop.in.dosbatch
 ::                          ^ punctuation.section.set.begin.dosbatch
 ::                          ^ meta.set.dosbatch punctuation.section.set.begin.dosbatch - meta.embedded
 ::                           ^ punctuation.section.embedded.begin.dosbatch
@@ -2133,7 +2133,7 @@ is a #@$虎" strange label
 ::     ^ punctuation.definition.variable.dosbatch
 ::     ^^ variable.parameter.option.range.dosbatch
 ::        ^^ invalid.illegal.variable.dosbatch
-::           ^^ keyword.operator.iteration.in.dosbatch
+::           ^^ keyword.control.loop.in.dosbatch
 ::              ^ punctuation.section.set.begin.dosbatch
 ::              ^^^^^^^^^ meta.set.dosbatch
 ::               ^ meta.number.integer.decimal.dosbatch constant.numeric.value.dosbatch
@@ -2151,7 +2151,7 @@ is a #@$虎" strange label
 ::     ^^ variable.parameter.option.recursive.dosbatch
 ::        ^^^^^^^^^^^^^^^^^^^^ string.unquoted.dosbatch
 ::                             ^^^^^ invalid.illegal.variable.dosbatch
-::                                   ^^ keyword.operator.iteration.in.dosbatch
+::                                   ^^ keyword.control.loop.in.dosbatch
 
    FOR /R C:\dir name\file name.ext %%f IN (.) DO command
 :: ^^^ keyword.control.loop.for.dosbatch
@@ -2162,7 +2162,7 @@ is a #@$虎" strange label
 ::                         ^^^^^^^^ invalid.illegal.variable.dosbatch
 ::                                  ^^ punctuation.definition.variable.dosbatch
 ::                                  ^^^ variable.other.readwrite.dosbatch
-::                                      ^^ keyword.operator.iteration.in.dosbatch
+::                                      ^^ keyword.control.loop.in.dosbatch
 
    FOR /R 'C:\dir name\file name.ext' %%f IN (*.ext) DO command
 :: ^^^ keyword.control.loop.for.dosbatch
@@ -2173,7 +2173,7 @@ is a #@$虎" strange label
 ::                          ^^^^^^^^^ invalid.illegal.variable.dosbatch
 ::                                    ^^ punctuation.definition.variable.dosbatch
 ::                                    ^^^ variable.other.readwrite.dosbatch
-::                                        ^^ keyword.operator.iteration.in.dosbatch
+::                                        ^^ keyword.control.loop.in.dosbatch
 
    FOR /R "C:\dir name\file-name.ext" %%f IN (set) DO command
 :: ^^^ keyword.control.loop.for.dosbatch
@@ -2184,12 +2184,12 @@ is a #@$虎" strange label
 ::                                  ^ punctuation.definition.string.end.dosbatch
 ::                                    ^^ punctuation.definition.variable.dosbatch
 ::                                    ^^^ variable.other.readwrite.dosbatch
-::                                        ^^ keyword.operator.iteration.in.dosbatch
+::                                        ^^ keyword.control.loop.in.dosbatch
 
    FOR /Z %%f IN (foo & bar | < baz > && no || false) DO command
 ::     ^^ invalid.illegal.parameter.dosbatch
 ::        ^^^ variable.other.readwrite.dosbatch
-::            ^^ keyword.operator.iteration.in.dosbatch
+::            ^^ keyword.control.loop.in.dosbatch
 ::                    ^ invalid.illegal.operator.dosbatch
 ::                          ^ invalid.illegal.operator.dosbatch
 ::                            ^ invalid.illegal.operator.dosbatch
@@ -2200,7 +2200,7 @@ is a #@$虎" strange label
    for %%i in (1, 2,  3) do (
       for %%j in (%%i) do (
 ::        ^^^ variable.other.readwrite.dosbatch
-::            ^^ keyword.operator.iteration.in.dosbatch
+::            ^^ keyword.control.loop.in.dosbatch
 ::               ^ punctuation.section.set.begin.dosbatch
 ::                ^^^  string.unquoted.dosbatch
 ::                ^^ constant.character.escape.dosbatch

C#/C#.sublime-syntax

@@ -2316,7 +2316,7 @@ contexts:
 
   foreach_var_assignment:
     - match: \bin\b
-      scope: keyword.operator.iteration.in.cs
+      scope: keyword.control.loop.in.cs
       set: line_of_code_in
     - match: (?=\)|\})
       pop: true

C#/tests/syntax_test_C#7.cs

@@ -494,7 +494,7 @@ string Beta
 ///                       ^ punctuation.separator.sequence
 ///                         ^^^ variable.other
 ///                            ^ punctuation.section.sequence.end
-///                              ^^ keyword.operator.iteration.in.cs
+///                              ^^ keyword.control.loop.in.cs
         {
             Console.WriteLine($"{name} is {age} years old.");
         }
@@ -509,7 +509,7 @@ string Beta
 ///                   ^ punctuation.separator.sequence
 ///                     ^ variable.other
 ///                      ^ punctuation.section.sequence.end
-///                        ^^ keyword.operator.iteration.in.cs
+///                        ^^ keyword.control.loop.in.cs
 ///                           ^^^^^^^^^ variable.other
 ///                                    ^ punctuation.section.group.end
         {
@@ -527,7 +527,7 @@ string Beta
 ///                      ^^^ support.type
 ///                          ^ variable.other
 ///                           ^ punctuation.section.sequence.end
-///                             ^^ keyword.operator.iteration.in.cs
+///                             ^^ keyword.control.loop.in.cs
 ///                                ^^^^^^^^^ variable.other
 ///                                         ^ punctuation.section.group.end
         ; // empty statement

C#/tests/syntax_test_GeneralStructure.cs

@@ -291,7 +291,7 @@ public Derived(DateTime exportDate) : base(exportDate) {
 ///                 ^ punctuation.section.group.begin
 ///                  ^^^ storage.type
 ///                      ^^^^ variable.other
-///                           ^^ keyword.operator.iteration.in.cs
+///                           ^^ keyword.control.loop.in.cs
 ///                              ^^^^^^^^^^ variable.other
 ///                                        ^ punctuation.section.group.end
             {}

Python/Python.sublime-syntax

@@ -1561,7 +1561,7 @@ contexts:
       scope: invalid.illegal.missing-in.python
       pop: 1
     - match: in\b
-      scope: keyword.operator.iteration.in.python
+      scope: keyword.control.loop.in.python
       set: for-statement-in
     - include: line-continuation-or-pop
     - include: expression-in-a-statement
@@ -1793,7 +1793,7 @@ contexts:
   for-expression-target-list:
     - meta_scope: meta.expression.generator.python
     - match: in\b
-      scope: keyword.operator.iteration.in.python
+      scope: keyword.control.loop.in.python
       pop: 1
     - match: (?=[)\]}])
       pop: 1

Python/tests/syntax_test_python.py

@@ -911,7 +911,7 @@ def _():
     for
 #   ^^^ keyword.control.loop.for
     b = c in d
-#         ^^ keyword.operator.logical - keyword.operator.iteration.in
+#         ^^ keyword.operator.logical - keyword.control.loop.in
 
     for \
         a \
@@ -924,7 +924,7 @@ def _():
 #   ^^^^^^^^^^^^^^^^^^^^^^^^ meta.statement.loop.for
 #   ^^^^^ storage.modifier.async
 #         ^^^ keyword.control.loop.for
-#               ^^ keyword.operator.iteration.in
+#               ^^ keyword.control.loop.in
 #                          ^ punctuation.section.block.loop.for
         pass
 
@@ -2536,7 +2536,7 @@ def f(): pass
 #     ^ meta.generic-name.python
 #       ^^^ keyword.control.loop.for.generator.python
 #           ^ meta.generic-name.python
-#             ^^ keyword.operator.iteration.in.python
+#             ^^ keyword.control.loop.in.python
 #                ^^^^^^^ meta.function-call.identifier.python variable.function.python
 #                       ^^ meta.function-call.arguments.python
 #                         ^ punctuation.section.sequence.end.python
@@ -2552,7 +2552,7 @@ def f(): pass
 #     ^ meta.generic-name.python
 #       ^^^ keyword.control.loop.for.generator.python
 #           ^ meta.generic-name.python
-#             ^^ keyword.operator.iteration.in.python
+#             ^^ keyword.control.loop.in.python
 #                ^^^^^^^ meta.function-call.identifier.python variable.function.python
 #                       ^^ meta.function-call.arguments.python
 #                         ^ punctuation.section.sequence.end.python
@@ -2730,32 +2730,32 @@ def f(): pass
 #           ^^^^^^^^^^^^^^^^^^^^^^^ meta.sequence.generator.python
 #              ^^^^^^^^ meta.expression.generator
 #              ^^^ keyword.control.loop.for.generator
-#                    ^^ keyword.operator.iteration.in
+#                    ^^ keyword.control.loop.in
 list_ = [i for i in range(100)]
 #       ^^^^^^^^^^^^^^^^^^^^^^^ meta.sequence
 #          ^^^^^^^^ meta.expression.generator
 #          ^^^ keyword.control.loop.for.generator
-#                ^^ keyword.operator.iteration.in
+#                ^^ keyword.control.loop.in
 set_ = {i for i in range(100)}
 #      ^^^^^^^^^^^^^^^^^^^^^^^ meta.set
 #         ^^^^^^^^ meta.expression.generator
 #         ^^^ keyword.control.loop.for.generator
-#               ^^ keyword.operator.iteration.in
+#               ^^ keyword.control.loop.in
 set_ = {x * x for x in y}
 #      ^^^^^^^^^^^^^^^^^^ meta.set
 #             ^^^^^^^^ meta.expression.generator
 #      ^ punctuation.section.set.begin
 #         ^ keyword.operator.arithmetic
 #             ^^^ keyword.control.loop.for.generator
-#                   ^^ keyword.operator.iteration.in
+#                   ^^ keyword.control.loop.in
 #                       ^ punctuation.section.set.end
 set_ = {x ** 2 for x in y}
 #      ^^^^^^^^^^^^^^^^^^ meta.set
 #              ^^^^^^^^ meta.expression.generator
 #      ^ punctuation.section.set.begin
 #         ^^ keyword.operator.arithmetic
 #              ^^^ keyword.control.loop.for.generator
-#                    ^^ keyword.operator.iteration.in
+#                    ^^ keyword.control.loop.in
 #                        ^ punctuation.section.set.end
 dict_ = {i: i for i in range(100)}
 #       ^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping - meta.mapping meta.mapping
@@ -2766,7 +2766,7 @@ def f(): pass
 #            ^^^^^^^^^^^^^^^^^^^^^ meta.mapping.python
 #             ^^^^^^^^ meta.expression.generator
 #             ^^^ keyword.control.loop.for.generator
-#                   ^^ keyword.operator.iteration.in
+#                   ^^ keyword.control.loop.in
 dict_ = {x * x: 1 for x in y}
 #       ^ meta.mapping.python
 #        ^^^^^ meta.mapping.key.python
@@ -2777,7 +2777,7 @@ def f(): pass
 #          ^ keyword.operator.arithmetic
 #             ^ punctuation.separator.key-value
 #                 ^^^ keyword.control.loop.for.generator
-#                       ^^ keyword.operator.iteration.in
+#                       ^^ keyword.control.loop.in
 #                           ^ punctuation.section.mapping.end
 dict_ = {x ** 2: 1 for x in y}
 #       ^ meta.mapping.python
@@ -2789,7 +2789,7 @@ def f(): pass
 #          ^^ keyword.operator.arithmetic
 #              ^ punctuation.separator.key-value
 #                  ^^^ keyword.control.loop.for.generator
-#                        ^^ keyword.operator.iteration.in
+#                        ^^ keyword.control.loop.in
 #                            ^ punctuation.section.mapping.end
 list_ = [i for i in range(100) if i > 0 else -1]
 #       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.sequence
@@ -2799,7 +2799,7 @@ def f(): pass
 
 list2_ = [i in range(10) for i in range(100) if i in range(5, 15)]
 #           ^^ keyword.operator.logical
-#                              ^^ keyword.operator.iteration.in
+#                              ^^ keyword.control.loop.in
 #                                                 ^^ keyword.operator.logical
 
 generator = ((k1, k2, v) for ((k1, k2), v) in xs)
@@ -2863,7 +2863,7 @@ def f(): pass
 #                          ^ keyword.operator.unpacking.sequence.python
 #                           ^ meta.path.python variable.language.anonymous.python
 #                            ^ punctuation.section.sequence.end.python
-#                              ^^ keyword.operator.iteration.in.python
+#                              ^^ keyword.control.loop.in.python
 #                                 ^ punctuation.section.sequence.begin.python
 #                                  ^ punctuation.section.sequence.begin.python
 #                                   ^ punctuation.section.sequence.begin.python
@@ -2891,7 +2891,7 @@ def f(): pass
 #                ^ constant.numeric.value.python
 #                  ^^^ keyword.control.loop.for.generator.python
 #                      ^ meta.generic-name.python
-#                        ^^ keyword.operator.iteration.in.python
+#                        ^^ keyword.control.loop.in.python
 #                           ^^^^^ support.function.builtin.python
 #                                ^ punctuation.section.arguments.begin.python
 #                                 ^^ constant.numeric.value.python
@@ -2911,7 +2911,7 @@ def f(): pass
 #                     ^ constant.numeric.value.python
 #                       ^^^ keyword.control.loop.for.generator.python
 #                           ^ meta.generic-name.python
-#                             ^^ keyword.operator.iteration.in.python
+#                             ^^ keyword.control.loop.in.python
 #                                ^^^^^ support.function.builtin.python
 #                                     ^ punctuation.section.arguments.begin.python
 #                                      ^^ constant.numeric.value.python
@@ -2931,7 +2931,7 @@ def f(): pass
 #               ^ constant.numeric.value.python
 #                 ^^^ keyword.control.loop.for.generator.python
 #                     ^ meta.generic-name.python
-#                       ^^ keyword.operator.iteration.in.python
+#                       ^^ keyword.control.loop.in.python
 #                          ^^^^^ support.function.builtin.python
 #                               ^ punctuation.section.arguments.begin.python
 #                                ^^ constant.numeric.value.python
@@ -2951,10 +2951,10 @@ def f(): pass
 _ = [m
      for cls in self.__class__.mro()
 #    ^^^ keyword.control.loop.for.generator
-#            ^^ keyword.operator.iteration.in
+#            ^^ keyword.control.loop.in
      for m in cls.__dict__]
 #    ^^^ keyword.control.loop.for.generator
-#          ^^ keyword.operator.iteration.in
+#          ^^ keyword.control.loop.in
 
 result = [i async for i in aiter() if i % 2]
 #           ^^^^^ storage.modifier.async
@@ -3031,7 +3031,7 @@ def f(): pass
 #   ^^^ keyword.control.loop.for.generator
     i
     in
-#   ^^ keyword.operator.iteration.in
+#   ^^ keyword.control.loop.in
     range(100)
 )
 

Ruby/Ruby.sublime-syntax

@@ -595,7 +595,7 @@ contexts:
   for-variable:
     # note: variables are not scoped, currently
     - match: \bin\b
-      scope: keyword.operator.iteration.in.ruby
+      scope: keyword.control.loop.in.ruby
       set: after-keyword
     - match: (?=(?:end|do)\b(?![?!]))|$
       pop: true

Ruby/syntax_test_ruby.rb

@@ -1646,7 +1646,7 @@ class MyClass
 
 for item in items do
 #^^ keyword.control.loop.for.ruby
-#        ^^ keyword.operator.iteration.in.ruby
+#        ^^ keyword.control.loop.in.ruby
 #                 ^^ keyword.control.block.do.ruby
 end
 #^^ keyword.control.block.end.ruby