Merge 85eac89ec0 into 5ee7411450

book/src/configuration.md

@@ -94,7 +94,7 @@ ### `[editor.statusline]` Section
 
 | Key           | Description | Default |
 | ---           | ---         | ---     |
-| `left`        | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name", "read-only-indicator", "file-modification-indicator"]` |
+| `left`        | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name", "read-only-indicator", "zoom", "file-modification-indicator"]` |
 | `center`      | A list of elements aligned to the middle of the statusline | `[]` |
 | `right`       | A list of elements aligned to the right of the statusline | `["diagnostics", "selections", "register", "position", "file-encoding"]` |
 | `separator`   | The character used to separate elements in the statusline | `"│"` |
@@ -127,6 +127,7 @@ ### `[editor.statusline]` Section
 | `spacer` | Inserts a space between elements (multiple/contiguous spacers may be specified) |
 | `version-control` | The current branch name or detached commit hash of the opened workspace |
 | `register` | The current selected register |
+| `zoom` | The current window zoom/zen state |
 
 ### `[editor.lsp]` Section
 

book/src/generated/typable-cmd.md

@@ -88,3 +88,4 @@
 | `:move` | Move the current buffer and its corresponding file to a different path |
 | `:yank-diagnostic` | Yank diagnostic(s) under primary cursor to register, or clipboard by default |
 | `:read`, `:r` | Load a file into buffer |
+| `:set-max-width` | Set the maximum width of the editor. If set to 0 it will take up the entire width. |

book/src/keymap.md

@@ -269,6 +269,7 @@ #### Window mode
 | `J`                    | Swap window downwards                                | `swap_view_down`  |
 | `K`                    | Swap window upwards                                  | `swap_view_up`    |
 | `L`                    | Swap window to the right                             | `swap_view_right` |
+| `z`                    | Toggle zoom for the focused view                     | `toggle_zoom`     |
 
 #### Space mode
 

book/src/remapping.md

@@ -46,6 +46,10 @@ # create a new minor mode bound to `+`
 m = ":run-shell-command make"
 c = ":run-shell-command cargo build"
 t = ":run-shell-command cargo test"
+
+# Creates a basic 'zen-mode' similar to VSCode's
+z = ["toggle_zoom", ":set-max-width 120", ":set gutters.layout []"]
+Z = ["toggle_zoom", ":set-max-width 0", ':set gutters.layout ["diagnostics","spacer","line-numbers","spacer","diff"]']
 ```
 
 ## Special keys and modifiers

helix-term/src/commands.rs

@@ -462,6 +462,7 @@ pub fn doc(&self) -> &str {
         vsplit_new, "Vertical right split scratch buffer",
         wclose, "Close window",
         wonly, "Close windows except current",
+        toggle_zoom, "Toggle zoom for current window",
         select_register, "Select register",
         insert_register, "Insert register",
         align_view_middle, "Align view middle",
@@ -5186,6 +5187,11 @@ fn wonly(cx: &mut Context) {
     }
 }
 
+fn toggle_zoom(cx: &mut Context) {
+    cx.editor.tree.zoom = !cx.editor.tree.zoom;
+    cx.editor.tree.recalculate();
+}
+
 fn select_register(cx: &mut Context) {
     cx.editor.autoinfo = Some(Info::from_registers(&cx.editor.registers));
     cx.on_next_key(move |cx, event| {

helix-term/src/commands/typed.rs

@@ -2488,6 +2488,30 @@ fn read(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
     Ok(())
 }
 
+fn set_max_width(
+    cx: &mut compositor::Context,
+    args: &[Cow<str>],
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    if event != PromptEvent::Validate {
+        return Ok(());
+    }
+
+    let Some(width) = args.first() else { bail!(":set-max-width takes one argument") };
+    let width = width.parse()?;
+    cx.editor.tree.max_width = width;
+    cx.editor.tree.recalculate();
+
+    if width == 0 {
+        cx.editor.set_status("Unset maximum width");
+    } else {
+        cx.editor
+            .set_status(format!("Set maximum width to {}", width));
+    }
+
+    Ok(())
+}
+
 pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
     TypableCommand {
         name: "quit",
@@ -3109,6 +3133,13 @@ fn read(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
         fun: read,
         signature: CommandSignature::positional(&[completers::filename]),
     },
+    TypableCommand {
+        name: "set-max-width",
+        aliases: &[],
+        doc: "Set the maximum width of the editor. If set to 0 it will take up the entire width.",
+        fun: set_max_width,
+        signature: CommandSignature::positional(&[completers::none]),
+    },
 ];
 
 pub static TYPABLE_COMMAND_MAP: Lazy<HashMap<&'static str, &'static TypableCommand>> =

helix-term/src/keymap/default.rs

@@ -207,6 +207,7 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
                 "C-s" | "s" => hsplit_new,
                 "C-v" | "v" => vsplit_new,
             },
+            "z" => toggle_zoom,
         },
 
         // move under <space>c
@@ -272,6 +273,7 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
                     "C-s" | "s" => hsplit_new,
                     "C-v" | "v" => vsplit_new,
                 },
+                "z" => toggle_zoom,
             },
             "y" => yank_to_clipboard,
             "Y" => yank_main_selection_to_clipboard,

helix-term/src/ui/editor.rs

@@ -206,8 +206,8 @@ pub fn render_view(
         );
         Self::render_rulers(editor, doc, view, inner, surface, theme);
 
-        // if we're not at the edge of the screen, draw a right border
-        if viewport.right() != view.area.right() {
+        // if we're not at the edge of the screen or zoomed, draw a right border
+        if viewport.right() != view.area.right() && !editor.tree.zoom {
             let x = area.right();
             let border_style = theme.get("ui.window");
             for y in area.top()..area.bottom() {
@@ -1489,8 +1489,10 @@ fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
         }
 
         for (view, is_focused) in cx.editor.tree.views() {
-            let doc = cx.editor.document(view.doc).unwrap();
-            self.render_view(cx.editor, doc, view, area, surface, is_focused);
+            if !cx.editor.tree.zoom || is_focused {
+                let doc = cx.editor.document(view.doc).unwrap();
+                self.render_view(cx.editor, doc, view, area, surface, is_focused);
+            }
         }
 
         if config.auto_info {

helix-term/src/ui/statusline.rs

@@ -155,6 +155,7 @@ fn get_render_function<'a>(
         helix_view::editor::StatusLineElement::Spacer => render_spacer,
         helix_view::editor::StatusLineElement::VersionControl => render_version_control,
         helix_view::editor::StatusLineElement::Register => render_register,
+        helix_view::editor::StatusLineElement::Zoom => render_zoom,
     }
 }
 
@@ -459,3 +460,11 @@ fn render_register<'a>(context: &RenderContext) -> Spans<'a> {
         Spans::default()
     }
 }
+
+fn render_zoom<'a>(context: &RenderContext) -> Spans<'a> {
+    if context.editor.tree.zoom {
+        "[zoom]".into()
+    } else {
+        Spans::default()
+    }
+}

helix-view/src/editor.rs

@@ -469,6 +469,7 @@ fn default() -> Self {
                 E::Spinner,
                 E::FileName,
                 E::ReadOnlyIndicator,
+                E::Zoom,
                 E::FileModificationIndicator,
             ],
             center: vec![],
@@ -568,6 +569,9 @@ pub enum StatusLineElement {
 
     /// Indicator for selected register
     Register,
+
+    /// Current zoom/zen state
+    Zoom,
 }
 
 // Cursor shape is read and used on every rendered frame and so needs

helix-view/src/tree.rs

@@ -8,8 +8,13 @@ pub struct Tree {
     root: ViewId,
     // (container, index inside the container)
     pub focus: ViewId,
-    // fullscreen: bool,
     area: Rect,
+    // Maximum width the views will take up. If 0 then they will take up the
+    // entire width regardless of state.
+    pub max_width: u16,
+    // If true, the focused view gets all the available space and the rest are
+    // not rendered.
+    pub zoom: bool,
 
     nodes: HopSlotMap<ViewId, Node>,
 
@@ -96,8 +101,9 @@ pub fn new(area: Rect) -> Self {
         Self {
             root,
             focus: root,
-            // fullscreen: false,
             area,
+            max_width: 0,
+            zoom: false,
             nodes,
             stack: Vec::new(),
         }
@@ -360,7 +366,27 @@ pub fn recalculate(&mut self) {
             return;
         }
 
-        self.stack.push((self.root, self.area));
+        let area = if self.max_width > 0 {
+            let width = std::cmp::min(self.max_width, self.area.width);
+            Rect::new(
+                self.area.width / 2 - width / 2,
+                self.area.y,
+                width,
+                self.area.height,
+            )
+        } else {
+            self.area
+        };
+
+        if self.zoom {
+            for (view, _focused) in self.views_mut() {
+                view.area = area;
+            }
+
+            return;
+        }
+
+        self.stack.push((self.root, area));
 
         // take the area
         // fetch the node

languages.toml

@@ -53,7 +53,7 @@ ltex-ls = { command = "ltex-ls" }
 markdoc-ls = { command = "markdoc-ls", args = ["--stdio"] }
 markdown-oxide = { command = "markdown-oxide" }
 marksman = { command = "marksman", args = ["server"] }
-metals = { command = "metals", config = { "isHttpEnabled" = true } }
+metals = { command = "metals", config = { "isHttpEnabled" = true, metals = { inlayHints = { typeParameters = {enable = true} , hintsInPatternMatch = {enable = true} }  } } }
 mint = { command = "mint", args = ["ls"] }
 nil = { command = "nil" }
 nimlangserver = { command = "nimlangserver" }

theme.toml

@@ -66,6 +66,8 @@ label = "honey"
 # TODO: namespace ui.cursor as ui.selection.cursor?
 "ui.cursor.select" = { bg = "delta" }
 "ui.cursor.insert" = { bg = "white" }
+"ui.cursor.primary.select" = { bg = "delta" }
+"ui.cursor.primary.insert" = { bg = "white" }
 "ui.cursor.match" = { fg = "#212121", bg = "#6C6999" }
 "ui.cursor" = { modifiers = ["reversed"] }
 "ui.cursorline.primary" = { bg = "bossanova" }