From 7a6c4358bafa55d71dc40539968388058304d9c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Merlin=20B=C3=B6gershausen?=
 <merlin.boegershausen@rwth-aachen.de>
Date: Mon, 24 Oct 2022 21:04:31 +0200
Subject: [PATCH 1/2] add yield as keyword to java and tests

---
 CHANGES.md                         |  3 ++-
 src/languages/java.js              |  3 ++-
 test/markup/java/switch.expect.txt | 13 +++++++++++++
 test/markup/java/switch.txt        | 13 +++++++++++++
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 test/markup/java/switch.expect.txt
 create mode 100644 test/markup/java/switch.txt

diff --git a/CHANGES.md b/CHANGES.md
index 87eba192ed..6d8ea3f597 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@ Grammars:
 - fix(bash) recognize the `((` keyword [Nick Chambers][]
 - fix(nix) support escaped dollar signs in strings [h7x4][]
 - enh(cmake) support bracket comments [Hirse][]
+- enh(java) add yield keyword to java [MBoegers][]
 
 [Josh Goebel]: https://github.com/joshgoebel
 [Josh Temple]: https://github.com/joshtemple
@@ -21,7 +22,7 @@ Grammars:
 [Nick Chambers]: https://github.com/uplime
 [h7x4]: https://github.com/h7x4
 [Hirse]: https://github.com/Hirse
-
+[MBoegers]: https://github.com/MBoegers
 
 ## Version 11.6.0
 
diff --git a/src/languages/java.js b/src/languages/java.js
index 9a0cf137f5..3a45fd1fc5 100644
--- a/src/languages/java.js
+++ b/src/languages/java.js
@@ -72,7 +72,8 @@ export default function(hljs) {
     'requires',
     'exports',
     'do',
-    'sealed'
+    'sealed',
+    'yield'
   ];
 
   const BUILT_INS = [
diff --git a/test/markup/java/switch.expect.txt b/test/markup/java/switch.expect.txt
new file mode 100644
index 0000000000..63950d1ad8
--- /dev/null
+++ b/test/markup/java/switch.expect.txt
@@ -0,0 +1,13 @@
+<span class="hljs-keyword">switch</span>(a) {
+ <span class="hljs-keyword">case</span> <span class="hljs-literal">null</span> -&gt; <span class="hljs-keyword">yield</span> <span class="hljs-string">&quot;n&quot;</span>;
+ <span class="hljs-keyword">case</span> String s -&gt; <span class="hljs-keyword">yield</span> <span class="hljs-string">&quot;s&quot;</span>;
+ <span class="hljs-keyword">case</span> Object o -&gt; <span class="hljs-keyword">yield</span> <span class="hljs-string">&quot;o&quot;</span>;
+ <span class="hljs-keyword">default</span>: <span class="hljs-keyword">yield</span> <span class="hljs-string">&quot;d&quot;</span>,
+}
+
+<span class="hljs-keyword">switch</span>(a) {
+ <span class="hljs-keyword">case</span> <span class="hljs-literal">null</span>: <span class="hljs-keyword">return</span> <span class="hljs-string">&quot;n&quot;</span>;
+ <span class="hljs-keyword">case</span> <span class="hljs-string">&quot;s&quot;</span>: <span class="hljs-keyword">return</span> <span class="hljs-string">&quot;s&quot;</span>;
+ <span class="hljs-keyword">case</span> <span class="hljs-string">&quot;o&quot;</span>: <span class="hljs-keyword">return</span> <span class="hljs-string">&quot;o&quot;</span>;
+ <span class="hljs-keyword">default</span>: <span class="hljs-keyword">return</span> <span class="hljs-string">&quot;d&quot;</span>;
+}
diff --git a/test/markup/java/switch.txt b/test/markup/java/switch.txt
new file mode 100644
index 0000000000..de7fd24061
--- /dev/null
+++ b/test/markup/java/switch.txt
@@ -0,0 +1,13 @@
+switch(a) {
+ case null -> yield "n";
+ case String s -> yield "s";
+ case Object o -> yield "o";
+ default: yield "d",
+}
+
+switch(a) {
+ case null: return "n";
+ case "s": return "s";
+ case "o": return "o";
+ default: return "d";
+}

From 6077d91a69251fa0c41e14404ca0ec806b0e31b1 Mon Sep 17 00:00:00 2001
From: Josh Goebel <me@joshgoebel.com>
Date: Sun, 30 Oct 2022 12:54:40 -0400
Subject: [PATCH 2/2] Update src/languages/java.js

---
 src/languages/java.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/java.js b/src/languages/java.js
index 57952bda67..cdbb1e9f94 100644
--- a/src/languages/java.js
+++ b/src/languages/java.js
@@ -73,7 +73,7 @@ export default function(hljs) {
     'exports',
     'do',
     'sealed',
-    'yield'
+    'yield',
     'permits'
   ];
 

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/highlightjs/highlight.js/pull/3650.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/highlightjs/highlight.js/pull/3650.patch" target="_blank">pFad Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/highlightjs/highlight.js/pull/3650.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/highlightjs/highlight.js/pull/3650.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>