From b531c40942d8ae8e76b7c12659d58bacee1974d3 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Fri, 13 Mar 2026 19:16:02 +0100
Subject: [PATCH] glsl/html: Clean up some things (#51516)

Release Notes:

- N/A
---
 extensions/glsl/languages/glsl/highlights.scm | 170 +++++++-----------
 extensions/html/src/html.rs                   |   7 +-
 2 files changed, 67 insertions(+), 110 deletions(-)

diff --git a/extensions/glsl/languages/glsl/highlights.scm b/extensions/glsl/languages/glsl/highlights.scm
index 9e40610ff5494102f8524b287ad2e50ec48d78db..9f0754b61ed2f8a596e186063224499f2afd1188 100644
--- a/extensions/glsl/languages/glsl/highlights.scm
+++ b/extensions/glsl/languages/glsl/highlights.scm
@@ -1,108 +1,68 @@
-"break" @keyword
-
-"case" @keyword
-
-"const" @keyword
-
-"continue" @keyword
-
-"default" @keyword
-
-"do" @keyword
-
-"else" @keyword
-
-"enum" @keyword
-
-"extern" @keyword
-
-"for" @keyword
-
-"if" @keyword
-
-"inline" @keyword
-
-"return" @keyword
-
-"sizeof" @keyword
-
-"static" @keyword
-
-"struct" @keyword
-
-"switch" @keyword
-
-"typedef" @keyword
-
-"union" @keyword
-
-"volatile" @keyword
-
-"while" @keyword
-
-"#define" @keyword
-
-"#elif" @keyword
-
-"#else" @keyword
-
-"#endif" @keyword
-
-"#if" @keyword
-
-"#ifdef" @keyword
-
-"#ifndef" @keyword
-
-"#include" @keyword
-
-(preproc_directive) @keyword
-
-"--" @operator
-
-"-" @operator
-
-"-=" @operator
-
-"->" @operator
-
-"=" @operator
-
-"!=" @operator
-
-"*" @operator
-
-"&" @operator
-
-"&&" @operator
-
-"+" @operator
-
-"++" @operator
-
-"+=" @operator
-
-"<" @operator
-
-"==" @operator
-
-">" @operator
-
-"||" @operator
-
-"." @delimiter
-
-";" @delimiter
+[
+  "break"
+  "case"
+  "const"
+  "continue"
+  "default"
+  "do"
+  "else"
+  "enum"
+  "extern"
+  "for"
+  "if"
+  "inline"
+  "return"
+  "sizeof"
+  "static"
+  "struct"
+  "switch"
+  "typedef"
+  "union"
+  "volatile"
+  "while"
+  "#define"
+  "#elif"
+  "#else"
+  "#endif"
+  "#if"
+  "#ifdef"
+  "#ifndef"
+  "#include"
+  (preproc_directive)
+] @keyword
 
-(string_literal) @string
+[
+  "--"
+  "-"
+  "-="
+  "->"
+  "="
+  "!="
+  "*"
+  "&"
+  "&&"
+  "+"
+  "++"
+  "+="
+  "<"
+  "=="
+  ">"
+  "||"
+  "."
+  ";"
+] @operator
 
-(system_lib_string) @string
+[
+  (string_literal)
+  (system_lib_string)
+] @string
 
 (null) @constant
 
-(number_literal) @number
-
-(char_literal) @number
+[
+  (number_literal)
+  (char_literal)
+] @number
 
 (identifier) @variable
 
@@ -110,11 +70,11 @@
 
 (statement_identifier) @label
 
-(type_identifier) @type
-
-(primitive_type) @type
-
-(sized_type_specifier) @type
+[
+  (type_identifier)
+  (primitive_type)
+  (sized_type_specifier)
+] @type
 
 (call_expression
   function: (identifier) @function)
diff --git a/extensions/html/src/html.rs b/extensions/html/src/html.rs
index 337689ebddd427769ab985ad82512f76b601e67c..a5e38c97b3613ca735fb4eea8f26472ab3f66049 100644
--- a/extensions/html/src/html.rs
+++ b/extensions/html/src/html.rs
@@ -95,11 +95,8 @@ impl zed::Extension for HtmlExtension {
         server_id: &LanguageServerId,
         worktree: &zed::Worktree,
     ) -> Result<Option<zed::serde_json::Value>> {
-        let settings = LspSettings::for_worktree(server_id.as_ref(), worktree)
-            .ok()
-            .and_then(|lsp_settings| lsp_settings.settings)
-            .unwrap_or_default();
-        Ok(Some(settings))
+        LspSettings::for_worktree(server_id.as_ref(), worktree)
+            .map(|lsp_settings| lsp_settings.settings)
     }
 
     fn language_server_initialization_options(