[Perl] Unify namespace scopes (sublimehq#3352)

This commit... 1. scopes `CORE::` support.namespace as it is a builtin namespace to explicitly address core functionality 2. scopes qualifiers in `package` and `require` statements `variable.namespace`
jrappen · May 31, 2022 · ee0146e · ee0146e
1 parent 83a8f3e
commit ee0146e
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 43 deletions.
diff --git a/Perl/Perl.sublime-syntax b/Perl/Perl.sublime-syntax
@@ -411,16 +411,18 @@ contexts:
   qualified-namespace:
     - match: ({{identifier}})?(::)
       captures:
-        1: entity.name.namespace.perl
+        1: variable.namespace.perl
         2: punctuation.accessor.double-colon.perl
-      set:
-        - meta_scope: meta.path.perl
-        - match: ({{identifier}})(::)
-          captures:
-            1: entity.name.namespace.perl
-            2: punctuation.accessor.double-colon.perl
-        - include: unqualified-namespace
-        - include: immediately-pop
+      set: qualified-namespace-content
+
+  qualified-namespace-content:
+    - meta_scope: meta.path.perl
+    - match: ({{identifier}})(::)
+      captures:
+        1: variable.namespace.perl
+        2: punctuation.accessor.double-colon.perl
+    - include: unqualified-namespace
+    - include: immediately-pop
 
   unqualified-namespace:
     - match: '{{identifier}}'
@@ -1066,7 +1068,7 @@ contexts:
     # The `meta.path` is not applied for simplicity reasons.
     - match: \b(CORE)(::)(?={{reserved_words}})
       captures:
-        1: variable.namespace.perl
+        1: support.namespace.perl
         2: punctuation.accessor.double-colon.perl
     # declaration
     - match: \b(?:{{storage_keywords}}){{break}}
@@ -1797,11 +1799,12 @@ contexts:
 ###[ VARIABLES ]##############################################################
 
   qualified-variables:
-    - match: ([$@%*]#?)({{identifier}})?(::)
+    - match: ([$@%*]#?)(?:(CORE)|({{identifier}}))?(::)
       captures:
         1: punctuation.definition.variable.perl
-        2: variable.namespace.perl
-        3: punctuation.accessor.double-colon.perl
+        2: support.namespace.perl
+        3: variable.namespace.perl
+        4: punctuation.accessor.double-colon.perl
       push: [maybe-item-access, qualified-variables-path]
 
   qualified-variables-path:

diff --git a/Perl/syntax_test_perl.pl b/Perl/syntax_test_perl.pl
@@ -206,7 +206,7 @@ =head1 B<--param>
 # <- meta.format.perl punctuation.terminator.format.perl
 
 CORE::format if::format =
-#^^^ variable.namespace.perl - meta.format
+#^^^ support.namespace.perl - meta.format
 #     ^^^^^^^^^^^^^^^^^^^^ meta.format.perl
 #   ^^ punctuation.accessor.double-colon.perl
 #     ^^^^^^ storage.type.format.perl
@@ -1718,25 +1718,25 @@ =head1 B<--param>
 #             ^ punctuation.terminator.statement.perl
 
   CORE::q//
-# ^^^^ variable.namespace.perl
+# ^^^^ support.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^ support.function.perl
 #        ^ punctuation.section.generic.begin.perl
 #         ^ punctuation.section.generic.end.perl
   CORE::qq//
-# ^^^^ variable.namespace.perl
+# ^^^^ support.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^^ support.function.perl
 #         ^ punctuation.section.generic.begin.perl
 #          ^ punctuation.section.generic.end.perl
   CORE::qx//
-# ^^^^ variable.namespace.perl
+# ^^^^ support.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^^ support.function.perl
 #         ^ punctuation.section.generic.begin.perl
 #          ^ punctuation.section.generic.end.perl
   CORE::qw//
-# ^^^^ variable.namespace.perl
+# ^^^^ support.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^^ support.function.perl
 #         ^ punctuation.section.generic.begin.perl
@@ -1830,11 +1830,11 @@ =head1 B<--param>
 #             ^ punctuation.terminator.statement.perl
 #               ^ comment.line.number-sign.perl punctuation.definition.comment.perl
   CORE::m
-# ^^^^ variable.namespace.perl
+# ^^^^ support.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^ support.function.perl
   CORE::m//g
-# ^^^^ variable.namespace.perl
+# ^^^^ support.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^ support.function.perl
 #        ^ punctuation.section.generic.begin.perl
@@ -2026,11 +2026,11 @@ =head1 B<--param>
 #                ^ constant.language.flags.regexp.perl
 #                 ^ punctuation.terminator.statement.perl
   CORE::s
-# ^^^^ variable.namespace.perl
+# ^^^^ support.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^ support.function.perl
   CORE::s///g
-# ^^^^ variable.namespace.perl
+# ^^^^ support.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^ support.function.perl
 #        ^ punctuation.section.generic.begin.perl
@@ -2062,11 +2062,11 @@ =head1 B<--param>
 #                     ^^^^ constant.language.flags.regexp.perl
 #                         ^ punctuation.terminator.statement.perl
   CORE::tr
-# ^^^^ variable.namespace.perl
+# ^^^^ support.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^^ support.function.perl
   CORE::tr///g
-# ^^^^ variable.namespace.perl
+# ^^^^ support.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^^ support.function.perl
 #         ^ punctuation.section.generic.begin.perl
@@ -2098,11 +2098,11 @@ =head1 B<--param>
 #                        ^^^^ constant.language.flags.regexp.perl
 #                            ^ punctuation.terminator.statement.perl
   CORE::y
-# ^^^^ variable.namespace.perl
+# ^^^^ support.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^ support.function.perl
   CORE::y///g
-# ^^^^ variable.namespace.perl
+# ^^^^ support.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^ support.function.perl
 #        ^ punctuation.section.generic.begin.perl
@@ -2820,6 +2820,13 @@ =head1 B<--param>
 #                  ^^^^ meta.item-access.perl
 #                     ^ punctuation.section.item-access.end.perl
 
+  $CORE::foo
+# ^^^^^^^^^^ meta.path.perl
+# ^ punctuation.definition.variable.perl
+#  ^^^^ support.namespace.perl
+#      ^^ punctuation.accessor.double-colon.perl
+#        ^^^ variable.other.readwrite.perl
+
 ###[ VARIABLE DEREFERENCING ]#################################################
 
   $$ref  $$$refref $$$$refrefref
@@ -3300,7 +3307,7 @@ =head1 B<--param>
 #         ^^^^^^^^ meta.namespace.perl meta.path.perl
 #                 ^ - meta.namespace
 # ^^^^^^^ keyword.declaration.namespace.perl
-#         ^^ entity.name.namespace.perl
+#         ^^ variable.namespace.perl
 #           ^^ punctuation.accessor.double-colon.perl
 #             ^^^^ entity.name.namespace.perl
 #                 ^ punctuation.terminator.statement.perl
@@ -3309,7 +3316,7 @@ =head1 B<--param>
 #         ^^^^^^^^ meta.namespace.perl meta.path.perl
 #                 ^ - meta.namespace
 # ^^^^^^^ keyword.declaration.namespace.perl
-#         ^^ entity.name.namespace.perl
+#         ^^ variable.namespace.perl
 #           ^^ punctuation.accessor.double-colon.perl
 #             ^^^^ entity.name.namespace.perl
 #                 ^ punctuation.terminator.statement.perl
@@ -3318,7 +3325,7 @@ =head1 B<--param>
 #         ^^^^^^^^ meta.namespace.perl meta.path.perl
 #                 ^ - meta.namespace
 # ^^^^^^^ keyword.declaration.namespace.perl
-#         ^^ entity.name.namespace.perl
+#         ^^ variable.namespace.perl
 #           ^^ punctuation.accessor.double-colon.perl
 #             ^^^^ entity.name.namespace.perl
 #                 ^ punctuation.terminator.statement.perl
@@ -3327,9 +3334,9 @@ =head1 B<--param>
 #         ^^^^^^^^^^^^^^ meta.namespace.perl meta.path.perl
 #                       ^ - meta.namespace
 # ^^^^^^^ keyword.declaration.namespace.perl
-#         ^^ entity.name.namespace.perl
+#         ^^ variable.namespace.perl
 #           ^^ punctuation.accessor.double-colon.perl
-#             ^^^^ entity.name.namespace.perl
+#             ^^^^ variable.namespace.perl
 #                 ^^ punctuation.accessor.double-colon.perl
 #                   ^^^^ entity.name.namespace.perl
 #                       ^ punctuation.terminator.statement.perl
@@ -3339,7 +3346,7 @@ =head1 B<--param>
     NS::NAME
 # ^^ meta.namespace.perl - meta.path
 #   ^^^^^^^^ meta.namespace.perl meta.path.perl
-#   ^^ entity.name.namespace.perl
+#   ^^ variable.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^^^^ entity.name.namespace.perl
     v5.24.1;
@@ -3465,7 +3472,7 @@ =head1 B<--param>
 #         ^^^^^^^^ meta.preprocessor.require.perl meta.path.perl
 #                 ^ - meta.preprocessor
 # ^^^^^^^ keyword.control.import.require.perl
-#         ^^^ entity.name.namespace.perl
+#         ^^^ variable.namespace.perl
 #            ^^ punctuation.accessor.double-colon.perl
 #              ^^^ entity.name.namespace.perl
 #                 ^ punctuation.terminator.statement.perl
@@ -3476,7 +3483,7 @@ =head1 B<--param>
 # ^^ meta.preprocessor.require.perl - meta.path
 #   ^^^^^^^^ meta.preprocessor.require.perl meta.path.perl
 #           ^ - meta.preprocessor
-#   ^^^ entity.name.namespace.perl
+#   ^^^ variable.namespace.perl
 #      ^^ punctuation.accessor.double-colon.perl
 #        ^^^ entity.name.namespace.perl
 #           ^ punctuation.terminator.statement.perl
@@ -3516,7 +3523,7 @@ =head1 B<--param>
   CORE::require;
 # ^^^^^^ - meta.preprocessor
 #       ^^^^^^^ meta.preprocessor.require.perl
-# ^^^^ variable.namespace.perl
+# ^^^^ support.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^^^^^^^ keyword.control.import.require.perl
 #              ^ punctuation.terminator.statement.perl
@@ -3545,7 +3552,7 @@ =head1 B<--param>
 #                      ^ meta.preprocessor.require.perl - meta.path
 #                       ^^^^^^^^^^^^^ - meta.preprocessor.require.perl
 #      ^^^^^^^ keyword.control.import.require.perl
-#              ^ meta.path.perl entity.name.namespace.perl
+#              ^ meta.path.perl variable.namespace.perl
 #               ^^ meta.path.perl punctuation.accessor.double-colon.perl
 #                 ^^^^^ meta.path.perl entity.name.namespace.perl
 #                       ^^^ keyword.operator.logical.perl
@@ -3581,7 +3588,7 @@ =head1 B<--param>
 #     ^^^^^^^^ meta.preprocessor.use.perl meta.path.perl
 #             ^ - meta.preprocessor - meta.path
 # ^^^ keyword.control.import.use.perl
-#     ^^ entity.name.namespace.perl
+#     ^^ variable.namespace.perl
 #       ^^ punctuation.accessor.double-colon.perl
 #         ^^^^ entity.name.namespace.perl
 #             ^ punctuation.terminator.statement.perl
@@ -3592,7 +3599,7 @@ =head1 B<--param>
 #                        ^^^^^^^^^ meta.preprocessor.use.perl meta.path.perl
 #                                 ^ - meta.preprocessor - meta.path
 # ^^^ keyword.control.import.use.perl
-#     ^^^^^^^^ entity.name.namespace.perl
+#     ^^^^^^^^ variable.namespace.perl
 #             ^^ meta.path.perl punctuation.accessor.double-colon.perl
 #               ^^^^^^^^ entity.name.namespace.perl
 #                        ^^^ variable.namespace.perl
@@ -3602,7 +3609,7 @@ =head1 B<--param>
   CORE::use;
 # ^^^^^^ - meta.preprocessor
 #       ^^^ meta.preprocessor.use.perl
-# ^^^^ variable.namespace.perl
+# ^^^^ support.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^^^ keyword.control.import.use.perl
 #          ^ punctuation.terminator.statement.perl
@@ -3624,7 +3631,7 @@ =head1 B<--param>
   CORE::no;
 # ^^^^^^ - meta.preprocessor
 #       ^^ meta.preprocessor.no.perl
-# ^^^^ variable.namespace.perl
+# ^^^^ support.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^^ keyword.control.import.no.perl
 #         ^ punctuation.terminator.statement.perl
@@ -3692,7 +3699,7 @@ =head1 B<--param>
 #                           ^ punctuation.terminator.statement.perl
 #                             ^ punctuation.section.block.end.perl
   CORE::my
-# ^^^^ variable.namespace.perl
+# ^^^^ support.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^^ keyword.declaration.variable.perl
   core::my
@@ -4605,7 +4612,7 @@ =head1 B<--param>
   CORE::sub ;
 # ^^^^^^ - meta.function.perl
 #       ^^^^ meta.function.perl
-# ^^^^ variable.namespace.perl
+# ^^^^ support.namespace.perl
 #     ^^ punctuation.accessor.double-colon.perl
 #       ^^^ keyword.declaration.function.perl
 #           ^ punctuation.terminator.statement.perl
@@ -5423,7 +5430,7 @@ =head1 B<--param>
 #                ^ punctuation.section.group.end.perl
 #                  ^ punctuation.section.block.begin.perl
     CORE::break;
-#   ^^^^ variable.namespace.perl
+#   ^^^^ support.namespace.perl
 #       ^^ punctuation.accessor.double-colon.perl
 #         ^^^^^ keyword.control.flow.break.perl
   }