Commit d7017bebb3d70f3ef39bbe340a3f224ba3d9304c
2021-10-05T21:17:13
Birb: Fixed class name false positives (#3111)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195
diff --git a/components/prism-birb.js b/components/prism-birb.js
index 6937117..ff994d8 100644
--- a/components/prism-birb.js
+++ b/components/prism-birb.js
@@ -7,7 +7,7 @@ Prism.languages.birb = Prism.languages.extend('clike', {
/\b[A-Z](?:[\d_]*[a-zA-Z]\w*)?\b/,
// matches variable and function return types (parameters as well).
- /\b[A-Z]\w*(?=\s+\w+\s*[;,=()])/
+ /\b(?:[A-Z]\w*|(?!(?:var|void)\b)[a-z]\w*)(?=\s+\w+\s*[;,=()])/
],
'keyword': /\b(?:assert|break|case|class|const|default|else|enum|final|follows|for|grab|if|nest|new|next|noSeeb|return|static|switch|throw|var|void|while)\b/,
'operator': /\+\+|--|&&|\|\||<<=?|>>=?|~(?:\/=?)?|[+\-*\/%&^|=!<>]=?|\?|:/,
diff --git a/components/prism-birb.min.js b/components/prism-birb.min.js
index 660a540..c61079e 100644
--- a/components/prism-birb.min.js
+++ b/components/prism-birb.min.js
@@ -1 +1 @@
-Prism.languages.birb=Prism.languages.extend("clike",{string:{pattern:/r?("|')(?:\\.|(?!\1)[^\\])*\1/,greedy:!0},"class-name":[/\b[A-Z](?:[\d_]*[a-zA-Z]\w*)?\b/,/\b[A-Z]\w*(?=\s+\w+\s*[;,=()])/],keyword:/\b(?:assert|break|case|class|const|default|else|enum|final|follows|for|grab|if|nest|new|next|noSeeb|return|static|switch|throw|var|void|while)\b/,operator:/\+\+|--|&&|\|\||<<=?|>>=?|~(?:\/=?)?|[+\-*\/%&^|=!<>]=?|\?|:/,variable:/\b[a-z_]\w*\b/}),Prism.languages.insertBefore("birb","function",{metadata:{pattern:/<\w+>/,greedy:!0,alias:"symbol"}});
\ No newline at end of file
+Prism.languages.birb=Prism.languages.extend("clike",{string:{pattern:/r?("|')(?:\\.|(?!\1)[^\\])*\1/,greedy:!0},"class-name":[/\b[A-Z](?:[\d_]*[a-zA-Z]\w*)?\b/,/\b(?:[A-Z]\w*|(?!(?:var|void)\b)[a-z]\w*)(?=\s+\w+\s*[;,=()])/],keyword:/\b(?:assert|break|case|class|const|default|else|enum|final|follows|for|grab|if|nest|new|next|noSeeb|return|static|switch|throw|var|void|while)\b/,operator:/\+\+|--|&&|\|\||<<=?|>>=?|~(?:\/=?)?|[+\-*\/%&^|=!<>]=?|\?|:/,variable:/\b[a-z_]\w*\b/}),Prism.languages.insertBefore("birb","function",{metadata:{pattern:/<\w+>/,greedy:!0,alias:"symbol"}});
\ No newline at end of file
diff --git a/tests/languages/birb/class-name_feature.test b/tests/languages/birb/class-name_feature.test
new file mode 100644
index 0000000..946c751
--- /dev/null
+++ b/tests/languages/birb/class-name_feature.test
@@ -0,0 +1,63 @@
+class Birb {
+ String name = "Birb";
+ int age = 5;
+ bool isMale = true;
+
+ String getName() {
+ return name;
+ }
+}
+
+List list = ["Seeb", 10, false];
+
+----------------------------------------------------
+
+[
+ ["keyword", "class"],
+ ["class-name", "Birb"],
+ ["punctuation", "{"],
+
+ ["class-name", "String"],
+ ["variable", "name"],
+ ["operator", "="],
+ ["string", "\"Birb\""],
+ ["punctuation", ";"],
+
+ ["class-name", "int"],
+ ["variable", "age"],
+ ["operator", "="],
+ ["number", "5"],
+ ["punctuation", ";"],
+
+ ["class-name", "bool"],
+ ["variable", "isMale"],
+ ["operator", "="],
+ ["boolean", "true"],
+ ["punctuation", ";"],
+
+ ["class-name", "String"],
+ ["function", "getName"],
+ ["punctuation", "("],
+ ["punctuation", ")"],
+ ["punctuation", "{"],
+
+ ["class-name", "return"],
+ ["variable", "name"],
+ ["punctuation", ";"],
+
+ ["punctuation", "}"],
+
+ ["punctuation", "}"],
+
+ ["class-name", "List"],
+ ["variable", "list"],
+ ["operator", "="],
+ ["punctuation", "["],
+ ["string", "\"Seeb\""],
+ ["punctuation", ","],
+ ["number", "10"],
+ ["punctuation", ","],
+ ["boolean", "false"],
+ ["punctuation", "]"],
+ ["punctuation", ";"]
+]
diff --git a/tests/languages/birb/function_feature.test b/tests/languages/birb/function_feature.test
index 9b61b4b..ab0b6f8 100644
--- a/tests/languages/birb/function_feature.test
+++ b/tests/languages/birb/function_feature.test
@@ -7,7 +7,7 @@ foo(0);
["keyword", "void"],
["function", "foo"],
["punctuation", "("],
- ["variable", "int"],
+ ["class-name", "int"],
["variable", "a"],
["punctuation", ")"],
["punctuation", "{"],
@@ -22,4 +22,4 @@ foo(0);
----------------------------------------------------
-Checks for functions.
\ No newline at end of file
+Checks for functions.
diff --git a/tests/languages/birb/keyword_feature.test b/tests/languages/birb/keyword_feature.test
index 8d1c1a3..3105071 100644
--- a/tests/languages/birb/keyword_feature.test
+++ b/tests/languages/birb/keyword_feature.test
@@ -1,37 +1,57 @@
-assert break case
+assert;
+break;
+case;
class;
-const default
-else enum
-final
+const;
+default;
+else;
+enum;
+final;
follows;
-for grab
-if nest
+for;
+grab;
+if;
+nest;
next;
new;
-noSeeb return
-static switch
-throw var
-void while
+noSeeb;
+return;
+static;
+switch;
+throw;
+var;
+void;
+while;
----------------------------------------------------
[
- ["keyword", "assert"], ["keyword", "break"], ["keyword", "case"],
+ ["keyword", "assert"], ["punctuation", ";"],
+ ["keyword", "break"], ["punctuation", ";"],
+ ["keyword", "case"], ["punctuation", ";"],
["keyword", "class"], ["punctuation", ";"],
- ["keyword", "const"], ["keyword", "default"],
- ["keyword", "else"], ["keyword", "enum"],
- ["keyword", "final"],
+ ["keyword", "const"], ["punctuation", ";"],
+ ["keyword", "default"], ["punctuation", ";"],
+ ["keyword", "else"], ["punctuation", ";"],
+ ["keyword", "enum"], ["punctuation", ";"],
+ ["keyword", "final"], ["punctuation", ";"],
["keyword", "follows"], ["punctuation", ";"],
- ["keyword", "for"], ["keyword", "grab"],
- ["keyword", "if"], ["keyword", "nest"],
+ ["keyword", "for"], ["punctuation", ";"],
+ ["keyword", "grab"], ["punctuation", ";"],
+ ["keyword", "if"], ["punctuation", ";"],
+ ["keyword", "nest"], ["punctuation", ";"],
["keyword", "next"], ["punctuation", ";"],
["keyword", "new"], ["punctuation", ";"],
- ["keyword", "noSeeb"], ["keyword", "return"],
- ["keyword", "static"], ["keyword", "switch"],
- ["keyword", "throw"], ["keyword", "var"],
- ["keyword", "void"], ["keyword", "while"]
+ ["keyword", "noSeeb"], ["punctuation", ";"],
+ ["keyword", "return"], ["punctuation", ";"],
+ ["keyword", "static"], ["punctuation", ";"],
+ ["keyword", "switch"], ["punctuation", ";"],
+ ["keyword", "throw"], ["punctuation", ";"],
+ ["keyword", "var"], ["punctuation", ";"],
+ ["keyword", "void"], ["punctuation", ";"],
+ ["keyword", "while"], ["punctuation", ";"]
]
----------------------------------------------------
-Checks for all keywords.
\ No newline at end of file
+Checks for all keywords.