Merge 90a21cc4ba into 4281228da3

book/src/generated/lang-support.md

@@ -112,8 +112,8 @@
 | iex | ✓ |  |  |  |  |
 | ini | ✓ |  |  |  |  |
 | ink | ✓ |  |  |  |  |
-| inko | ✓ | ✓ | ✓ |  |  |
-| janet | ✓ |  |  |  |  |
+| inko | ✓ | ✓ | ✓ | ✓ |  |
+| janet | ✓ |  | ✓ |  |  |
 | java | ✓ | ✓ | ✓ |  | `jdtls` |
 | javascript | ✓ | ✓ | ✓ | ✓ | `typescript-language-server` |
 | jinja | ✓ |  |  |  |  |

book/src/generated/typable-cmd.md

@@ -32,11 +32,9 @@
 | `:cquit`, `:cq` | Quit with exit code (default 1). Accepts an optional integer exit code (:cq 2). |
 | `:cquit!`, `:cq!` | Force quit with exit code (default 1) ignoring unsaved changes. Accepts an optional integer exit code (:cq! 2). |
 | `:theme` | Change the editor theme (show current theme if no name specified). |
-| `:yank-join` | Yank joined selections. A separator can be provided as first argument. Default value is newline. |
+| `:yank-join`, `:yj` | Yank the selections joined with a separator |
 | `:clipboard-yank` | Yank main selection into system clipboard. |
-| `:clipboard-yank-join` | Yank joined selections into system clipboard. A separator can be provided as first argument. Default value is newline. |
 | `:primary-clipboard-yank` | Yank main selection into system primary clipboard. |
-| `:primary-clipboard-yank-join` | Yank joined selections into system primary clipboard. A separator can be provided as first argument. Default value is newline. |
 | `:clipboard-paste-after` | Paste system clipboard after selections. |
 | `:clipboard-paste-before` | Paste system clipboard before selections. |
 | `:clipboard-paste-replace` | Replace selections with content of system clipboard. |

helix-term/src/commands/typed.rs

@@ -1040,29 +1040,23 @@ fn yank_joined(cx: &mut compositor::Context, args: Args, event: PromptEvent) ->
     }
 
     let doc = doc!(cx.editor);
-    let default_sep = Cow::Borrowed(doc.line_ending.as_str());
-    let separator = args.first().unwrap_or(&default_sep);
-    let register = cx
-        .editor
-        .selected_register
-        .unwrap_or(cx.editor.config().default_yank_register);
+
+    let separator = args
+        .get_flag("separator")
+        .unwrap_or_else(|| doc.line_ending.as_str());
+
+    let register = args
+        .get_flag("register")
+        .map(|reg| {
+            reg.parse::<char>()
+                .map_err(|_| anyhow!("Invalid register: {reg}"))
+        })
+        .transpose()?
+        .or(cx.editor.selected_register)
+        .unwrap_or_else(|| cx.editor.config().default_yank_register);
+
     yank_joined_impl(cx.editor, separator, register);
-    Ok(())
-}
 
-fn yank_joined_to_clipboard(
-    cx: &mut compositor::Context,
-    args: Args,
-    event: PromptEvent,
-) -> anyhow::Result<()> {
-    if event != PromptEvent::Validate {
-        return Ok(());
-    }
-
-    let doc = doc!(cx.editor);
-    let default_sep = Cow::Borrowed(doc.line_ending.as_str());
-    let separator = args.first().unwrap_or(&default_sep);
-    yank_joined_impl(cx.editor, separator, '+');
     Ok(())
 }
 
@@ -1079,22 +1073,6 @@ fn yank_main_selection_to_primary_clipboard(
     Ok(())
 }
 
-fn yank_joined_to_primary_clipboard(
-    cx: &mut compositor::Context,
-    args: Args,
-    event: PromptEvent,
-) -> anyhow::Result<()> {
-    if event != PromptEvent::Validate {
-        return Ok(());
-    }
-
-    let doc = doc!(cx.editor);
-    let default_sep = Cow::Borrowed(doc.line_ending.as_str());
-    let separator = args.first().unwrap_or(&default_sep);
-    yank_joined_impl(cx.editor, separator, '*');
-    Ok(())
-}
-
 fn paste_clipboard_after(
     cx: &mut compositor::Context,
     _args: Args,
@@ -3033,12 +3011,26 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
     },
     TypableCommand {
         name: "yank-join",
-        aliases: &[],
-        doc: "Yank joined selections. A separator can be provided as first argument. Default value is newline.",
+        aliases: &["yj"],
+        doc: "Yank the selections joined with a separator",
         fun: yank_joined,
         completer: CommandCompleter::none(),
         signature: Signature {
-            positionals: (0, Some(1)),
+            positionals: (0, Some(0)),
+            flags: &[
+                Flag {
+                    name: "separator",
+                    alias: Some('s'),
+                    doc: "Separator to between joined selections [default: newline]",
+                    completions: Some(&[])
+                },
+                Flag {
+                    name: "register",
+                    alias: Some('r'),
+                    doc: "Yank into this register",
+                    completions: Some(&[])
+                }
+            ],
             ..Signature::DEFAULT
         },
     },
@@ -3053,17 +3045,6 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
             ..Signature::DEFAULT
         },
     },
-    TypableCommand {
-        name: "clipboard-yank-join",
-        aliases: &[],
-        doc: "Yank joined selections into system clipboard. A separator can be provided as first argument. Default value is newline.", // FIXME: current UI can't display long doc.
-        fun: yank_joined_to_clipboard,
-        completer: CommandCompleter::none(),
-        signature: Signature {
-            positionals: (0, Some(1)),
-            ..Signature::DEFAULT
-        },
-    },
     TypableCommand {
         name: "primary-clipboard-yank",
         aliases: &[],
@@ -3075,17 +3056,6 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
             ..Signature::DEFAULT
         },
     },
-    TypableCommand {
-        name: "primary-clipboard-yank-join",
-        aliases: &[],
-        doc: "Yank joined selections into system primary clipboard. A separator can be provided as first argument. Default value is newline.", // FIXME: current UI can't display long doc.
-        fun: yank_joined_to_primary_clipboard,
-        completer: CommandCompleter::none(),
-        signature: Signature {
-            positionals: (0, Some(1)),
-            ..Signature::DEFAULT
-        },
-    },
     TypableCommand {
         name: "clipboard-paste-after",
         aliases: &[],

helix-term/src/ui/mod.rs

@@ -356,7 +356,7 @@ fn directory_content(path: &Path) -> Result<Vec<(PathBuf, bool)>, std::io::Error
         .map(|entry| {
             (
                 entry.path(),
-                entry.file_type().is_ok_and(|file_type| file_type.is_dir()),
+                std::fs::metadata(entry.path()).is_ok_and(|metadata| metadata.is_dir()),
             )
         })
         .collect();

helix-term/tests/test/commands.rs

@@ -5,6 +5,7 @@ use super::*;
 mod insert;
 mod movement;
 mod write;
+mod yank_join;
 
 #[tokio::test(flavor = "multi_thread")]
 async fn search_selection_detect_word_boundaries_at_eof() -> anyhow::Result<()> {

helix-term/tests/test/commands/yank_join.rs

@@ -0,0 +1,69 @@
+use super::*;
+
+#[tokio::test(flavor = "multi_thread")]
+async fn no_flags() -> anyhow::Result<()> {
+    test((
+        indoc! {"\
+                #[o|]#ne
+                #(t|)#wo
+                three"
+        },
+        ":yank-join<ret>p",
+        indoc! {"\
+                o#[o
+                t|]#ne
+                t#(o
+                t|)#wo
+                three"
+        },
+    ))
+    .await?;
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn separator_flag() -> anyhow::Result<()> {
+    test((
+        indoc! {"\
+                #[o|]#ne
+                #(t|)#wo
+                three"
+        },
+        ":yank-join --separator x<ret>p",
+        indoc! {"\
+                o#[oxt|]#ne
+                t#(oxt|)#wo
+                three"
+        },
+    ))
+    .await?;
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn register_flag() -> anyhow::Result<()> {
+    test((
+        indoc! {"\
+                #[o|]#ne
+                #(t|)#wo
+                three"
+        },
+        // 1. Yank the two selections into register `x`
+        // 2. Move cursor down + right
+        // 3. Yank two other selections into the default register
+        // 4. Move cursor back up + left, to the original position
+        // 5. Pasting from register `x` will paste as if actions 2, 3 and 4 never occured
+        ":yank-join --register x<ret>jl:yank-join<ret>kh\"xp",
+        indoc! {"\
+                o#[o
+                t|]#ne
+                t#(o
+                t|)#wo
+                three"
+        },
+    ))
+    .await?;
+
+    Ok(())
+}

languages.toml

@@ -65,6 +65,7 @@ julia = { command = "julia", timeout = 60, args = [ "--startup-file=no", "--hist
 just-lsp = { command = "just-lsp" }
 koka = { command = "koka", args = ["--language-server", "--lsstdio"] }
 koto-ls = { command = "koto-ls" }
+kotlin-lsp = { command = "kotlin-lsp", args = ["--stdio"] }
 kotlin-language-server = { command = "kotlin-language-server" }
 lean = { command = "lean", args = [ "--server", "--memory=1024" ] }
 ltex-ls = { command = "ltex-ls" }
@@ -1021,6 +1022,7 @@ shebangs = []
 comment-token = "#"
 language-servers = [ "nil", "nixd" ]
 indent = { tab-width = 2, unit = "  " }
+formatter = { command = "nixfmt" }
 
 [[grammar]]
 name = "nix"
@@ -3068,7 +3070,7 @@ formatter = { command = "inko", args = ["fmt", "-"] }
 
 [[grammar]]
 name = "inko"
-source = { git = "https://github.com/inko-lang/tree-sitter-inko", rev = "7860637ce1b43f5f79cfb7cc3311bf3234e9479f" }
+source = { git = "https://github.com/inko-lang/tree-sitter-inko", rev = "f58a87ac4dc6a7955c64c9e4408fbd693e804686" }
 
 [[language]]
 name = "bicep"
@@ -3422,7 +3424,7 @@ language-servers = ["just-lsp"]
 
 [[grammar]]
 name = "just"
-source = { git = "https://github.com/poliorcetics/tree-sitter-just", rev = "8d03cfdd7ab89ff76d935827de1b93450fa0ec0a" }
+source = { git = "https://github.com/poliorcetics/tree-sitter-just", rev = "0f84211c637813bcf1eb32c9e35847cdaea8760d" }
 
 [[language]]
 name = "gn"
@@ -4242,10 +4244,11 @@ comment-token = "#"
 block-comment-tokens = ["#-", "-#"]
 indent = { tab-width = 2, unit = "  " }
 language-servers = ["koto-ls"]
+formatter = {command = "koto", args = ["--format"]}
 
 [[grammar]]
 name = "koto"
-source = { git = "https://github.com/koto-lang/tree-sitter-koto", rev = "b420f7922d0d74905fd0d771e5b83be9ee8a8a9a" }
+source = { git = "https://github.com/koto-lang/tree-sitter-koto", rev = "2ffc77c14f0ac1674384ff629bfc207b9c57ed89" }
 
 [[language]]
 name = "gpr"

runtime/queries/inko/highlights.scm

@@ -78,7 +78,7 @@
 ] @keyword.operator
 
 [
-  "class"
+  "type"
   "trait"
 ] @keyword.storage.type
 

runtime/queries/inko/tags.scm

@@ -0,0 +1,14 @@
+(class
+  name: _ @definition.struct)
+
+(trait
+  name: _ @definition.interface)
+
+(external_function
+  name: _ @definition.function)
+
+(method
+  name: _ @definition.function)
+
+(define_constant
+  name: _ @definition.constant)

runtime/queries/janet/indents.scm

@@ -0,0 +1,28 @@
+; aligns forms to the second position if there's two in a line:
+; (-> 10
+;     (* 2)
+;     (print))
+(par_tup_lit . (sym_lit) @first . (_) @anchor
+  (#set! "scope" "tail")
+  (#same-line? @first @anchor)
+  ; anything that doesn't match should be indented normally
+  ; from https://github.com/janet-lang/spork/blob/5601dc883535473bca28351cc6df04ed6c656c65/spork/fmt.janet#L87C12-L93C38
+  (#not-match? @first "^(fn|match|with|with-dyns|def|def-|var|var-|defn|defn-|varfn|defmacro|defmacro-|defer|edefer|loop|seq|tabseq|catseq|generate|coro|for|each|eachp|eachk|case|cond|do|defglobal|varglobal|if|when|when-let|when-with|while|with-syms|with-vars|if-let|if-not|if-with|let|short-fn|try|unless|default|forever|upscope|repeat|forv|compwhen|compif|ev/spawn|ev/do-thread|ev/spawn-thread|ev/with-deadline|label|prompt|forever)$")) @align
+
+; everything else should be indented normally:
+;
+; (let [foo 10]
+;   (print foo))
+;
+; (foo
+;   bar)
+(par_tup_lit . (sym_lit)) @indent
+
+; for `{}` and `[]`:
+; {:foo 10
+;  :bar 20}
+(struct_lit . (_) @anchor) @align
+
+; [foo
+;  bar]
+(sqr_tup_lit . (_) @anchor) @align

runtime/queries/janet/injections.scm

@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))

runtime/queries/just/highlights.scm

@@ -61,6 +61,9 @@
 (mod
   name: (identifier) @namespace)
 
+(module_path
+  name: (identifier) @namespace)
+
 ; Paths
 
 (mod

runtime/queries/just/locals.scm

@@ -30,6 +30,9 @@
 (function_call
   name: (identifier) @local.reference)
 
+(module_path
+  name: (identifier) @local.reference)
+
 (recipe_dependency
   name: (identifier) @local.reference)
 

runtime/queries/koto/highlights.scm

@@ -5,11 +5,13 @@
   "*"
   "/"
   "%"
+  "^"
   "+="
   "-="
   "*="
   "/="
   "%="
+  "^="
   "=="
   "!="
   "<"
@@ -99,12 +101,18 @@
 (export
   (identifier) @namespace)
 
-(call
-  function: (identifier) @function.method)
+(chain
+  start: (identifier) @function)
 
 (chain
   lookup: (identifier) @variable.other.member)
 
+(call
+  function: (identifier)) @function
+
+(call_arg
+  (identifier) @variable.other.member)
+
 [
   (true)
   (false)
@@ -139,13 +147,10 @@
 
 (self) @variable.builtin
 
-(variable
-  type: (identifier) @type)
+(type
+  _ @type)
 
 (arg
   (_ (identifier) @variable.parameter))
 
 (ellipsis) @variable.parameter
-
-(function
-  output_type: (identifier) @type)

runtime/queries/koto/textobjects.scm

@@ -11,10 +11,6 @@
 (call_args
   ((call_arg) @parameter.inside . ","? @parameter.around) @parameter.around)
 
-(chain
-  call: (tuple
-    ((element) @parameter.inside . ","? @parameter.around) @parameter.around))
-
 (map
   ((entry_inline) @entry.inside . ","? @entry.around) @entry.around)
 

runtime/themes/gruvbox-material.toml

@@ -3,126 +3,4 @@
 # Ported by: @satoqz
 # License: MIT
 
-"attribute" = "green"
-"comment" = { fg = "grey1", modifiers = ["italic"] }
-"constant" = "fg0"
-"constant.builtin" = "purple"
-"constant.character.escape" = "green"
-"constant.numeric" = "purple"
-"constructor" = "green"
-"function" = "green"
-"keyword" = "red"
-"keyword.directive" = "purple"
-"keyword.operator" = "orange"
-"label" = "red"
-"namespace" = "yellow"
-"operator" = "orange"
-"punctuation" = "grey1"
-"punctuation.bracket" = "fg0"
-"punctuation.delimiter" = "grey1"
-"punctuation.special" = "blue"
-"special" = "green"
-"string" = "aqua"
-"string.regexp" = "green"
-"string.special.path" = "yellow"
-"string.special.symbol" = "fg0"
-"string.special.url" = { fg = "fg0", modifiers = ["underlined"] }
-"tag" = "orange"
-"type" = "yellow"
-"type.enum.variant" = "purple"
-"variable" = "fg0"
-"variable.builtin" = "purple"
-"variable.other.member" = "blue"
-"variable.parameter" = "fg0"
-
-"markup.heading.1" = "red"
-"markup.heading.2" = "orange"
-"markup.heading.3" = "yellow"
-"markup.heading.4" = "green"
-"markup.heading.5" = "blue"
-"markup.heading.6" = "purple"
-
-"markup.bold" = { fg = "fg0", modifiers = ["bold"] }
-"markup.italic" = { fg = "fg0", modifiers = ["italic"] }
-"markup.strikethrough" = { fg = "fg0", modifiers = ["crossed_out"] }
-
-"markup.link.label" = "blue"
-"markup.link.text" = "yellow"
-"markup.link.url" = { fg = "blue", modifiers = ["underlined"] }
-"markup.list" = "blue"
-"markup.list.checked" = "green"
-"markup.list.unchecked" = "grey1"
-"markup.quote" = "grey1"
-"markup.raw" = "green"
-
-"diff.delta" = "blue"
-"diff.minus" = "red"
-"diff.plus" = "green"
-
-"diagnostic.error" = { underline = { color = "red", style = "curl" } }
-"diagnostic.hint" = { underline = { color = "green", style = "curl" } }
-"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
-"diagnostic.unnecessary" = { modifiers = ["dim"] }
-"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
-
-error = "red"
-hint = "green"
-info = "blue"
-warning = "yellow"
-
-"ui.background" = { fg = "fg0", bg = "bg0" }
-"ui.bufferline" = { fg = "fg1", bg = "bg4" }
-"ui.bufferline.active" = { fg = "bg0", bg = "grey2" }
-"ui.bufferline.background" = { bg = "bg1" }
-"ui.cursor" = { fg = "bg0", bg = "grey1" }
-"ui.cursor.primary" = { fg = "bg0", bg = "fg0" }
-"ui.cursor.match" = { bg = "bg2" }
-"ui.cursorline.primary" = { bg = "bg1" }
-"ui.help" = { fg = "grey1", bg = "bg0" }
-"ui.highlight" = { bg = "bg2" }
-"ui.linenr" = "bg3"
-"ui.linenr.selected" = "grey1"
-"ui.menu" = { fg = "fg1", bg = "bg2" }
-"ui.menu.scroll" = { fg = "grey0", bg = "bg1" }
-"ui.menu.selected" = { fg = "bg2", bg = "grey2" }
-"ui.popup" = { fg = "fg1", bg = "bg2" }
-"ui.popup.info" = { "fg" = "grey1", bg = "bg0" }
-"ui.selection" = { bg = "bg2" }
-"ui.statusline" = { fg = "fg1", bg = "bg1" }
-"ui.statusline.inactive" = { fg = "grey1", bg = "bg1" }
-"ui.statusline.insert" = { fg = "bg0", bg = "green" }
-"ui.statusline.normal" = { fg = "bg0", bg = "grey2" }
-"ui.statusline.select" = { fg = "bg0", bg = "red" }
-"ui.text" = "fg0"
-"ui.text.directory" = { fg = "blue" }
-"ui.text.focus" = { bg = "bg2" }
-"ui.text.inactive" = { fg = "grey1" }
-"ui.text.info" = "grey1"
-"ui.virtual" = "grey0"
-"ui.virtual.indent-guide" = "bg3"
-"ui.virtual.inlay-hint" = "grey0"
-"ui.virtual.jump-label" = "grey2"
-"ui.virtual.ruler" = { bg = "bg1" }
-"ui.window" = { fg = "bg3" }
-
-[palette]
-fg0 = "#d4be98"
-fg1 = "#ddc7a1"
-
-bg0 = "#282828"
-bg1 = "#32302f"
-bg2 = "#45403d"
-bg3 = "#5a524c"
-bg4 = "#504945"
-
-grey0 = "#7c6f64"
-grey1 = "#928374"
-grey2 = "#a89984"
-
-aqua = "#89b482"
-blue = "#7daea3"
-green = "#a9b665"
-orange = "#e78a4e"
-purple = "#d3869b"
-red = "#ea6962"
-yellow = "#d8a657"
+inherits = "gruvbox_material_dark_medium"

runtime/themes/gruvbox_material_dark_hard.toml

@@ -0,0 +1,13 @@
+# Gruvbox Material Dark Hard for Helix
+# Original Author: @sainnhe (https://github.com/sainnhe/gruvbox-material)
+# Base theme ported by: @satoqz
+# Palette ported by: @ivan-shymkiv
+# License: MIT
+
+inherits = "gruvbox_material_dark_medium"
+
+[palette]
+bg0 = "#1d2021"
+bg1 = "#282828"
+bg2 = "#3c3836"
+bg3 = "#504945"

runtime/themes/gruvbox_material_dark_medium.toml

@@ -0,0 +1,128 @@
+# Gruvbox Material Dark Medium for Helix
+# Original Author: @sainnhe (https://github.com/sainnhe/gruvbox-material)
+# Ported by: @satoqz
+# License: MIT
+
+"attribute" = "green"
+"comment" = { fg = "grey1", modifiers = ["italic"] }
+"constant" = "fg0"
+"constant.builtin" = "purple"
+"constant.character.escape" = "green"
+"constant.numeric" = "purple"
+"constructor" = "green"
+"function" = "green"
+"keyword" = "red"
+"keyword.directive" = "purple"
+"keyword.operator" = "orange"
+"label" = "red"
+"namespace" = "yellow"
+"operator" = "orange"
+"punctuation" = "grey1"
+"punctuation.bracket" = "fg0"
+"punctuation.delimiter" = "grey1"
+"punctuation.special" = "blue"
+"special" = "green"
+"string" = "aqua"
+"string.regexp" = "green"
+"string.special.path" = "yellow"
+"string.special.symbol" = "fg0"
+"string.special.url" = { fg = "fg0", modifiers = ["underlined"] }
+"tag" = "orange"
+"type" = "yellow"
+"type.enum.variant" = "purple"
+"variable" = "fg0"
+"variable.builtin" = "purple"
+"variable.other.member" = "blue"
+"variable.parameter" = "fg0"
+
+"markup.heading.1" = "red"
+"markup.heading.2" = "orange"
+"markup.heading.3" = "yellow"
+"markup.heading.4" = "green"
+"markup.heading.5" = "blue"
+"markup.heading.6" = "purple"
+
+"markup.bold" = { fg = "fg0", modifiers = ["bold"] }
+"markup.italic" = { fg = "fg0", modifiers = ["italic"] }
+"markup.strikethrough" = { fg = "fg0", modifiers = ["crossed_out"] }
+
+"markup.link.label" = "blue"
+"markup.link.text" = "yellow"
+"markup.link.url" = { fg = "blue", modifiers = ["underlined"] }
+"markup.list" = "blue"
+"markup.list.checked" = "green"
+"markup.list.unchecked" = "grey1"
+"markup.quote" = "grey1"
+"markup.raw" = "green"
+
+"diff.delta" = "blue"
+"diff.minus" = "red"
+"diff.plus" = "green"
+
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "green", style = "curl" } }
+"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
+
+error = "red"
+hint = "green"
+info = "blue"
+warning = "yellow"
+
+"ui.background" = { fg = "fg0", bg = "bg0" }
+"ui.bufferline" = { fg = "fg1", bg = "bg4" }
+"ui.bufferline.active" = { fg = "bg0", bg = "grey2" }
+"ui.bufferline.background" = { bg = "bg1" }
+"ui.cursor" = { fg = "bg0", bg = "grey1" }
+"ui.cursor.primary" = { fg = "bg0", bg = "fg0" }
+"ui.cursor.match" = { bg = "bg2" }
+"ui.cursorline.primary" = { bg = "bg1" }
+"ui.help" = { fg = "grey1", bg = "bg0" }
+"ui.highlight" = { bg = "bg2" }
+"ui.linenr" = "bg3"
+"ui.linenr.selected" = "grey1"
+"ui.menu" = { fg = "fg1", bg = "bg2" }
+"ui.menu.scroll" = { fg = "grey0", bg = "bg1" }
+"ui.menu.selected" = { fg = "bg2", bg = "grey2" }
+"ui.popup" = { fg = "fg1", bg = "bg2" }
+"ui.popup.info" = { "fg" = "grey1", bg = "bg0" }
+"ui.selection" = { bg = "bg2" }
+"ui.statusline" = { fg = "fg1", bg = "bg1" }
+"ui.statusline.inactive" = { fg = "grey1", bg = "bg1" }
+"ui.statusline.insert" = { fg = "bg0", bg = "green" }
+"ui.statusline.normal" = { fg = "bg0", bg = "grey2" }
+"ui.statusline.select" = { fg = "bg0", bg = "red" }
+"ui.text" = "fg0"
+"ui.text.directory" = { fg = "blue" }
+"ui.text.focus" = { bg = "bg2" }
+"ui.text.inactive" = { fg = "grey1" }
+"ui.text.info" = "grey1"
+"ui.virtual" = "grey0"
+"ui.virtual.indent-guide" = "bg3"
+"ui.virtual.inlay-hint" = "grey0"
+"ui.virtual.jump-label" = "grey2"
+"ui.virtual.ruler" = { bg = "bg1" }
+"ui.window" = { fg = "bg3" }
+
+[palette]
+fg0 = "#d4be98"
+fg1 = "#ddc7a1"
+
+bg0 = "#282828"
+bg1 = "#32302f"
+bg2 = "#45403d"
+bg3 = "#5a524c"
+bg4 = "#504945"
+
+grey0 = "#7c6f64"
+grey1 = "#928374"
+grey2 = "#a89984"
+
+aqua = "#89b482"
+blue = "#7daea3"
+green = "#a9b665"
+orange = "#e78a4e"
+purple = "#d3869b"
+red = "#ea6962"
+yellow = "#d8a657"

runtime/themes/gruvbox_material_dark_soft.toml

@@ -0,0 +1,14 @@
+# Gruvbox Material Dark Soft for Helix
+# Original Author: @sainnhe (https://github.com/sainnhe/gruvbox-material)
+# Base theme ported by: @satoqz
+# Palette ported by: @ivan-shymkiv
+# License: MIT
+
+inherits = "gruvbox_material_dark_medium"
+
+[palette]
+bg0 = "#32302f"
+bg1 = "#3c3836"
+bg2 = "#504945"
+bg3 = "#665c54"
+bg4 = "#5b534d"

runtime/themes/gruvbox_material_light_hard.toml

@@ -0,0 +1,14 @@
+# Gruvbox Material Light Hard for Helix
+# Original Author: @sainnhe (https://github.com/sainnhe/gruvbox-material)
+# Base theme ported by: @satoqz
+# Palette ported by: @ivan-shymkiv
+# License: MIT
+
+inherits = "gruvbox_material_light_medium"
+
+[palette]
+bg0 = "#f9f5d7"
+bg1 = "#f5edca"
+bg2 = "#f2e5bc"
+bg3 = "#ebdbb2"
+bg4 = "#eee0b7"

runtime/themes/gruvbox_material_light_medium.toml

@@ -0,0 +1,129 @@
+# Gruvbox Material Light Medium for Helix
+# Original Author: @sainnhe (https://github.com/sainnhe/gruvbox-material)
+# Base theme ported by: @satoqz
+# Palette ported by: @ivan-shymkiv
+# License: MIT
+
+"attribute" = "green"
+"comment" = { fg = "grey1", modifiers = ["italic"] }
+"constant" = "fg0"
+"constant.builtin" = "purple"
+"constant.character.escape" = "green"
+"constant.numeric" = "purple"
+"constructor" = "green"
+"function" = "green"
+"keyword" = "red"
+"keyword.directive" = "purple"
+"keyword.operator" = "orange"
+"label" = "red"
+"namespace" = "yellow"
+"operator" = "orange"
+"punctuation" = "grey1"
+"punctuation.bracket" = "fg0"
+"punctuation.delimiter" = "grey1"
+"punctuation.special" = "blue"
+"special" = "green"
+"string" = "aqua"
+"string.regexp" = "green"
+"string.special.path" = "yellow"
+"string.special.symbol" = "fg0"
+"string.special.url" = { fg = "fg0", modifiers = ["underlined"] }
+"tag" = "orange"
+"type" = "yellow"
+"type.enum.variant" = "purple"
+"variable" = "fg0"
+"variable.builtin" = "purple"
+"variable.other.member" = "blue"
+"variable.parameter" = "fg0"
+
+"markup.heading.1" = "red"
+"markup.heading.2" = "orange"
+"markup.heading.3" = "yellow"
+"markup.heading.4" = "green"
+"markup.heading.5" = "blue"
+"markup.heading.6" = "purple"
+
+"markup.bold" = { fg = "fg0", modifiers = ["bold"] }
+"markup.italic" = { fg = "fg0", modifiers = ["italic"] }
+"markup.strikethrough" = { fg = "fg0", modifiers = ["crossed_out"] }
+
+"markup.link.label" = "blue"
+"markup.link.text" = "yellow"
+"markup.link.url" = { fg = "blue", modifiers = ["underlined"] }
+"markup.list" = "blue"
+"markup.list.checked" = "green"
+"markup.list.unchecked" = "grey1"
+"markup.quote" = "grey1"
+"markup.raw" = "green"
+
+"diff.delta" = "blue"
+"diff.minus" = "red"
+"diff.plus" = "green"
+
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "green", style = "curl" } }
+"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
+
+error = "red"
+hint = "green"
+info = "blue"
+warning = "yellow"
+
+"ui.background" = { fg = "fg0", bg = "bg0" }
+"ui.bufferline" = { fg = "fg1", bg = "bg4" }
+"ui.bufferline.active" = { fg = "bg0", bg = "grey2" }
+"ui.bufferline.background" = { bg = "bg1" }
+"ui.cursor" = { fg = "bg0", bg = "grey1" }
+"ui.cursor.primary" = { fg = "bg0", bg = "fg0" }
+"ui.cursor.match" = { bg = "bg2" }
+"ui.cursorline.primary" = { bg = "bg1" }
+"ui.help" = { fg = "grey1", bg = "bg0" }
+"ui.highlight" = { bg = "bg2" }
+"ui.linenr" = "bg3"
+"ui.linenr.selected" = "grey1"
+"ui.menu" = { fg = "fg1", bg = "bg2" }
+"ui.menu.scroll" = { fg = "grey0", bg = "bg1" }
+"ui.menu.selected" = { fg = "bg2", bg = "grey2" }
+"ui.popup" = { fg = "fg1", bg = "bg2" }
+"ui.popup.info" = { "fg" = "grey1", bg = "bg0" }
+"ui.selection" = { bg = "bg2" }
+"ui.statusline" = { fg = "fg1", bg = "bg1" }
+"ui.statusline.inactive" = { fg = "grey1", bg = "bg1" }
+"ui.statusline.insert" = { fg = "bg0", bg = "green" }
+"ui.statusline.normal" = { fg = "bg0", bg = "grey2" }
+"ui.statusline.select" = { fg = "bg0", bg = "red" }
+"ui.text" = "fg0"
+"ui.text.directory" = { fg = "blue" }
+"ui.text.focus" = { bg = "bg2" }
+"ui.text.inactive" = { fg = "grey1" }
+"ui.text.info" = "grey1"
+"ui.virtual" = "grey0"
+"ui.virtual.indent-guide" = "bg3"
+"ui.virtual.inlay-hint" = "grey0"
+"ui.virtual.jump-label" = "grey2"
+"ui.virtual.ruler" = { bg = "bg1" }
+"ui.window" = { fg = "bg3" }
+
+[palette]
+fg0 = "#654735"
+fg1 = "#4f3829"
+
+bg0 = "#fbf1c7"
+bg1 = "#f4e8be"
+bg2 = "#eee0b7"
+bg3 = "#ddccab"
+bg4 = "#e5d5ad"
+
+grey0 = "#a89984"
+grey1 = "#928374"
+grey2 = "#7c6f64"
+
+aqua = "#4c7a5d"
+blue = "#45707a"
+green = "#6c782e"
+orange = "#c35e0a"
+purple = "#945e80"
+red = "#c14a4a"
+yellow = "#b47109"

runtime/themes/gruvbox_material_light_soft.toml

@@ -0,0 +1,14 @@
+# Gruvbox Material Light Soft for Helix
+# Original Author: @sainnhe (https://github.com/sainnhe/gruvbox-material)
+# Base theme ported by: @satoqz
+# Palette ported by: @ivan-shymkiv
+# License: MIT
+
+inherits = "gruvbox_material_light_medium"
+
+[palette]
+bg0 = "#f2e5bc"
+bg1 = "#eddeb5"
+bg2 = "#e6d5ae"
+bg3 = "#d5c4a1"
+bg4 = "#dac9a5"