From 6e5e6cf8a57d8a4624aaf4515a8b450f49a9bb44 Mon Sep 17 00:00:00 2001
From: Gaauwe Rombouts <mail@grombouts.nl>
Date: Thu, 5 Feb 2026 12:23:39 +0100
Subject: [PATCH] languages: Remove duplicate keywords in JS syntax
 highlighting (#48460)

Fixes an issue where syntax highlighting would be incorrect in certain
cases for JS, because of duplicate keyword definitions.

Release Notes:

- Fixed issue where certain keywords were incorrectly highlighted in JS
files
---
 .../languages/src/javascript/highlights.scm   | 33 ++++++++-----------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/crates/languages/src/javascript/highlights.scm b/crates/languages/src/javascript/highlights.scm
index 1a29f0134cf0063a171a6dfae1974beec2bfb779..938ee78e7fc06f118e7604e0cb5ec134d4e42095 100644
--- a/crates/languages/src/javascript/highlights.scm
+++ b/crates/languages/src/javascript/highlights.scm
@@ -243,18 +243,29 @@
 )
 
 [
+  "abstract"
   "as"
   "async"
   "await"
   "debugger"
+  "declare"
   "default"
   "delete"
   "extends"
   "get"
+  "implements"
   "in"
   "instanceof"
+  "keyof"
+  "module"
+  "namespace"
   "new"
   "of"
+  "override"
+  "private"
+  "protected"
+  "public"
+  "readonly"
   "set"
   "static"
   "target"
@@ -270,6 +281,9 @@
   "var"
   "function"
   "class"
+  "enum"
+  "interface"
+  "type"
 ] @keyword.declaration
 
 [
@@ -308,25 +322,6 @@
 
 (decorator "@" @punctuation.special)
 
-; Keywords
-
-[ "abstract"
-  "declare"
-  "enum"
-  "export"
-  "implements"
-  "interface"
-  "keyof"
-  "module"
-  "namespace"
-  "private"
-  "protected"
-  "public"
-  "type"
-  "readonly"
-  "override"
-] @keyword
-
 ; JSX elements
 (jsx_opening_element
   [