flake.nix

@@ -36,7 +36,7 @@
       The default Helix build. Uses the latest stable Rust toolchain, and unstable
       nixpkgs.
 
-      The build inputs can be overridden with the following:
+      The build inputs can be overriden with the following:
 
       packages.${system}.default.override { rustPlatform = newPlatform; };
 

grammars.nix

@@ -1,13 +1,22 @@
 {
   stdenv,
   lib,
+  runCommandLocal,
   runCommand,
+  yj,
   includeGrammarIf ? _: true,
   grammarOverlays ? [],
   ...
 }: let
+  # HACK: nix < 2.6 has a bug in the toml parser, so we convert to JSON
+  # before parsing
+  languages-json = runCommandLocal "languages-toml-to-json" {} ''
+    ${yj}/bin/yj -t < ${./languages.toml} > $out
+  '';
   languagesConfig =
-    builtins.fromTOML (builtins.readFile ./languages.toml);
+    if lib.versionAtLeast builtins.nixVersion "2.6.0"
+    then builtins.fromTOML (builtins.readFile ./languages.toml)
+    else builtins.fromJSON (builtins.readFile (builtins.toPath languages-json));
   isGitGrammar = grammar:
     builtins.hasAttr "source" grammar
     && builtins.hasAttr "git" grammar.source

languages.toml

@@ -626,7 +626,7 @@ args = { console = "internalConsole", attachCommands = [ "platform select remote
 
 [[grammar]]
 name = "cpp"
-source = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "56455f4245baf4ea4e0881c5169de69d7edd5ae7" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "670404d7c689be1c868a46f919ba2a3912f2b7ef" }
 
 [[language]]
 name = "crystal"

runtime/queries/cpp/highlights.scm

@@ -3,7 +3,7 @@
 ; Constants
 
 (this) @variable.builtin
-(null) @constant.builtin
+(nullptr) @constant.builtin
 
 ; Types
 

runtime/queries/verilog/highlights.scm

@@ -150,9 +150,6 @@
 (port_identifier
  (simple_identifier) @variable)
 
-(variable_port_header ("var") @type.builtin)
-(data_declaration ("var") @type.builtin)
-(tf_port_item1 ("var") @type.builtin)
 [
   (net_type)
   (integer_vector_type)