Revert "Scala case classes params highlight fixed, closes highlightjs…

…#956" This reverts commit 2974ead. # Conflicts: # CHANGES.md
Sannis · Oct 19, 2015 · 82ee0c0 · 82ee0c0
1 parent 48c1473
commit 82ee0c0
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 22 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -12,7 +12,6 @@ Notable fixes and improvements to existing languages:
 - Crystal highlighting improved by [Tsuyusato Kitsune][]
 - Missing Swift keywords added by [Nate Cook][]
 - Improve detection of C block comments
-- Scala case classes params highlight fixed
 
 [Kristoffer Gronlund]: https://github.com/krig
 [Søren Enevoldsen]: https://github.com/senevoldsen90

diff --git a/src/languages/scala.js b/src/languages/scala.js
@@ -37,21 +37,8 @@ function(hljs) {
   var CLASS = {
     className: 'class',
     beginKeywords: 'class object trait type',
-    end: /[:={\[\n;]/,
-    excludeEnd: true,
-    contains: [
-      {
-        beginKeywords: 'extends with',
-        relevance: 10
-      },
-      {
-        'className': 'params',
-        'begin': /\(/,
-        'end': /\)/,
-        relevance: 0
-      },
-      NAME
-    ]
+    end: /[:={\[(\n;]/,
+    contains: [{className: 'keyword', beginKeywords: 'extends with', relevance: 10}, NAME]
   };
 
   var METHOD = {

diff --git a/test/markup/scala/case-classes.expect.txt b/test/markup/scala/case-classes.expect.txt
diff --git a/test/markup/scala/case-classes.txt b/test/markup/scala/case-classes.txt