Use PCRE unicode character classes, fix comment.line.note highlighting

Author: MattDMo

PythonImproved.YAML-tmLanguage

@@ -24,7 +24,7 @@ patterns:
 
 - comment: Match identifiers in ALL_CAPS as constants, except when followed by `.`, `(`, `'`, or `"`.
   name: constant.other.allcaps.python
-  match: \b([\p{Upper}_][\p{Upper}\p{Digit}_]*)\b(?![\.\(\'\"])
+  match: \b([[:upper:]_][[:upper:][:digit:]_]*)\b(?![\.\(\'\"])
 
 - name: constant.numeric.integer.long.hexadecimal.python
   match: \b(?i:(0x\h+)L)
@@ -46,15 +46,15 @@ patterns:
 
 - comment: Not quite perfect...
   name: constant.numeric.complex.python
-  match: \b(?i:(((\d+(\.(?=[^\p{Alpha}_])\d*)?|(?<=[^\p{Alnum}_])\.\d+)(e[\-\+]?\d+)?))J)
+  match: \b(?i:(((\d+(\.(?=[^[:alpha:]_])\d*)?|(?<=[^[:alnum:]_])\.\d+)(e[\-\+]?\d+)?))J)
 
 - comment: Ummm... why do we have three of these? This is one...
   name: constant.numeric.float.python
-  match: \b(?i:(\d+\.\d*(e[\-\+]?\d+)?))(?=[^\p{Alpha}_])
+  match: \b(?i:(\d+\.\d*(e[\-\+]?\d+)?))(?=[^[:alpha:]_])
 
 - comment: This is two...
   name: constant.numeric.float.python
-  match: (?<=[^\p{Alnum}_])(?i:(\.\d+(e[\-\+]?\d+)?))
+  match: (?<=[^[:alnum:]_])(?i:(\.\d+(e[\-\+]?\d+)?))
 
 - comment: And this is three...
   name: constant.numeric.float.python
@@ -103,7 +103,7 @@ patterns:
 
 - name: meta.class.old-style.python
   contentName: entity.name.type.class.python
-  begin: \s*(class)\s+(?=[\p{Alpha}_][\p{Alnum}_]*\s*\:)
+  begin: \s*(class)\s+(?=[[:alpha:]_][[:alnum:]_]*\s*\:)
   beginCaptures:
     '1': {name: storage.type.class.python}
   end: \s*(:)
@@ -113,7 +113,7 @@ patterns:
   - include: '#entity_name_class'
 
 - name: meta.class.python
-  begin: \s*(class)\s+(?=[\p{Alpha}_][\p{Alnum}_]*\s*\()
+  begin: \s*(class)\s+(?=[[:alpha:]_][[:alnum:]_]*\s*\()
   beginCaptures:
     '1': {name: storage.type.class.python}
   end: (\))\s*(?:(\:)|(.*$\n?))
@@ -123,8 +123,8 @@ patterns:
     '3': {name: invalid.illegal.missing-section-begin.python}
   patterns:
   - contentName: entity.name.type.class.python
-    begin: (?=[\p{Alpha}_][\p{Alnum}_]*)
-    end: (?![\p{Alnum}_])
+    begin: (?=[[:alpha:]_][[:alnum:]_]*)
+    end: (?![[:alnum:]_])
     patterns:
     - include: '#entity_name_class'
   - contentName: meta.class.inheritance.python
@@ -142,7 +142,7 @@ patterns:
       - include: $self
 
 - name: meta.class.python
-  begin: \s*(class)\s+(?=[\p{Alpha}_][\p{Alnum}_]*)
+  begin: \s*(class)\s+(?=[[:alpha:]_][[:alnum:]_]*)
   beginCaptures:
     '1': {name: storage.type.class.python}
   end: (\()|\s*($\n?|#.*$\n?)
@@ -151,22 +151,22 @@ patterns:
     '2': {name: invalid.illegal.missing-inheritance.python}
   patterns:
   - contentName: entity.name.type.class.python
-    begin: (?=[\p{Alpha}_][\p{Alnum}_]*)
-    end: (?![\p{Alnum}_])
+    begin: (?=[[:alpha:]_][[:alnum:]_]*)
+    end: (?![[:alnum:]_])
     patterns:
     - include: '#entity_name_function'
 
 - name: meta.function.python
-  begin: \s*((?:async\s+)?def)\s+(?=[\p{Alpha}_][\p{Alnum}_]*\s*\()
+  begin: \s*((?:async\s+)?def)\s+(?=[[:alpha:]_][[:alnum:]_]*\s*\()
   beginCaptures:
     '1': {name: storage.type.function.python}
   end: (\:)
   endCaptures:
     '1': {name: punctuation.section.function.begin.python}
   patterns:
   - contentName: entity.name.function.python
-    begin: (?=[\p{Alpha}_][\p{Alnum}_]*)
-    end: (?![\p{Alnum}_])
+    begin: (?=[[:alpha:]_][[:alnum:]_]*)
+    end: (?![[:alnum:]_])
     patterns:
     - include: '#entity_name_function'
   - contentName: meta.function.parameters.python
@@ -178,7 +178,7 @@ patterns:
     - include: '#annotated_arguments'
     - include: '#keyword_arguments'
     - include: '#comments'
-    - match: \b(?:(self|cls)|([\p{Alpha}_][\p{Alnum}_]*))\s*(?:(,)|(?=[\n\)]))
+    - match: \b(?:(self|cls)|([[:alpha:]_][[:alnum:]_]*))\s*(?:(,)|(?=[\n\)]))
       captures:
         '1': {name: variable.parameter.function.language.python}
         '2': {name: variable.parameter.function.python}
@@ -192,7 +192,7 @@ patterns:
     - include: $self
 
 - name: meta.function.python
-  begin: \s*((?:async\s+)?def)\s+(?=[\p{Alpha}_][\p{Alnum}_]*)
+  begin: \s*((?:async\s+)?def)\s+(?=[[:alpha:]_][[:alnum:]_]*)
   beginCaptures:
     '1': {name: storage.type.function.python}
   end: (\()|\s*($\n?|#.*$\n?)
@@ -201,8 +201,8 @@ patterns:
     '2': {name: invalid.illegal.missing-parameters.python}
   patterns:
   - contentName: entity.name.function.python
-    begin: (?=[\p{Alpha}_][\p{Alnum}_]*)
-    end: (?![\p{Alnum}_])
+    begin: (?=[[:alpha:]_][[:alnum:]_]*)
+    end: (?![[:alnum:]_])
     patterns:
     - include: '#entity_name_function'
 
@@ -236,20 +236,20 @@ patterns:
     end: (?=\:)
     patterns:
     - include: '#keyword_arguments'
-    - match: \b([\p{Alpha}_][\p{Alnum}_]*)\s*(?:(,)|(?=[\n\)\:]))
+    - match: \b([[:alpha:]_][[:alnum:]_]*)\s*(?:(,)|(?=[\n\)\:]))
       captures:
         '1': {name: variable.parameter.function.python}
         '2': {name: punctuation.separator.parameters.python}
 
 - comment: a decorator may be a function call which returns a decorator.
   name: meta.function.decorator.python
-  begin: ^\s*(?=@\s*[\p{Alpha}_][\p{Alnum}_]*(?:\s*\.\s*[\p{Alpha}_][\p{Alnum}_]*)*\s*\()
+  begin: ^\s*(?=@\s*[[:alpha:]_][[:alnum:]_]*(?:\s*\.\s*[[:alpha:]_][[:alnum:]_]*)*\s*\()
   end: (?<=\))
   endCaptures:
     '1': {name: punctuation.definition.arguments.end.python}
   patterns:
   - contentName: entity.name.function.decorator.python
-    begin: (?=(@)\s*[\p{Alpha}_][\p{Alnum}_]*(?:\s*\.\s*[\p{Alpha}_][\p{Alnum}_]*)*\s*\()
+    begin: (?=(@)\s*[[:alpha:]_][[:alnum:]_]*(?:\s*\.\s*[[:alpha:]_][[:alnum:]_]*)*\s*\()
     beginCaptures:
       '1': {name: punctuation.definition.decorator.python}
     end: (?=\s*\()
@@ -268,10 +268,10 @@ patterns:
 
 - name: meta.function.decorator.python
   contentName: entity.name.function.decorator.python
-  begin: ^\s*(?=@\s*[\p{Alpha}_][\p{Alnum}_]*(?:\s*\.\s*[\p{Alpha}_][\p{Alnum}_]*)*)
+  begin: ^\s*(?=@\s*[[:alpha:]_][[:alnum:]_]*(?:\s*\.\s*[[:alpha:]_][[:alnum:]_]*)*)
   end: (?=\s|$\n?|#)
   patterns:
-  - begin: (?=(@)\s*[\p{Alpha}_][\p{Alnum}_]*(\s*\.\s*[\p{Alpha}_][\p{Alnum}_]*)*)
+  - begin: (?=(@)\s*[[:alpha:]_][[:alnum:]_]*(\s*\.\s*[[:alpha:]_][[:alnum:]_]*)*)
     beginCaptures:
       '1': {name: punctuation.definition.decorator.python}
     end: (?=\s|$\n?|#)
@@ -332,15 +332,15 @@ patterns:
 - include: '#generic_object_names'
 
 - name: meta.function-call.python
-  begin: (?:\.)?([\p{Alpha}_][\p{Alnum}_]*)\s*(?=(\())
+  begin: (?:\.)?([[:alpha:]_][[:alnum:]_]*)\s*(?=(\())
   beginCaptures:
     '1': {name: meta.function-call.generic.python}
     '2': {name: punctuation.definition.arguments.begin.python}
   end: (\))
   endCaptures:
     '1': {name: punctuation.definition.arguments.end.python}
   patterns:
-  - begin: (?=[\p{Alpha}_][\p{Alnum}_]*(?:\.[\p{Alpha}_][\p{Alnum}_]*)*\s*\()
+  - begin: (?=[[:alpha:]_][[:alnum:]_]*(?:\.[[:alpha:]_][[:alnum:]_]*)*\s*\()
     end: (?=\s*\()
     patterns:
     - include: '#dotted_name'
@@ -364,12 +364,12 @@ patterns:
   match: (?<!\.)\b(print)(?=\s|$)
 
 - name: meta.item-access.python
-  begin: (?=[\p{Alpha}_][\p{Alnum}_]*(?:\s*\.\s*[\p{Alpha}_][\p{Alnum}_]*)*\s*\[)
+  begin: (?=[[:alpha:]_][[:alnum:]_]*(?:\s*\.\s*[[:alpha:]_][[:alnum:]_]*)*\s*\[)
   end: (\])
   endCaptures:
     '1': {name: punctuation.definition.arguments.end.python}
   patterns:
-  - begin: (?=[\p{Alpha}_][\p{Alnum}_]*(?:\s*\.\s*[\p{Alpha}_][\p{Alnum}_]*)*\s*\[)
+  - begin: (?=[[:alpha:]_][[:alnum:]_]*(?:\s*\.\s*[[:alpha:]_][[:alnum:]_]*)*\s*\[)
     end: (?=\s*\[)
     patterns:
     - include: '#dotted_name'
@@ -468,7 +468,7 @@ patterns:
 
 repository:
   annotated_arguments:
-    begin: \b([\p{Alpha}_][\p{Alnum}_]*)\s*(:)|(?=\()
+    begin: \b([[:alpha:]_][[:alnum:]_]*)\s*(:)|(?=\()
     beginCaptures:
       '1': {name: variable.parameter.function.python}
       '2': {name: punctuation.separator.annotation.python}
@@ -489,7 +489,7 @@ repository:
     endCaptures:
       '1': {name: punctuation.definition.parameters-group.end.python}
     patterns:
-    - begin: \b([\p{Alpha}_][\p{Alnum}_]*)\s*(:)
+    - begin: \b([[:alpha:]_][[:alnum:]_]*)\s*(:)
       beginCaptures:
         '1': {name: variable.parameter.function.python}
         '2': {name: punctuation.separator.annotation.python}
@@ -498,7 +498,7 @@ repository:
         '1': {name: punctuation.separator.parameters.python}
       patterns:
       - include: $self
-    - begin: \b([\p{Alpha}_][\p{Alnum}_]*)
+    - begin: \b([[:alpha:]_][[:alnum:]_]*)
       beginCaptures:
         '1': {name: variable.parameter.function.python}
       end: \s*(?:(,)|(?=$\n?|\)))
@@ -531,7 +531,7 @@ repository:
       endCaptures:
         '1': {name: punctuation.definition.arguments.end.python}
       patterns:
-      - begin: (?=[\p{Alpha}_][\p{Alnum}_]*(?:\s*\.\s*[\p{Alpha}_][\p{Alnum}_]*)*\s*\()
+      - begin: (?=[[:alpha:]_][[:alnum:]_]*(?:\s*\.\s*[[:alpha:]_][[:alnum:]_]*)*\s*\()
         end: (?=\s*\()
         patterns:
         - include: '#dotted_name'
@@ -603,7 +603,7 @@ repository:
   comments:
     patterns:
     - name: comment.line.note.python
-      match: (#+)\s*(BUG|FIXME|TODO|XXX).*$\n?
+      match: (#+)\s*(BUG|FIXME|TODO|XXX).*$
       captures:
         '1': {name: punctuation.definition.comment.python}
         '2': {name: comment.line.note.notation.python}
@@ -614,7 +614,7 @@ repository:
 
   constant_placeholder:
     name: constant.other.placeholder.python
-    match: (?i:%(\([\p{Lower}_]+\))?#?0?\-?[ ]?\+?([0-9]*|\*)(\.([0-9]*|\*))?[hL]?[\p{Lower}%])
+    match: (?i:%(\([[:lower:]_]+\))?#?0?\-?[ ]?\+?([0-9]*|\*)(\.([0-9]*|\*))?[hL]?[[:lower:]%])
 
   docstrings:
     patterns:
@@ -633,23 +633,23 @@ repository:
     begin: |-
       (?x)(?=
         (?:\.(?!\s+import)\s*)?
-        [\p{Alpha}_][\p{Alnum}_]*
-        (?:\s*\.\s*[\p{Alpha}_][\p{Alnum}_]*)*
+        [[:alpha:]_][[:alnum:]_]*
+        (?:\s*\.\s*[[:alpha:]_][[:alnum:]_]*)*
       )
-    end: (?![\p{Alnum}_\.\s])|(?=(?<!\.)\s+[^.])|$
+    end: (?![[:alnum:]_\.\s])|(?=(?<!\.)\s+[^.])|$
     patterns:
-    - begin: (\.)(?=[\p{Alpha}_][\p{Alnum}_]*)
+    - begin: (\.)(?=[[:alpha:]_][[:alnum:]_]*)
       beginCaptures:
         '1': {name: meta.dot.python}
-      end: (?![\p{Alnum}_])
+      end: (?![[:alnum:]_])
       patterns:
       - include: '#builtin_functions_name'
       - include: '#magic_function_names'
       - include: '#magic_variable_names'
       - include: '#generic_names'
       - include: '#illegal_names'
-    - begin: (?<!\.)(?=[\p{Alpha}_][\p{Alnum}_]*)
-      end: (?![\p{Alnum}_])
+    - begin: (?<!\.)(?=[[:alpha:]_][[:alnum:]_]*)
+      end: (?![[:alnum:]_])
       patterns:
       - include: '#builtin_types'
       - include: '#builtin_functions_name'
@@ -688,18 +688,18 @@ repository:
             Memory | Name | NotImplemented | OS | Overflow | Reference | Runtime |
             Recursion | Standard | Syntax | System | Tab | Type | UnboundLocal |
             Unicode(Encode | Decode | Translate)? | Value | VMS | Windows |
-            ZeroDivision | ([\p{Alpha}_][\p{Alnum}_]*))
+            ZeroDivision | ([[:alpha:]_][[:alnum:]_]*))
           ?Error
           |
           (
             (Pending)?Deprecation | Bytes | Future | Import | Resource |
-            Runtime | Syntax | Unicode | User | [\p{Alpha}_][\p{Alnum}_]*)
+            Runtime | Syntax | Unicode | User | [[:alpha:]_][[:alnum:]_]*)
           ?Warning
           |
           SystemExit | Stop(Async)?Iteration | NotImplemented |
           KeyboardInterrupt | GeneratorExit
           |
-          ([\p{Alpha}_][\p{Alnum}_]*)
+          ([[:alpha:]_][[:alnum:]_]*)
           ?Exception
         )
       \b
@@ -744,10 +744,10 @@ repository:
 
   generic_names:
     name: meta.identifier.python
-    match: '[\p{Alpha}_][\p{Alnum}_]*'
+    match: '[[:alpha:]_][[:alnum:]_]*'
 
   generic_object_names:
-    match: (\.\b([\p{Alpha}_][\p{Alnum}_]*)\b(?!\(|\[)|\b([\p{Alpha}_][\p{Alnum}_]*)\b\.)
+    match: (\.\b([[:alpha:]_][[:alnum:]_]*)\b(?!\(|\[)|\b([[:alpha:]_][[:alnum:]_]*)\b\.)
 
   illegal_names:
     comment: 'from Lib/keyword.py, in kwlist. `async` and `await` not keywords
@@ -763,7 +763,7 @@ repository:
       \b
 
   keyword_arguments:
-    begin: \b([\p{Alpha}_][\p{Alnum}_]*)\s*(=)(?!=)
+    begin: \b([[:alpha:]_][[:alnum:]_]*)\s*(=)(?!=)
     beginCaptures:
       '1': {name: variable.parameter.function.keyword.python}
       '2': {name: keyword.operator.assignment.python}
@@ -847,7 +847,7 @@ repository:
       endCaptures:
         '1': {name: punctuation.definition.arguments.end.python}
       patterns:
-      - begin: (?=[\p{Alpha}_][\p{Alnum}_]*(?:\s*\.\s*[\p{Alpha}_][\p{Alnum}_]*)*\s*\()
+      - begin: (?=[[:alpha:]_][[:alnum:]_]*(?:\s*\.\s*[[:alpha:]_][[:alnum:]_]*)*\s*\()
         end: (?=\s*\()
         patterns:
         - include: '#dotted_name'
@@ -891,7 +891,7 @@ repository:
         (
           (?<argname>
             (
-              (?<identifier>([\p{Alpha}_][\p{Alnum}_]*)) |
+              (?<identifier>([[:alpha:]_][[:alnum:]_]*)) |
               (?<integer>
                 ([1-9]\d* | 0) |
                 (
@@ -1428,6 +1428,6 @@ repository:
 author: Matt Morrison @MattDMo [email protected]
 bundleUUID: EB590797-FBEE-4BEA-A140-8339AFD2CE1B
 firstLineMatch: ^#!/.*\bpython[0-9.-]*\b
-foldingStartMarker: ^\s*(((?:async\s+)?def)|class)\s+([.\p{Alnum}_ <]+)\s*(\((.*)\))?\s*:|\{\s*$|\(\s*$|\[\s*$|^\s*"""(?=.)(?!.*""")
+foldingStartMarker: ^\s*(((?:async\s+)?def)|class)\s+([.[:alnum:]_ <]+)\s*(\((.*)\))?\s*:|\{\s*$|\(\s*$|\[\s*$|^\s*"""(?=.)(?!.*""")
 foldingStopMarker: ^\s*$|^\s*\}|^\s*\]|^\s*\)|^\s*"""\s*$
 keyEquivalent: ^~P