From 6fdb9db5d90d7504b21158c146a59af66565ff63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Ros=C3=A9n?= <dan.rosen@gu.se>
Date: Mon, 19 Feb 2018 10:34:53 +0100
Subject: [PATCH] Improve JS/TS highlighter slightly

---
 rc/base/javascript.kak | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rc/base/javascript.kak b/rc/base/javascript.kak
index bda5396b..7a7bb8da 100644
--- a/rc/base/javascript.kak
+++ b/rc/base/javascript.kak
@@ -49,9 +49,10 @@ define-command -hidden init-javascript-filetype -params 1 %~
         literal       "`"  (?<!\\)(\\\\)*`         '' \
         comment       //   '$'                     '' \
         comment       /\*  \*/                     '' \
+        shebang       ^#!  $                       '' \
         regex         /    (?<!\\)(\\\\)*/[gimuy]* '' \
         jsx           (?<![\w<])<[a-zA-Z][\w:.-]*(?!\hextends)(?=[\s/>])(?!>\()) (</.*?>|/>) (?<![\w<])<[a-zA-Z][\w:.-]* \
-        division '[\w\)\]](/|(\h+/\h+))' '(?=\w)' '' # Help Kakoune to better detect /…/ literals
+        division '[\w\)\]]\K(/|(\h+/\h+))' '(?=\w)' '' # Help Kakoune to better detect /…/ literals
 
     # Regular expression flags are: g → global match, i → ignore case, m → multi-lines, u → unicode, y → sticky
     # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp
@@ -60,6 +61,7 @@ define-command -hidden init-javascript-filetype -params 1 %~
     add-highlighter "shared/%arg{1}/single_string" fill string
     add-highlighter "shared/%arg{1}/regex"         fill meta
     add-highlighter "shared/%arg{1}/comment"       fill comment
+    add-highlighter "shared/%arg{1}/shebang"       fill meta
 
     add-highlighter "shared/%arg{1}/literal"       fill string
     add-highlighter "shared/%arg{1}/literal"       regex \$\{.*?\} 0:value