[Python] Ensure union operator scope consistency

This commit scopes `|` as normal arithmetic operator in type comments for
consistency reasons, because type hints in annotations (variables, parameters,
return-type) need to use normal expression syntax.

Python/Python.sublime-syntax

@@ -514,12 +514,15 @@ contexts:
     - include: type-hint-body
 
   type-constants:
+    # Note: Enables `None = None` in type hints.
     - match: None\b
       scope: constant.language.null.python
 
   type-separators:
+    # Note: Scoped as normal arithmetic operator for consistency reasons with
+    #       type-hints in annotations, which share syntax with normal expressions
     - match: \|
-      scope: keyword.operator.logical.union.python
+      scope: keyword.operator.arithmetic.python
     - include: sequence-separators
 
 ###[ DECORATORS ]#############################################################
@@ -911,7 +914,6 @@ contexts:
         - function-parameter-annotation-continue
         - function-parameter-annotation-end
     - include: type-constants
-    - include: type-separators
     - include: expression-in-a-group
 
   function-parameter-annotation-continue:
@@ -997,7 +999,6 @@ contexts:
     - include: line-continuation-or-pop
     - include: illegal-assignment-expressions
     - include: type-constants
-    - include: type-separators
     - include: expression-in-a-statement
 
   function-definition-end:

Python/tests/syntax_test_python.py

@@ -1720,7 +1720,7 @@ def type_annotations(param1: int, param2: MyType | None , param3: max(2, 3), par
 #                                       ^ punctuation.separator.annotation
 #                                         ^^^^^^^^^^^^^ meta.type.python
 #                                         ^^^^^^ meta.path.python meta.generic-name.python
-#                                                ^ keyword.operator.logical.union.python
+#                                                ^ keyword.operator.arithmetic.python
 #                                                  ^^^^ constant.language.null.python
 #                                                       ^ punctuation.separator.parameters
 #                                                         ^^^^^^ variable.parameter
@@ -1821,7 +1821,7 @@ def type_annotation_with_defaults(foo: str | None = None)
 #                                                ^ meta.function.parameters.annotation.python - meta.function.parameters.default-value - meta.type
 #                                                 ^^^^^^ meta.function.parameters.default-value.python - meta.function.parameters.annotation
 #                                      ^^^ support.type.python
-#                                          ^ keyword.operator.logical.union.python
+#                                          ^ keyword.operator.arithmetic.python
 #                                            ^^^^ constant.language.null.python
 #                                                 ^ keyword.operator.assignment.python
 #                                                   ^^^^ constant.language.null.python
@@ -2991,7 +2991,7 @@ def __init__(self):
 #              ^^^^^^^^ - meta.type
 #  ^ punctuation.separator.annotation.python
 #    ^^^ support.type.python
-#        ^ keyword.operator.logical.union.python
+#        ^ keyword.operator.arithmetic.python
 #          ^^^^ constant.language.null.python
 #               ^ keyword.operator.assignment.python
 #                 ^^^^ constant.language.null.python
@@ -3002,11 +3002,36 @@ def __init__(self):
 #              ^^^^^^^ - meta.type
 #  ^ punctuation.separator.annotation.python
 #    ^^^ support.type.python
-#        ^ keyword.operator.logical.union.python
+#        ^ keyword.operator.arithmetic.python
 #          ^^^^ constant.language.null.python
 #               ^ keyword.operator.assignment.python
 #                 ^^^ string.quoted.single.python
 
+bar: (str | None) = 'b'
+#  ^^ - meta.type
+#    ^^^^^^^^^^^^ meta.type.python meta.group.python
+#                ^^^^^^^ - meta.type
+#  ^ punctuation.separator.annotation.python
+#     ^^^ support.type.python
+#         ^ keyword.operator.arithmetic.python
+#           ^^^^ constant.language.null.python
+#                 ^ keyword.operator.assignment.python
+#                   ^^^ string.quoted.single.python
+
+bar: list[str | None] = 'b'
+#  ^^ - meta.type
+#    ^^^^ meta.type.python meta.path.python support.type.python
+#        ^^^^^^^^^^^^ meta.type.python meta.brackets.python
+#                    ^^^^^^^ - meta.type
+#  ^ punctuation.separator.annotation.python
+#        ^ punctuation.section.brackets.begin.python
+#         ^^^ support.type.python
+#             ^ keyword.operator.arithmetic.python
+#               ^^^^ constant.language.null.python
+#                   ^ punctuation.section.brackets.end.python
+#                     ^ keyword.operator.assignment.python
+#                       ^^^ string.quoted.single.python
+
 foo: int := 0
 #  ^ punctuation.separator.annotation.python
 #    ^^^ meta.type.python meta.path.python support.type.python
@@ -3172,7 +3197,7 @@ class Starship:
 #                      ^^^ support.type.python
 #                         ^ punctuation.separator.sequence.python
 #                           ^^^ support.type.python
-#                               ^ keyword.operator.logical.union.python
+#                               ^ keyword.operator.arithmetic.python
 #                                 ^^^ support.type.python
 #                                    ^ punctuation.section.brackets.end.python