Merge branch 'nearley'

mi2ebi · mi2ebi · commit 4dc127fc0a90 · 2025-09-22T13:37:02.000-07:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
@@ -172,6 +172,7 @@
 | move | ✓ |  |  |  |  |  |
 | msbuild | ✓ |  | ✓ |  |  |  |
 | nasm | ✓ | ✓ |  |  |  | `asm-lsp` |
+| nearley | ✓ |  |  |  | ✓ |  |
 | nestedtext | ✓ | ✓ | ✓ |  |  |  |
 | nginx | ✓ |  |  |  |  |  |
 | nickel | ✓ |  | ✓ |  |  | `nls` |
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
@@ -438,8 +438,6 @@ pub enum KittyKeyboardProtocolConfig {
     Auto,
     Disabled,
     Enabled,
-    /// Whether to dim text in unfocused views or while jumping to labels.
-    pub enable_focus_dimmer: bool,
 }
 
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, PartialOrd, Ord)]
diff --git a/languages.toml b/languages.toml
@@ -4843,3 +4843,14 @@ indent = { tab-width = 2, unit = "  " }
 [[grammar]]
 name = "slisp"
 source = { git = "https://github.com/xenogenics/tree-sitter-slisp", rev = "29f9c6707ce9dfc2fc915d175ec720b207f179f3" }
+
+[[language]]
+name = "nearley"
+scope = "source.nearley"
+file-types = ["ne"]
+comment-token = "#"
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "nearley"
+source = { git = "https://github.com/mi2ebi/tree-sitter-nearley", rev = "4033073ac68953ff6a89989939ff9c3772aeb903" }
diff --git a/runtime/queries/nearley/highlights.scm b/runtime/queries/nearley/highlights.scm
@@ -0,0 +1,43 @@
+
+(comment) @comment.line
+
+(string) @string
+(string "i" @keyword.modifier)
+
+(identifier) @variable.other
+(rule_name (identifier) @function)
+(rule (generic (identifier) @function))
+
+(directive) @keyword.directive
+(directive_value (identifier) @constant)
+(directive_value (string) @string)
+
+(token) @constant
+
+(generic
+  "<" @punctuation.bracket
+  (identifier) @type.parameter
+  ">" @punctuation.bracket
+)
+
+(group "(" @punctuation.bracket ")" @punctuation.bracket)
+
+(charset) @string.regexp
+(wildcard) @keyword
+
+(quantifier) @function.builtin
+
+(macro_name
+  "[" @punctuation.bracket
+  (identifier) @variable.parameter
+  "]" @punctuation.bracket
+)
+(macro_arg) @variable.parameter
+
+(rule "->" @operator)
+(rule_body "|" @operator)
+
+(cont_block "@{%" @keyword.directive "%}" @keyword.directive)
+(cont_inline "{%" @keyword.directive "%}" @keyword.directive)
+
+(ifdef) @keyword.directive
diff --git a/runtime/queries/nearley/injections.scm b/runtime/queries/nearley/injections.scm
@@ -0,0 +1,2 @@
+((cont) @injection.content
+  (#set! injection.language "javascript"))
diff --git a/runtime/queries/nearley/rainbows.scm b/runtime/queries/nearley/rainbows.scm
@@ -0,0 +1,3 @@
+((group) @rainbow.scope)
+
+["(" ")"] @rainbow.bracket

Original file line number	Diff line number	Diff line change
`@@ -438,8 +438,6 @@ pub enum KittyKeyboardProtocolConfig {`
`438`	`438`	`Auto,`
`439`	`439`	`Disabled,`
`440`	`440`	`Enabled,`
`441`		`- /// Whether to dim text in unfocused views or while jumping to labels.`
`442`		`- pub enable_focus_dimmer: bool,`
`443`	`441`	`}`
`444`	`442`
`445`	`443`	`#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, PartialOrd, Ord)]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+((cont) @injection.content`
	`2`	`+ (#set! injection.language "javascript"))`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+((group) @rainbow.scope)`
	`2`	`+`
	`3`	`+["(" ")"] @rainbow.bracket`