Merge branch 'master' into dylanbulfin/bufferline_duplicate_names

book/book.toml

@@ -9,3 +9,4 @@ edit-url-template = "https://github.com/helix-editor/helix/tree/master/book/{pat
 cname = "docs.helix-editor.com"
 default-theme = "colibri"
 preferred-dark-theme = "colibri"
+git-repository-url = "https://github.com/helix-editor/helix"

book/src/generated/lang-support.md

@@ -51,7 +51,7 @@
 | gowork | ✓ |  |  | `gopls` |
 | graphql | ✓ |  |  |  |
 | hare | ✓ |  |  |  |
-| haskell | ✓ |  |  | `haskell-language-server-wrapper` |
+| haskell | ✓ | ✓ |  | `haskell-language-server-wrapper` |
 | hcl | ✓ |  | ✓ | `terraform-ls` |
 | heex | ✓ | ✓ |  | `elixir-ls` |
 | html | ✓ |  |  | `vscode-html-language-server` |

book/src/generated/typable-cmd.md

@@ -71,4 +71,5 @@
 | `:insert-output` | Run shell command, inserting output before each selection. |
 | `:append-output` | Run shell command, appending output after each selection. |
 | `:pipe` | Pipe each selection to the shell command. |
+| `:pipe-to` | Pipe each selection to the shell command, ignoring output. |
 | `:run-shell-command`, `:sh` | Run a shell command |

book/src/themes.md

@@ -103,7 +103,7 @@ Some styles might not be supported by your terminal emulator.
 | `line`         |
 | `curl`         |
 | `dashed`       |
-| `dot`          |
+| `dotted`       |
 | `double_line`  |
 
 

helix-core/src/lib.rs

@@ -69,7 +69,7 @@ pub fn find_root(root: Option<&str>, root_markers: &[String]) -> std::path::Path
             top_marker = Some(ancestor);
         }
 
-        if ancestor.join(".git").is_dir() {
+        if ancestor.join(".git").exists() {
             // Top marker is repo root if not root marker was detected yet
             if top_marker.is_none() {
                 top_marker = Some(ancestor);

helix-loader/src/grammar.rs

@@ -263,7 +263,7 @@ fn fetch_grammar(grammar: GrammarConfiguration) -> Result<FetchStatus> {
         ))?;
 
         // create the grammar dir contains a git directory
-        if !grammar_dir.join(".git").is_dir() {
+        if !grammar_dir.join(".git").exists() {
             git(&grammar_dir, ["init"])?;
         }
 

helix-loader/src/lib.rs

@@ -97,7 +97,7 @@ pub fn find_local_config_dirs() -> Vec<PathBuf> {
     let mut directories = Vec::new();
 
     for ancestor in current_dir.ancestors() {
-        if ancestor.join(".git").is_dir() {
+        if ancestor.join(".git").exists() {
             directories.push(ancestor.to_path_buf());
             // Don't go higher than repo if we're in one
             break;

helix-term/src/commands.rs

@@ -2672,62 +2672,7 @@ fn open_above(cx: &mut Context) {
 }
 
 fn normal_mode(cx: &mut Context) {
-    if cx.editor.mode == Mode::Normal {
-        return;
-    }
-
-    cx.editor.mode = Mode::Normal;
-    let (view, doc) = current!(cx.editor);
-
-    try_restore_indent(doc, view);
-
-    // if leaving append mode, move cursor back by 1
-    if doc.restore_cursor {
-        let text = doc.text().slice(..);
-        let selection = doc.selection(view.id).clone().transform(|range| {
-            Range::new(
-                range.from(),
-                graphemes::prev_grapheme_boundary(text, range.to()),
-            )
-        });
-
-        doc.set_selection(view.id, selection);
-        doc.restore_cursor = false;
-    }
-}
-
-fn try_restore_indent(doc: &mut Document, view: &mut View) {
-    use helix_core::chars::char_is_whitespace;
-    use helix_core::Operation;
-
-    fn inserted_a_new_blank_line(changes: &[Operation], pos: usize, line_end_pos: usize) -> bool {
-        if let [Operation::Retain(move_pos), Operation::Insert(ref inserted_str), Operation::Retain(_)] =
-            changes
-        {
-            move_pos + inserted_str.len() == pos
-                && inserted_str.starts_with('\n')
-                && inserted_str.chars().skip(1).all(char_is_whitespace)
-                && pos == line_end_pos // ensure no characters exists after current position
-        } else {
-            false
-        }
-    }
-
-    let doc_changes = doc.changes().changes();
-    let text = doc.text().slice(..);
-    let range = doc.selection(view.id).primary();
-    let pos = range.cursor(text);
-    let line_end_pos = line_end_char_index(&text, range.cursor_line(text));
-
-    if inserted_a_new_blank_line(doc_changes, pos, line_end_pos) {
-        // Removes tailing whitespaces.
-        let transaction =
-            Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| {
-                let line_start_pos = text.line_to_char(range.cursor_line(text));
-                (line_start_pos, pos, None)
-            });
-        apply_transaction(&transaction, doc, view);
-    }
+    cx.editor.enter_normal_mode();
 }
 
 // Store a jump on the jumplist.

helix-term/src/commands/typed.rs

@@ -1741,13 +1741,30 @@ fn insert_output(
     Ok(())
 }
 
+fn pipe_to(
+    cx: &mut compositor::Context,
+    args: &[Cow<str>],
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    pipe_impl(cx, args, event, &ShellBehavior::Ignore)
+}
+
 fn pipe(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) -> anyhow::Result<()> {
+    pipe_impl(cx, args, event, &ShellBehavior::Replace)
+}
+
+fn pipe_impl(
+    cx: &mut compositor::Context,
+    args: &[Cow<str>],
+    event: PromptEvent,
+    behavior: &ShellBehavior,
+) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
     ensure!(!args.is_empty(), "Shell command required");
-    shell(cx, &args.join(" "), &ShellBehavior::Replace);
+    shell(cx, &args.join(" "), behavior);
     Ok(())
 }
 
@@ -2292,6 +2309,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
             fun: pipe,
             completer: None,
         },
+        TypableCommand {
+            name: "pipe-to",
+            aliases: &[],
+            doc: "Pipe each selection to the shell command, ignoring output.",
+            fun: pipe_to,
+            completer: None,
+        },
         TypableCommand {
             name: "run-shell-command",
             aliases: &["sh"],

helix-term/src/ui/mod.rs

@@ -207,7 +207,7 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
 
     // Cap the number of files if we aren't in a git project, preventing
     // hangs when using the picker in your home directory
-    let files: Vec<_> = if root.join(".git").is_dir() {
+    let files: Vec<_> = if root.join(".git").exists() {
         files.collect()
     } else {
         // const MAX: usize = 8192;

helix-view/src/editor.rs

@@ -1005,6 +1005,8 @@ impl Editor {
             return;
         }
 
+        self.enter_normal_mode();
+
         match action {
             Action::Replace => {
                 let (view, doc) = current_ref!(self);
@@ -1025,6 +1027,9 @@ impl Editor {
                 let (view, doc) = current!(self);
                 let view_id = view.id;
 
+                // Append any outstanding changes to history in the old document.
+                doc.append_changes_to_history(view);
+
                 if remove_empty_scratch {
                     // Copy `doc.id` into a variable before calling `self.documents.remove`, which requires a mutable
                     // borrow, invalidating direct access to `doc.id`.
@@ -1262,7 +1267,7 @@ impl Editor {
         // if leaving the view: mode should reset and the cursor should be
         // within view
         if prev_id != view_id {
-            self.mode = Mode::Normal;
+            self.enter_normal_mode();
             self.ensure_cursor_in_view(view_id);
 
             // Update jumplist selections with new document changes.
@@ -1427,4 +1432,67 @@ impl Editor {
 
         Ok(())
     }
+
+    /// Switches the editor into normal mode.
+    pub fn enter_normal_mode(&mut self) {
+        use helix_core::{graphemes, Range};
+
+        if self.mode == Mode::Normal {
+            return;
+        }
+
+        self.mode = Mode::Normal;
+        let (view, doc) = current!(self);
+
+        try_restore_indent(doc, view);
+
+        // if leaving append mode, move cursor back by 1
+        if doc.restore_cursor {
+            let text = doc.text().slice(..);
+            let selection = doc.selection(view.id).clone().transform(|range| {
+                Range::new(
+                    range.from(),
+                    graphemes::prev_grapheme_boundary(text, range.to()),
+                )
+            });
+
+            doc.set_selection(view.id, selection);
+            doc.restore_cursor = false;
+        }
+    }
+}
+
+fn try_restore_indent(doc: &mut Document, view: &mut View) {
+    use helix_core::{
+        chars::char_is_whitespace, line_ending::line_end_char_index, Operation, Transaction,
+    };
+
+    fn inserted_a_new_blank_line(changes: &[Operation], pos: usize, line_end_pos: usize) -> bool {
+        if let [Operation::Retain(move_pos), Operation::Insert(ref inserted_str), Operation::Retain(_)] =
+            changes
+        {
+            move_pos + inserted_str.len() == pos
+                && inserted_str.starts_with('\n')
+                && inserted_str.chars().skip(1).all(char_is_whitespace)
+                && pos == line_end_pos // ensure no characters exists after current position
+        } else {
+            false
+        }
+    }
+
+    let doc_changes = doc.changes().changes();
+    let text = doc.text().slice(..);
+    let range = doc.selection(view.id).primary();
+    let pos = range.cursor(text);
+    let line_end_pos = line_end_char_index(&text, range.cursor_line(text));
+
+    if inserted_a_new_blank_line(doc_changes, pos, line_end_pos) {
+        // Removes tailing whitespaces.
+        let transaction =
+            Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| {
+                let line_start_pos = text.line_to_char(range.cursor_line(text));
+                (line_start_pos, pos, None)
+            });
+        crate::apply_transaction(&transaction, doc, view);
+    }
 }

languages.toml

@@ -918,13 +918,19 @@ grammar = "scheme"
 name = "common-lisp"
 scope = "source.lisp"
 roots = []
-file-types = ["lisp", "asd", "cl", "l", "lsp", "ny"," podsl", "sexp"]
+file-types = ["lisp", "asd", "cl", "l", "lsp", "ny", "podsl", "sexp"]
 shebangs = ["lisp", "sbcl", "ccl", "clisp", "ecl"]
 comment-token = ";"
 indent = { tab-width = 2, unit = "  " }
 language-server = { command = "cl-lsp", args = [ "stdio" ] }
 grammar = "scheme"
 
+[language.auto-pairs]
+'(' = ')'
+'{' = '}'
+'[' = ']'
+'"' = '"'
+
 [[language]]
 name = "comment"
 scope = "scope.comment"
@@ -1083,7 +1089,7 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-git-commit", rev
 name = "diff"
 scope = "source.diff"
 roots = []
-file-types = ["diff"]
+file-types = ["diff", "patch"]
 injection-regex = "diff"
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
@@ -1577,7 +1583,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "scheme"
-source = { git = "https://github.com/6cdh/tree-sitter-scheme", rev = "27fb77db05f890c2823b4bd751c6420378df146b" }
+source = { git = "https://github.com/6cdh/tree-sitter-scheme", rev = "c0741320bfca6b7b5b7a13b5171275951e96a842" }
 
 [[language]]
 name = "v"

runtime/queries/haskell/textobjects.scm

@@ -0,0 +1,13 @@
+(comment) @comment.inside
+
+[
+  (adt)
+  (decl_type)
+  (newtype)
+] @class.around
+
+((signature)? (function rhs:(_) @function.inside)) @function.around 
+(exp_lambda) @function.around
+
+(adt (type_variable) @parameter.inside)
+(patterns (_) @parameter.inside)

runtime/queries/rust/highlights.scm

@@ -5,8 +5,6 @@
 ; overrides are unnecessary.
 ; -------
 
-
-
 ; -------
 ; Types
 ; -------
@@ -241,6 +239,14 @@
 
 
 
+(attribute
+  (identifier) @_macro
+  arguments: (token_tree (identifier) @constant.numeric.integer)
+  (#eq? @_macro "derive")
+)
+@special
+
+
 ; -------
 ; Functions
 ; -------
@@ -271,6 +277,7 @@
 ; ---
 ; Macros
 ; ---
+
 (attribute
   (identifier) @function.macro)
 (attribute

runtime/queries/scheme/highlights.scm

@@ -2,29 +2,40 @@
 (character) @constant.character
 (boolean) @constant.builtin.boolean
 
-[(string)
- (character)] @string
+(string) @string
 
 (escape_sequence) @constant.character.escape
 
-[(comment)
- (block_comment)
- (directive)] @comment
+(comment) @comment.line
+(block_comment) @comment.block
+(directive) @keyword.directive
 
-[(boolean)
- (character)] @constant
+; operators
 
-((symbol) @function.builtin
- (#match? @function.builtin "^(eqv\\?|eq\\?|equal\\?)")) ; TODO
+((symbol) @operator
+ (#match? @operator "^(\\+|-|\\*|/|=|>|<|>=|<=)$"))
 
 ; keywords
 
-((symbol) @keyword.conditional
- (#match? @keyword.conditional "^(if|cond|case|when|unless)$"))
+(list
+  .
+  ((symbol) @keyword.conditional
+   (#match? @keyword.conditional "^(if|cond|case|when|unless)$"
+  )))
  
-((symbol) @keyword
- (#match? @keyword
-  "^(define|lambda|begin|do|define-syntax|and|or|if|cond|case|when|unless|else|=>|let|let*|let-syntax|let-values|let*-values|letrec|letrec*|letrec-syntax|set!|syntax-rules|identifier-syntax|quote|unquote|quote-splicing|quasiquote|unquote-splicing|delay|assert|library|export|import|rename|only|except|prefix)$"))
+(list
+  .
+  (symbol) @keyword
+  (#match? @keyword
+   "^(define-syntax|let\\*|lambda|λ|case|=>|quote-splicing|unquote-splicing|set!|let|letrec|letrec-syntax|let-values|let\\*-values|do|else|define|cond|syntax-rules|unquote|begin|quote|let-syntax|and|if|quasiquote|letrec|delay|or|when|unless|identifier-syntax|assert|library|export|import|rename|only|except|prefix)$"
+   ))
+
+(list
+  .
+  (symbol) @function.builtin
+  (#match? @function.builtin
+   "^(caar|cadr|call-with-input-file|call-with-output-file|cdar|cddr|list|open-input-file|open-output-file|with-input-from-file|with-output-to-file|\\*|\\+|-|/|<|<=|=|>|>=|abs|acos|angle|append|apply|asin|assoc|assq|assv|atan|boolean\\?|caaaar|caaadr|caaar|caadar|caaddr|caadr|cadaar|cadadr|cadar|caddar|cadddr|caddr|call-with-current-continuation|call-with-values|car|cdaaar|cdaadr|cdaar|cdadar|cdaddr|cdadr|cddaar|cddadr|cddar|cdddar|cddddr|cdddr|cdr|ceiling|char->integer|char-alphabetic\\?|char-ci<=\\?|char-ci<\\?|char-ci=\\?|char-ci>=\\?|char-ci>\\?|char-downcase|char-lower-case\\?|char-numeric\\?|char-ready\\?|char-upcase|char-upper-case\\?|char-whitespace\\?|char<=\\?|char<\\?|char=\\?|char>=\\?|char>\\?|char\\?|close-input-port|close-output-port|complex\\?|cons|cos|current-error-port|current-input-port|current-output-port|denominator|display|dynamic-wind|eof-object\\?|eq\\?|equal\\?|eqv\\?|eval|even\\?|exact->inexact|exact\\?|exp|expt|floor|flush-output|for-each|force|gcd|imag-part|inexact->exact|inexact\\?|input-port\\?|integer->char|integer\\?|interaction-environment|lcm|length|list->string|list->vector|list-ref|list-tail|list\\?|load|log|magnitude|make-polar|make-rectangular|make-string|make-vector|map|max|member|memq|memv|min|modulo|negative\\?|newline|not|null-environment|null\\?|number->string|number\\?|numerator|odd\\?|output-port\\?|pair\\?|peek-char|positive\\?|procedure\\?|quotient|rational\\?|rationalize|read|read-char|real-part|real\\?|remainder|reverse|round|scheme-report-environment|set-car!|set-cdr!|sin|sqrt|string|string->list|string->number|string->symbol|string-append|string-ci<=\\?|string-ci<\\?|string-ci=\\?|string-ci>=\\?|string-ci>\\?|string-copy|string-fill!|string-length|string-ref|string-set!|string<=\\?|string<\\?|string=\\?|string>=\\?|string>\\?|string\\?|substring|symbol->string|symbol\\?|tan|transcript-off|transcript-on|truncate|values|vector|vector->list|vector-fill!|vector-length|vector-ref|vector-set!|vector\\?|write|write-char|zero\\?)$"
+   ))
 
 ; special forms
 
@@ -47,26 +58,16 @@
  .
  (list
    (list
-     (symbol) @variable))
+     (symbol) @variable.parameter))
  (#match? @_f
   "^(let|let\\*|let-syntax|let-values|let\\*-values|letrec|letrec\\*|letrec-syntax)$"))
 
-; operators
-
-(list
-  .
-  (symbol) @operator
-  (#match? @operator "^([+*/<>=-]|(<=)|(>=))$"))
-  
 ; quote
 
-(abbreviation
-  "'" (symbol)) @constant
-
 (list
  .
  (symbol) @_f
- (#eq? @_f "quote")) @symbol
+ (#eq? @_f "quote")) @string.symbol
 
 ; library
 
@@ -89,12 +90,10 @@
 ((symbol) @variable.builtin
  (#eq? @variable.builtin "..."))
 
-(symbol) @variable
 ((symbol) @variable.builtin
  (#eq? @variable.builtin "."))
 
 (symbol) @variable
 
-
 ["(" ")" "[" "]" "{" "}"] @punctuation.bracket
 

runtime/themes/base16_transparent.toml

@@ -1,27 +1,28 @@
 # Author: GreasySlug <9619abgoni@gmail.com>
+# This theme is base on base16_theme(Author: NNB <nnbnh@protonmail.com>)
 
 "ui.background" = { fg = "white"}
 "ui.background.separator" = { fg = "gray" }
-"ui.menu" = { fg = "gray" }
+"ui.menu" = { fg = "white" }
 "ui.menu.selected" = { modifiers = ["reversed"] }
 "ui.menu.scroll" = { fg = "light-gray" }
 "ui.linenr" = { fg = "light-gray" }
 "ui.linenr.selected" = { fg = "white",  modifiers = ["bold"] }
 "ui.popup" = { fg = "white" }
 "ui.window" = { fg = "white" }
-"ui.selection" = { modifiers = [ "reversed"] }
-"comment" = { fg = "gray", modifiers = ["italic"] }
+"ui.selection" = { bg = "gray" }
+"comment" = "light-gray"
 "ui.statusline" = { fg = "white" }
 "ui.statusline.inactive" = { fg = "gray" }
-"ui.statusline.normal" = { fg = "blue", modifiers = ["reversed"] }
-"ui.statusline.insert" = { fg = "green", modifiers = ["reversed"] }
-"ui.statusline.select" = { fg = "magenta", modifiers = ["reversed"] }
+"ui.statusline.normal" = { fg = "black", bg = "blue" }
+"ui.statusline.insert" = { fg = "black", bg = "green" }
+"ui.statusline.select" = { fg = "black", bg = "magenta" }
 "ui.help" = { fg = "light-gray" }
 "ui.cursor" = { modifiers = ["reversed"] }
-"ui.cursor.match" = { fg = "light-yellow", modifiers = ["underlined"] }
+"ui.cursor.match" = { fg = "light-yellow", underline = { color = "light-yellow", style = "line" } }
 "ui.cursor.primary" = { modifiers = ["reversed", "slow_blink"] }
 "ui.cursor.secondary" = { modifiers = ["reversed"] }
-"ui.virtual.ruler" = { fg = "gray", modifiers = ["reversed"] }
+"ui.virtual.ruler" = { bg = "gray" }
 "ui.virtual.whitespace" = "gray"
 "ui.virtual.indent-guide" = "gray"
 
@@ -44,7 +45,7 @@
 "markup.list" = "light-red"
 "markup.bold" = { fg = "light-yellow", modifiers = ["bold"] }
 "markup.italic" = { fg = "light-magenta", modifiers = ["italic"] }
-"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
+"markup.link.url" = { fg = "yellow", underline = { color = "yellow", style = "line"} }
 "markup.link.text" = "light-red"
 "markup.quote" = "light-cyan"
 "markup.raw" = "green"
@@ -53,19 +54,19 @@
 "markup.select" = { fg = "magenta" }
 
 "diff.plus" = "light-green"
-"diff.delta" = "yellow"
+"diff.delta" = "light-blue"
+"diff.delta.moved" = "blue"
 "diff.minus" = "light-red"
 
-"ui.gutter" = "gray" 
-"info" = "light-blue" 
-"hint" = "gray" 
-"debug" = "gray"  
-"warning" = "yellow" 
-"error" = "light-red" 
+"ui.gutter" = "gray"
+"info" = "light-blue"
+"hint" = "light-gray"
+"debug" = "light-gray"
+"warning" = "light-yellow"
+"error" = "light-red"
 
-"diagnostic" = { modifiers = ["underlined"] }
-"diagnostic.info" = { fg = "light-blue", modifiers = ["underlined"] }
-"diagnostic.hint" = { fg = "gray", modifiers = ["underlined"] }
-"diagnostic.debug" ={ fg ="gray",  modifiers = ["underlined"] }
-"diagnostic.warning" = { fg = "yellow", modifiers = ["underlined"] }
-"diagnostic.error" = { fg ="light-red", modifiers = ["underlined"] }
+"diagnostic.info" = { underline = { color = "light-blue", style = "dotted" } }
+"diagnostic.hint" = { underline = { color = "light-gray", style = "double_line" } }
+"diagnostic.debug" = { underline ={ color ="light-gray", style = "dashed" } }
+"diagnostic.warning" = { underline = { color = "light-yellow", style = "curl" } }
+"diagnostic.error" = { underline = { color ="light-red", style = "curl" } }

runtime/themes/dark_high_contrast.toml

@@ -9,29 +9,29 @@
 "ui.text.focus" = { modifiers = ["reversed"] } # file picker selected
 
 "ui.virtual.whitespace" = "gray"
-"ui.virtual.ruler" = { fg = "gray", bg = "white", modifiers = ["reversed"] }
+"ui.virtual.ruler" = { fg = "white", bg = "gray" }
 "ui.virtual.indent-guide" = "white"
 
 "ui.statusline" = { fg = "white", bg = "deep_blue" }
-"ui.statusline.inactive" = { fg = "gray" }
+"ui.statusline.inactive" = { fg = "gray", bg = "deep_blue" }
 "ui.statusline.normal" = { fg = "black", bg = "aqua" }
 "ui.statusline.insert" = { fg = "black", bg = "orange" }
 "ui.statusline.select" = { fg = "black", bg = "purple" }
-# "ui.statusline.separator" = { fg = "aqua", bg = "white" }
+"ui.statusline.separator" = { fg = "aqua", bg = "white" }
 
 "ui.cursor" = { fg = "black", bg = "white" }
 "ui.cursor.insert" = { fg = "black", bg = "white" }
 "ui.cursor.select" = { fg = "black", bg = "white" }
 "ui.cursor.match" = { bg = "white", modifiers = ["dim"] }
 "ui.cursor.primary" = { fg = "black", bg = "white", modifiers = ["slow_blink"] }
-
 "ui.cursor.secondary" = "white"
-"ui.cursorline.primary" = { fg = "orange", modifiers = ["underlined"] }
-"ui.cursorline.secondary" = { fg = "orange", modifiers = ["underlined"] }
-"ui.selection" = { fg = "deep_blue", bg = "white" }
+"ui.cursorline.primary" = { bg = "deep_blue", underline = { color = "orange", style = "double_line" } }
+"ui.cursorline.secondary" = { bg = "dark_blue", underline = { color = "white", style = "line" } }
+"ui.selection" = { fg = "dark_blue", bg = "white" }
+"ui.selection.primary" = { fg = "deep_blue", bg = "white" }
 
 "ui.menu" = { fg = "white", bg = "deep_blue" }
-"ui.menu.selected" = { fg = "orange", modifiers = ["underlined"] }
+"ui.menu.selected" = { fg = "orange", underline = { style = "line" } }
 "ui.menu.scroll" = { fg = "aqua", bg = "black" }
 "ui.help" = { fg = "white", bg = "deep_blue" }
 
@@ -39,15 +39,16 @@
 "ui.popup.info" = { fg = "white", bg = "deep_blue" }
 
 "ui.gutter" = { bg = "black" }
+"ui.gutter.selected" = { bg = "black" }
 "ui.linenr" = { fg = "white", bg = "black" }
 "ui.linenr.selected" = { fg = "orange", bg = "black", modifiers = ["bold"] }
 
 # Diagnostic
-"diagnostic" = "white"
-"diagnostic.info" = { bg = "white", modifiers = ["underlined"] }
-"diagnostic.hint" = { fg = "yellow", modifiers = ["underlined"] }
-"diagnostic.warning" = { fg = "orange", modifiers = ["underlined"] }
-"diagnostic.error" = { fg = "red", modifiers = ["underlined"] }
+"diagnostic" = { fg = "white" }
+"diagnostic.info" = { underline = { color = "white", style = "dotted" } }
+"diagnostic.hint" = { underline = { color = "yellow", style = "dashed" } }
+"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
 "info" = "white" 
 "hint" = "yellow"
 "warning" = "orange"
@@ -59,31 +60,31 @@
 "diff.minus" = "pink"
 
 # Syntax high light
-"type" = { fg = "emerald_green" }
+"type" = "emerald_green"
 "type.buildin" = "emerald_green"
-"comment" = { fg = "white" }
+"comment" = "white"
 "operator" = "white"
-"variable" = { fg = "aqua" }
+"variable" = "aqua"
 "variable.other.member" = "brown"
 "constant" = "aqua"
 "constant.numeric" = "emerald_green"
-"attributes" = { fg = "blue" }
+"attributes" = "blue"
 "namespace" = "blue"
 "string" = "brown"
-"string.special.url" = { fg = "brown", modifiers =["underlined"]}
+"string.special.url" = "brown"
 "constant.character.escape" = "yellow"
 "constructor" = "aqua"
-"keyword" = { fg = "blue", modifiers = ["underlined"] }
+"keyword" = "blue"
 "keyword.control" = "purple"
 "function" = "yellow"
 "label" = "blue"
 
 # Markup 
-"markup.heading" = { fg = "yellow", modifiers = ["bold", "underlined"] }
-"markup.list" = { fg = "pink" }
+"markup.heading" = { fg = "yellow", modifiers = ["bold"], underline = { color = "yellow", style = "double_line"} }
+"markup.list" = "pink"
 "markup.bold" = { fg = "emerald_green", modifiers = ["bold"] }
 "markup.italic" = { fg = "blue", modifiers = ["italic"] }
-"markup.link.url" = { fg = "blue", modifiers = ["underlined"] }
+"markup.link.url" = { fg = "blue", underline = { color = "blue", style = "line" } }
 "markup.link.text" = "pink"
 "markup.quote" = "yellow"
 "markup.raw" = "brown"
@@ -94,6 +95,7 @@ gray = "#585858"
 white = "#ffffff"
 blue = "#66a4ff"
 deep_blue = "#142743"
+dark_blue = "#0d1a2d"
 aqua = "#6fc3df"
 purple = "#c586c0"
 red = "#b65f5f"