From 394d849b049d94aad1e9c5872e0f58dc1c369488 Mon Sep 17 00:00:00 2001
From: Nicolas Stucki <nicolas.stucki@gmail.com>
Date: Sat, 4 Sep 2021 17:47:17 +0200
Subject: [PATCH] (scala) remove symbol syntax and fix quoted code syntax

---
 CHANGES.md                               | 1 +
 src/languages/scala.js                   | 6 ------
 test/markup/scala/quoted-code.expect.txt | 1 +
 test/markup/scala/quoted-code.txt        | 1 +
 test/markup/scala/symbol.expect.txt      | 5 +++++
 test/markup/scala/symbol.txt             | 5 +++++
 6 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 test/markup/scala/quoted-code.expect.txt
 create mode 100644 test/markup/scala/quoted-code.txt
 create mode 100644 test/markup/scala/symbol.expect.txt
 create mode 100644 test/markup/scala/symbol.txt

diff --git a/CHANGES.md b/CHANGES.md
index b61b84ab1e..213c783da6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ Grammars:
 - enh(c,cpp) highlight type modifiers as type (#3316) [Josh Goebel][]
 - enh(css/less/stylus/scss) add support for CSS Grid properties [monochromer][]
 - enh(scala) add missing `do` and `then` keyword (#3323) [Nicolas Stucki][]
+- enh(scala) remove symbol syntax and fix quoted code syntax (#3324) [Nicolas Stucki][]
 
 [Austin Schick]: https://github.com/austin-schick
 [Josh Goebel]: https://github.com/joshgoebel
diff --git a/src/languages/scala.js b/src/languages/scala.js
index e9917c5619..f365636768 100644
--- a/src/languages/scala.js
+++ b/src/languages/scala.js
@@ -59,11 +59,6 @@ export default function(hljs) {
 
   };
 
-  const SYMBOL = {
-    className: 'symbol',
-    begin: '\'\\w[\\w\\d_]*(?!\')'
-  };
-
   const TYPE = {
     className: 'type',
     begin: '\\b[A-Z][A-Za-z0-9_]*',
@@ -127,7 +122,6 @@ export default function(hljs) {
       hljs.C_LINE_COMMENT_MODE,
       hljs.C_BLOCK_COMMENT_MODE,
       STRING,
-      SYMBOL,
       TYPE,
       METHOD,
       CLASS,
diff --git a/test/markup/scala/quoted-code.expect.txt b/test/markup/scala/quoted-code.expect.txt
new file mode 100644
index 0000000000..74b90ece70
--- /dev/null
+++ b/test/markup/scala/quoted-code.expect.txt
@@ -0,0 +1 @@
+<span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">f</span></span>(using <span class="hljs-type">Quotes</span>) = &#x27;{ <span class="hljs-keyword">val</span> x = <span class="hljs-number">1</span>; ${g(&#x27;x)} }
diff --git a/test/markup/scala/quoted-code.txt b/test/markup/scala/quoted-code.txt
new file mode 100644
index 0000000000..854c78115e
--- /dev/null
+++ b/test/markup/scala/quoted-code.txt
@@ -0,0 +1 @@
+def f(using Quotes) = '{ val x = 1; ${g('x)} }
diff --git a/test/markup/scala/symbol.expect.txt b/test/markup/scala/symbol.expect.txt
new file mode 100644
index 0000000000..3ff07c95d0
--- /dev/null
+++ b/test/markup/scala/symbol.expect.txt
@@ -0,0 +1,5 @@
+<span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">f</span></span>(s: <span class="hljs-type">Symbol</span>) = {
+  s <span class="hljs-keyword">match</span> {
+    <span class="hljs-keyword">case</span> &#x27;foo =&gt;
+  }
+}
diff --git a/test/markup/scala/symbol.txt b/test/markup/scala/symbol.txt
new file mode 100644
index 0000000000..d1a300b99d
--- /dev/null
+++ b/test/markup/scala/symbol.txt
@@ -0,0 +1,5 @@
+def f(s: Symbol) = {
+  s match {
+    case 'foo =>
+  }
+}