Java: Added char token (#3217)

PrismJS · Dec 5, 2021 · 0a9f909 · 0a9f909
1 parent fa55492
commit 0a9f909
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 11 deletions.
diff --git a/components/prism-java.js b/components/prism-java.js
@@ -21,6 +21,11 @@
 	};
 
 	Prism.languages.java = Prism.languages.extend('clike', {
+		'string': {
+			pattern: /(^|[^\\])"(?:\\.|[^"\\\r\n])*"/,
+			lookbehind: true,
+			greedy: true
+		},
 		'class-name': [
 			className,
 			{
@@ -52,6 +57,10 @@
 			pattern: /"""[ \t]*[\r\n](?:(?:"|"")?(?:\\.|[^"\\]))*"""/,
 			greedy: true,
 			alias: 'string'
+		},
+		'char': {
+			pattern: /'(?:\\.|[^'\\\r\n]){1,6}'/,
+			greedy: true
 		}
 	});
 

diff --git a/components/prism-java.min.js b/components/prism-java.min.js
diff --git a/tests/languages/java/char_feature.test b/tests/languages/java/char_feature.test
@@ -0,0 +1,11 @@
+'A'
+'\n'
+'\u0041'
+
+----------------------------------------------------
+
+[
+	["char", "'A'"],
+	["char", "'\\n'"],
+	["char", "'\\u0041'"]
+]
diff --git a/tests/languages/java/generics_feature.test b/tests/languages/java/generics_feature.test
@@ -83,7 +83,7 @@ if (a<6&&b>6){}
 	["punctuation", "("],
 	["number", "12.2585"],
 	["punctuation", ","],
-	["string", "'C'"],
+	["char", "'C'"],
 	["punctuation", ")"],
 	["punctuation", ";"],
 

diff --git a/tests/languages/java/string_feature.test b/tests/languages/java/string_feature.test
@@ -1,3 +1,4 @@
+""
 "foo"
 "\"foo\""
 
@@ -20,6 +21,7 @@ String empty = """
 ----------------------------------------------------
 
 [
+	["string", "\"\""],
 	["string", "\"foo\""],
 	["string", "\"\\\"foo\\\"\""],
 

diff --git a/tests/languages/scala/char_feature.test b/tests/languages/scala/char_feature.test
@@ -0,0 +1,13 @@
+'a'
+'\u0041'
+'\n'
+'\t'
+
+----------------------------------------------------
+
+[
+	["char", "'a'"],
+	["char", "'\\u0041'"],
+	["char", "'\\n'"],
+	["char", "'\\t'"]
+]
diff --git a/tests/languages/scala/string_feature.test b/tests/languages/scala/string_feature.test
@@ -1,8 +1,3 @@
-'a'
-'\u0041'
-'\n'
-'\t'
-
 ""
 "fo\"obar"
 
@@ -17,12 +12,9 @@ bar"""
 ----------------------------------------------------
 
 [
-	["string", "'a'"],
-	["string", "'\\u0041'"],
-	["string", "'\\n'"],
-	["string", "'\\t'"],
 	["string", "\"\""],
 	["string", "\"fo\\\"obar\""],
+
 	["triple-quoted-string", "\"\"\"fo\"o\r\nbar\"\"\""],
 	["triple-quoted-string", "\"\"\"fo\"o\r\n// comment\r\nbar\"\"\""],
 	["string", "\"foo /* comment */ bar\""],