From fee06e88890ef915d278b04a5c387424004148d5 Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Tue, 15 Dec 2015 04:38:26 +0000
Subject: [PATCH] Tweak javascript highlighting

Fixes #531
---
 rc/javascript.kak | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/rc/javascript.kak b/rc/javascript.kak
index 86e0b9f3..325ce6fb 100644
--- a/rc/javascript.kak
+++ b/rc/javascript.kak
@@ -13,24 +13,23 @@ hook global BufCreate .*[.](js) %{
 # ‾‾‾‾‾‾‾‾‾‾‾‾
 
 addhl -group / regions -default code javascript \
-    double_string '"' (?<!\\)(\\\\)*"        '' \
-    single_string "'" "'"                    '' \
-    comment       //  '$'                    '' \
-    comment      /[*] [*]/                   '' \
-    regex         /   (?<!\\)(\\\\)*/[gimy]* ''
+    double_string '"'  (?<!\\)(\\\\)*"        '' \
+    single_string "'"  (?<!\\)(\\\\)*'        '' \
+    comment       //   '$'                    '' \
+    comment       /\*  \*/                    ''
 
 # Regular expression flags are: g → global match, i → ignore case, m → multi-lines, y → sticky
 # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp
 
 addhl -group /javascript/double_string fill string
 addhl -group /javascript/single_string fill string
-addhl -group /javascript/regex         fill meta
 addhl -group /javascript/comment       fill comment
 
 addhl -group /javascript/code regex \$\w* 0:identifier
 addhl -group /javascript/code regex \<(document|false|null|parent|self|this|true|undefined|window)\> 0:value
 addhl -group /javascript/code regex "-?[0-9]*\.?[0-9]+" 0:value
 addhl -group /javascript/code regex \<(Array|Boolean|Date|Function|Number|Object|RegExp|String)\> 0:type
+addhl -group /javascript/code regex (?<=\W)/[^\n/]+/[gimy]* 0:meta
 
 # Keywords are collected at
 # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar#Keywords