Use \p{L} instead of \p{Alpha}. (#214)

The "Alpha" category is not defined for unicode input, and the "letter" category seems to be equivalent. See https://www.regular-expressions.info/unicode.html
toitware · May 19, 2023 · 2f3869e · 2f3869e
1 parent dbda69a
commit 2f3869e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/vscode/syntaxes/toit.tmLanguage.json b/vscode/syntaxes/toit.tmLanguage.json
@@ -147,8 +147,8 @@
         },
         {
           "name": "meta.toplevel.signature",
-          "begin": "(_?\\p{Alpha}\\w*[=]?)",
-          "end": "(?=\\:(?![_\\p{Alpha}])|^\\s{0,2}(?:[^\\s/]|/[^/*]))",
+          "begin": "(_?\\p{L}\\w*[=]?)",
+          "end": "(?=\\:(?![_\\p{L}])|^\\s{0,2}(?:[^\\s/]|/[^/*]))",
           "beginCaptures": {
             "1": {
               "name": "storage.type.function"
@@ -189,8 +189,8 @@
         },
         {
           "name": "meta.member.signature",
-          "begin": "(\\bconstructor\\b)(\\._?\\p{Alpha}\\w*)?|(_?\\p{Alpha}\\w*[=]?|==|<<|>>>|>>|<=|>=|<|>|\\+|-|\\*|/|%|\\^|&|\\||\\[\\]\\=|\\[\\]|\\[\\.\\.\\])",
-          "end": "(?=\\:(?![_\\p{Alpha}])|^\\s{0,4}(?:[^\\s/]|/[^/*]))",
+          "begin": "(\\bconstructor\\b)(\\._?\\p{L}\\w*)?|(_?\\p{L}\\w*[=]?|==|<<|>>>|>>|<=|>=|<|>|\\+|-|\\*|/|%|\\^|&|\\||\\[\\]\\=|\\[\\]|\\[\\.\\.\\])",
+          "end": "(?=\\:(?![_\\p{L}])|^\\s{0,4}(?:[^\\s/]|/[^/*]))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.toit"
@@ -239,7 +239,7 @@
         },
         {
           "name": "meta.parameter.setting.toit",
-          "match": "(--)?(this)?\\.(_?\\p{Alpha}\\w*)",
+          "match": "(--)?(this)?\\.(_?\\p{L}\\w*)",
           "captures": {
             "1": {
               "name": "variable.parameter.named.setting.toit"
@@ -263,7 +263,7 @@
         },
         {
           "name": "variable.parameter.toit",
-          "match": "(--)?(:)?(_?\\p{Alpha}\\w*)",
+          "match": "(--)?(:)?(_?\\p{L}\\w*)",
           "captures": {
             "2": {
               "name": "keyword.control.block_marker.toit"
@@ -319,7 +319,7 @@
       "patterns": [
         {
           "name": "entity.name.type.annotation.toit",
-          "begin": "(/|->) *(?=_?\\p{Alpha})",
+          "begin": "(/|->) *(?=_?\\p{L})",
           "end": "(?=[^\\w.?])",
           "beginCaptures": {
             "1": {

diff --git a/vscode/syntaxes/toit.tmLanguage.yaml b/vscode/syntaxes/toit.tmLanguage.yaml
@@ -94,10 +94,10 @@ repository:
     - include: "#comment"
     - include: "#type-annotation"
     - name: meta.toplevel.signature
-      begin: (_?\p{Alpha}\w*[=]?)
+      begin: (_?\p{L}\w*[=]?)
       # Ends (and thus starts the body) with a ":" (unless that's for a block),
       #   or something that isn't intended by 2.
-      end: (?=\:(?![_\p{Alpha}])|^\s{0,2}(?:[^\s/]|/[^/*]))
+      end: (?=\:(?![_\p{L}])|^\s{0,2}(?:[^\s/]|/[^/*]))
       beginCaptures:
         1:
           name: storage.type.function
@@ -123,10 +123,10 @@ repository:
     - name: keyword.control.toit
       match: (\bstatic\b|\babstract\b|\boperator\b)
     - name: meta.member.signature
-      begin: (\bconstructor\b)(\._?\p{Alpha}\w*)?|(_?\p{Alpha}\w*[=]?|==|<<|>>>|>>|<=|>=|<|>|\+|-|\*|/|%|\^|&|\||\[\]\=|\[\]|\[\.\.\])
+      begin: (\bconstructor\b)(\._?\p{L}\w*)?|(_?\p{L}\w*[=]?|==|<<|>>>|>>|<=|>=|<|>|\+|-|\*|/|%|\^|&|\||\[\]\=|\[\]|\[\.\.\])
       # Ends (and thus starts the body) with a ":" (unless that's for a block),
       #   or something that isn't intended by 4.
-      end: (?=\:(?![_\p{Alpha}])|^\s{0,4}(?:[^\s/]|/[^/*]))
+      end: (?=\:(?![_\p{L}])|^\s{0,4}(?:[^\s/]|/[^/*]))
       beginCaptures:
         1:
           name: keyword.control.toit
@@ -159,7 +159,7 @@ repository:
     - include: "#type-annotation"
     - include: "#comment"
     - name: meta.parameter.setting.toit
-      match: (--)?(this)?\.(_?\p{Alpha}\w*)  # Don't color the dot. Makes it nicer?
+      match: (--)?(this)?\.(_?\p{L}\w*)  # Don't color the dot. Makes it nicer?
       captures:
         1:
           name: variable.parameter.named.setting.toit
@@ -171,7 +171,7 @@ repository:
           patterns:
           - include: "#invalid_non_expression"
     - name: variable.parameter.toit
-      match: (--)?(:)?(_?\p{Alpha}\w*)
+      match: (--)?(:)?(_?\p{L}\w*)
       captures:
         2:
           name: keyword.control.block_marker.toit
@@ -197,7 +197,7 @@ repository:
   type-annotation:
     patterns:
     - name: entity.name.type.annotation.toit
-      begin: '(/|->) *(?=_?\p{Alpha})'
+      begin: '(/|->) *(?=_?\p{L})'
       end: (?=[^\w.?])
       beginCaptures:
         1: