Birb: Fixed class name false positives

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': /\+\+|--|&&|\|\||<<=?|>>=?|~(?:\/=?)?|[+\-*\/%&^|=!<>]=?|\?|:/,

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", ";"]
+]

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.
+Checks for functions.

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.
+Checks for all keywords.