Golang indent queries

We barely have any flags so it's not worth the compilation time or
binary size to use clap.

.github/workflows/build.yml

@@ -25,19 +25,19 @@ jobs:
           override: true
 
       - name: Cache cargo registry
-        uses: actions/cache@v1
+        uses: actions/cache@v2.1.6
         with:
           path: ~/.cargo/registry
           key: ${{ runner.os }}-v1-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cache cargo index
-        uses: actions/cache@v1
+        uses: actions/cache@v2.1.6
         with:
           path: ~/.cargo/git
           key: ${{ runner.os }}-v1-cargo-index-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cache cargo target dir
-        uses: actions/cache@v1
+        uses: actions/cache@v2.1.6
         with:
           path: target
           key: ${{ runner.os }}-v1-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
@@ -64,19 +64,19 @@ jobs:
           override: true
 
       - name: Cache cargo registry
-        uses: actions/cache@v1
+        uses: actions/cache@v2.1.6
         with:
           path: ~/.cargo/registry
           key: ${{ runner.os }}-v1-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cache cargo index
-        uses: actions/cache@v1
+        uses: actions/cache@v2.1.6
         with:
           path: ~/.cargo/git
           key: ${{ runner.os }}-v1-cargo-index-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cache cargo target dir
-        uses: actions/cache@v1
+        uses: actions/cache@v2.1.6
         with:
           path: target
           key: ${{ runner.os }}-v1-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
@@ -104,19 +104,19 @@ jobs:
           components: rustfmt, clippy
 
       - name: Cache cargo registry
-        uses: actions/cache@v1
+        uses: actions/cache@v2.1.6
         with:
           path: ~/.cargo/registry
           key: ${{ runner.os }}-v1-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cache cargo index
-        uses: actions/cache@v1
+        uses: actions/cache@v2.1.6
         with:
           path: ~/.cargo/git
           key: ${{ runner.os }}-v1-cargo-index-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cache cargo target dir
-        uses: actions/cache@v1
+        uses: actions/cache@v2.1.6
         with:
           path: target
           key: ${{ runner.os }}-v1-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}

.github/workflows/release.yml

@@ -96,7 +96,7 @@ jobs:
             cp "target/${{ matrix.target }}/release/hx" "dist/"
           fi
 
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v2.2.3
         with:
           name: bins-${{ matrix.build }}
           path: dist

Cargo.lock

@@ -77,21 +77,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "clap"
-version = "3.0.0-beta.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bd1061998a501ee7d4b6d449020df3266ca3124b941ec56cf2005c3779ca142"
-dependencies = [
- "bitflags",
- "indexmap",
- "lazy_static",
- "os_str_bytes",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.4"
@@ -272,17 +257,10 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
-
 [[package]]
 name = "helix-core"
 version = "0.1.0"
 dependencies = [
- "anyhow",
  "etcetera",
  "helix-syntax",
  "once_cell",
@@ -335,7 +313,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "chrono",
- "clap",
  "crossterm",
  "dirs-next",
  "fern",
@@ -349,6 +326,7 @@ dependencies = [
  "log",
  "num_cpus",
  "once_cell",
+ "pico-args",
  "pulldown-cmark",
  "serde",
  "serde_json",
@@ -423,16 +401,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "indexmap"
-version = "1.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
-dependencies = [
- "autocfg",
- "hashbrown",
-]
-
 [[package]]
 name = "instant"
 version = "0.1.9"
@@ -602,12 +570,6 @@ version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
 
-[[package]]
-name = "os_str_bytes"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85"
-
 [[package]]
 name = "parking_lot"
 version = "0.11.1"
@@ -645,6 +607,12 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
+[[package]]
+name = "pico-args"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d7afeb98c5a10e0bffcc7fc16e105b04d06729fac5fd6384aebf7ff5cb5a67d"
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.6"
@@ -857,15 +825,6 @@ dependencies = [
  "utf-8",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789"
-dependencies = [
- "unicode-width",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.25"
@@ -921,9 +880,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd3076b5c8cc18138b8f8814895c11eb4de37114a5d127bafdc5e55798ceef37"
+checksum = "0a38d31d7831c6ed7aad00aa4c12d9375fd225a6dd77da1d25b707346319a975"
 dependencies = [
  "autocfg",
  "bytes",
@@ -1044,12 +1003,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
 [[package]]
 name = "version_check"
 version = "0.9.3"

README.md

@@ -1,7 +1,7 @@
 # Helix
 
 
-[![Build status](https://github.com/helix-editor/helix/workflows/ci/badge.svg)](https://github.com/helix-editor/helix/actions)
+[![Build status](https://github.com/helix-editor/helix/actions/workflows/build.yml/badge.svg)](https://github.com/helix-editor/helix/actions)
 
 ![Screenshot](./screenshot.png)
 
@@ -10,7 +10,8 @@ A kakoune / neovim inspired editor, written in Rust.
 The editing model is very heavily based on kakoune; during development I found
 myself agreeing with most of kakoune's design decisions.
 
-For more information, see the [website](https://helix-editor.com).
+For more information, see the [website](https://helix-editor.com) or
+[documentation](https://docs.helix-editor.com/).
 
 # Features
 

book/src/install.md

@@ -21,7 +21,7 @@ shell for working on Helix.
 
 ### Arch Linux
 
-TODO: AUR
+A binary package is available on AUR as [helix-bin](https://aur.archlinux.org/packages/helix-bin/).
 
 ## Build from source
 

book/theme/css/general.css

@@ -109,7 +109,7 @@ h6:target::before {
     margin-top: 1.275em;
     margin-bottom: .875em;
 }
-.content p, .content ol, .content ul, .content table, .content blockquote {
+.content p, .content ol, .content ul, .content table {
     margin-top: 0;
     margin-bottom: .875em;
 }
@@ -123,8 +123,7 @@ h6:target::before {
 .content .header:link,
 .content .header:visited {
     color: var(--fg);
-    /* color: white; */
-    color: #281733;
+    color: var(--heading-fg);
 }
 .content .header:link,
 .content .header:visited:hover {
@@ -168,12 +167,15 @@ table tbody tr:nth-child(2n) {
 
 
 blockquote {
-    margin: 20px 0;
-    padding: 0 20px;
+    margin: 1.5rem 0;
+    padding: 1rem 1.5rem;
     color: var(--fg);
+    opacity: .9;
     background-color: var(--quote-bg);
-    border-top: .1em solid var(--quote-border);
-    border-bottom: .1em solid var(--quote-border);
+    border-left: 4px solid var(--quote-border);
+}
+blockquote *:last-child {
+  margin-bottom: 0;
 }
 
 

book/theme/css/variables.css

@@ -13,6 +13,7 @@
 .ayu {
     --bg: hsl(210, 25%, 8%);
     --fg: #c5c5c5;
+    --heading-fg: #c5c5c5;
 
     --sidebar-bg: #14191f;
     --sidebar-fg: #c8c9db;
@@ -53,6 +54,7 @@
 .coal {
     --bg: hsl(200, 7%, 8%);
     --fg: #98a3ad;
+    --heading-fg: #98a3ad;
 
     --sidebar-bg: #292c2f;
     --sidebar-fg: #a1adb8;
@@ -93,6 +95,7 @@
 .light {
     --bg: hsl(0, 0%, 100%);
     --fg: hsl(0, 0%, 0%);
+    --heading-fg: hsl(0, 0%, 0%);
 
     --sidebar-bg: #fafafa;
     --sidebar-fg: hsl(0, 0%, 0%);
@@ -133,6 +136,7 @@
 .navy {
     --bg: hsl(226, 23%, 11%);
     --fg: #bcbdd0;
+    --heading-fg: #bcbdd0;
 
     --sidebar-bg: #282d3f;
     --sidebar-fg: #c8c9db;
@@ -173,6 +177,7 @@
 .rust {
     --bg: hsl(60, 9%, 87%);
     --fg: #262625;
+    --heading-fg: #262625;
 
     --sidebar-bg: #3b2e2a;
     --sidebar-fg: #c8c9db;
@@ -214,6 +219,7 @@
     .light.no-js {
         --bg: hsl(200, 7%, 8%);
         --fg: #ebeafa;
+        --heading-fg: #ebeafa;
 
         --sidebar-bg: #292c2f;
         --sidebar-fg: #a1adb8;
@@ -297,6 +303,7 @@
     --bg: #ffffff;
     --fg: #452859;
     --fg: #5a5977;
+    --heading-fg: #281733;
 
     --sidebar-bg: #281733;
     --sidebar-fg: #c8c9db;
@@ -317,8 +324,8 @@
     --theme-popup-border: #737480;
     --theme-hover: rgba(0,0,0, .2);
 
-    --quote-bg: hsl(226, 15%, 17%);
-    --quote-border: hsl(226, 15%, 22%);
+    --quote-bg: rgba(0, 0, 0, 0);
+    --quote-border: hsl(226, 15%, 75%);
 
     --table-border-color: #5a5977;
     --table-border-color: hsl(201deg 10% 67%);

helix-core/Cargo.toml

@@ -11,7 +11,6 @@ license = "MPL-2.0"
 helix-syntax = { path = "../helix-syntax" }
 
 ropey = "1.2"
-anyhow = "1"
 smallvec = "1.4"
 tendril = "0.4.2"
 unicode-segmentation = "1.6"

helix-core/src/movement.rs

@@ -25,8 +25,7 @@ pub fn move_horizontally(
         }
         Direction::Forward => {
             // Line end is pos at the start of next line - 1
-            // subtract another 1 because the line ends with \n
-            let end = text.line_to_char(line + 1).saturating_sub(2);
+            let end = text.line_to_char(line + 1).saturating_sub(1);
             nth_next_grapheme_boundary(text, pos, count).min(end)
         }
     };
@@ -190,10 +189,10 @@ fn categorize(ch: char) -> Category {
         Category::Eol
     } else if ch.is_ascii_whitespace() {
         Category::Whitespace
+    } else if is_word(ch) {
+        Category::Word
     } else if ch.is_ascii_punctuation() {
         Category::Punctuation
-    } else if ch.is_ascii_alphanumeric() {
-        Category::Word
     } else {
         unreachable!()
     }

helix-term/Cargo.toml

@@ -24,7 +24,7 @@ tokio = { version = "1", features = ["full"] }
 num_cpus = "1"
 tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
 crossterm = { version = "0.19", features = ["event-stream"] }
-clap = { version = "3.0.0-beta.2 ", default-features = false, features = ["std", "cargo"] }
+pico-args = "0.4"
 
 futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
 

helix-term/src/application.rs

@@ -1,8 +1,6 @@
-use clap::ArgMatches as Args;
-
 use helix_view::{document::Mode, Document, Editor, Theme, View};
 
-use crate::{compositor::Compositor, ui};
+use crate::{compositor::Compositor, ui, Args};
 
 use log::{error, info};
 
@@ -47,8 +45,8 @@ impl Application {
         let size = compositor.size();
         let mut editor = Editor::new(size);
 
-        if let Ok(files) = args.values_of_t::<PathBuf>("files") {
-            for file in files {
+        if !args.files.is_empty() {
+            for file in args.files {
                 editor.open(file, Action::VerticalSplit)?;
             }
         } else {

helix-term/src/commands.rs

@@ -885,12 +885,25 @@ mod cmd {
     }
 
     fn open(editor: &mut Editor, args: &[&str], event: PromptEvent) {
-        let path = args[0];
-        editor.open(path.into(), Action::Replace);
+        match args.get(0) {
+            Some(path) => {
+                // TODO: handle error
+                editor.open(path.into(), Action::Replace);
+            }
+            None => {
+                editor.set_error("wrong argument count".to_string());
+            }
+        };
     }
 
     fn write(editor: &mut Editor, args: &[&str], event: PromptEvent) {
         let (view, doc) = editor.current();
+        if let Some(path) = args.get(0) {
+            if let Err(err) = doc.set_path(Path::new(path)) {
+                editor.set_error(format!("invalid filepath: {}", err));
+                return;
+            };
+        }
         if doc.path().is_none() {
             editor.set_error("cannot write a buffer without a filename".to_string());
             return;
@@ -934,7 +947,7 @@ mod cmd {
         Command {
             name: "write",
             alias: Some("w"),
-            doc: "Write changes to disk.",
+            doc: "Write changes to disk. Accepts an optional path (:write some/path.txt)",
             fun: write,
             completer: Some(completers::filename),
         },

helix-term/src/main.rs

@@ -8,7 +8,6 @@ mod ui;
 
 use application::Application;
 
-use clap::{App, Arg};
 use std::path::PathBuf;
 
 use anyhow::Error;
@@ -48,28 +47,54 @@ fn setup_logging(verbosity: u64) -> Result<(), fern::InitError> {
     Ok(())
 }
 
-fn main() {
-    let args = clap::app_from_crate!()
-        .arg(
-            Arg::new("files")
-                .about("Sets the input file to use")
-                .required(false)
-                .multiple(true)
-                .index(1),
-        )
-        .arg(
-            Arg::new("verbose")
-                .about("Increases logging verbosity each use for up to 3 times")
-                .short('v')
-                .takes_value(false)
-                .multiple_occurrences(true),
-        )
-        .get_matches();
+pub struct Args {
+    files: Vec<PathBuf>,
+}
 
-    let verbosity: u64 = args.occurrences_of("verbose");
+fn main() {
+    let help = format!(
+        "\
+{} {}
+{}
+{}
+
+USAGE:
+    hx [FLAGS] [files]...
+
+ARGS:
+    <files>...    Sets the input file to use
+
+FLAGS:
+    -h, --help       Prints help information
+    -v               Increases logging verbosity each use for up to 3 times
+    -V, --version    Prints version information
+",
+        env!("CARGO_PKG_NAME"),
+        env!("CARGO_PKG_VERSION"),
+        env!("CARGO_PKG_AUTHORS"),
+        env!("CARGO_PKG_DESCRIPTION"),
+    );
+
+    let mut pargs = pico_args::Arguments::from_env();
+
+    // Help has a higher priority and should be handled separately.
+    if pargs.contains(["-h", "--help"]) {
+        print!("{}", help);
+        std::process::exit(0);
+    }
+
+    let mut verbosity: u64 = 0;
+
+    if pargs.contains("-v") {
+        verbosity = 1;
+    }
 
     setup_logging(verbosity).expect("failed to initialize logging.");
 
+    let args = Args {
+        files: pargs.finish().into_iter().map(|arg| arg.into()).collect(),
+    };
+
     // initialize language registry
     use helix_core::config_dir;
     use helix_core::syntax::{Loader, LOADER};

helix-term/src/ui/prompt.rs

@@ -111,6 +111,7 @@ impl Prompt {
     pub fn render_prompt(&self, area: Rect, surface: &mut Surface, cx: &mut Context) {
         let theme = &cx.editor.theme;
         let text_color = theme.get("ui.text.focus");
+        let selected_color = theme.get("ui.menu.selected");
         // completion
 
         let max_col = area.width / BASE_WIDTH;
@@ -133,7 +134,8 @@ impl Prompt {
 
             for (i, (_range, completion)) in self.completion.iter().enumerate() {
                 let color = if Some(i) == self.selection {
-                    Style::default().bg(Color::Rgb(104, 60, 232))
+                    // Style::default().bg(Color::Rgb(104, 60, 232))
+                    selected_color // TODO: just invert bg
                 } else {
                     text_color
                 };
@@ -158,14 +160,9 @@ impl Prompt {
         if let Some(doc) = (self.doc_fn)(&self.line) {
             let text = ui::Text::new(doc.to_string());
 
-            let area = Rect::new(
-                completion_area.x,
-                completion_area.y - 3,
-                completion_area.width,
-                3,
-            );
+            let area = Rect::new(completion_area.x, completion_area.y - 3, BASE_WIDTH * 3, 3);
 
-            let background = theme.get("ui.window");
+            let background = theme.get("ui.help");
             surface.clear_with(area, background);
 
             use tui::layout::Margin;

helix-view/src/document.rs

@@ -1,6 +1,6 @@
 use anyhow::{Context, Error};
 use std::future::Future;
-use std::path::{Path, PathBuf};
+use std::path::{Component, Path, PathBuf};
 use std::sync::Arc;
 
 use helix_core::{
@@ -64,6 +64,42 @@ where
     }
 }
 
+/// Normalize a path, removing things like `.` and `..`.
+///
+/// CAUTION: This does not resolve symlinks (unlike
+/// [`std::fs::canonicalize`]). This may cause incorrect or surprising
+/// behavior at times. This should be used carefully. Unfortunately,
+/// [`std::fs::canonicalize`] can be hard to use correctly, since it can often
+/// fail, or on Windows returns annoying device paths. This is a problem Cargo
+/// needs to improve on.
+/// Copied from cargo: https://github.com/rust-lang/cargo/blob/070e459c2d8b79c5b2ac5218064e7603329c92ae/crates/cargo-util/src/paths.rs#L81
+pub fn normalize_path(path: &Path) -> PathBuf {
+    let mut components = path.components().peekable();
+    let mut ret = if let Some(c @ Component::Prefix(..)) = components.peek().cloned() {
+        components.next();
+        PathBuf::from(c.as_os_str())
+    } else {
+        PathBuf::new()
+    };
+
+    for component in components {
+        match component {
+            Component::Prefix(..) => unreachable!(),
+            Component::RootDir => {
+                ret.push(component.as_os_str());
+            }
+            Component::CurDir => {}
+            Component::ParentDir => {
+                ret.pop();
+            }
+            Component::Normal(c) => {
+                ret.push(c);
+            }
+        }
+    }
+    ret
+}
+
 use helix_lsp::lsp;
 use url::Url;
 
@@ -176,6 +212,20 @@ impl Document {
         }
     }
 
+    pub fn set_path(&mut self, path: &Path) -> Result<(), std::io::Error> {
+        // canonicalize path to absolute value
+        let current_dir = std::env::current_dir()?;
+        let path = normalize_path(&current_dir.join(path));
+
+        if let Some(parent) = path.parent() {
+            // TODO: return error as necessary
+            if parent.exists() {
+                self.path = Some(path);
+            }
+        }
+        Ok(())
+    }
+
     pub fn set_language(
         &mut self,
         language_config: Option<Arc<helix_core::syntax::LanguageConfiguration>>,

runtime/queries/go/indents.toml

@@ -12,8 +12,10 @@ indent = [
   "literal_value",
   "expression_case",
   "default_case",
+  "type_case",
+  "communication_case",
   "argument_list",
-  "block"
+  "block",
 ]
 
 outdent = [

theme.toml

@@ -43,8 +43,11 @@
 "ui.statusline" = { bg = "#281733" } # revolver
 "ui.popup" = { bg = "#281733" } # revolver
 "ui.window" = { bg = "#452859" } # bossa nova
+"ui.window" = { bg = "#452859" } # bossa nova
+"ui.help" = { bg = "#6F44F0", fg = "#a4a0e8" }
+"ui.help" = { bg = "#7958DC", fg = "#171452" }
 
-"ui.text" = { fg = "#a4a0e8"} # lavender
+"ui.text" = { fg = "#a4a0e8" } # lavender
 "ui.text.focus" = { fg = "#dbbfef"} # lilac
 
 "ui.menu.selected" = { fg = "#281733", bg = "#ffffff" } # revolver