From 71292f9f11bd2b50568efd111239f693be26a36a Mon Sep 17 00:00:00 2001
From: Gokul Soumya
Date: Wed, 17 Nov 2021 19:00:11 +0530
Subject: docs: Auto generate command list

---
 xtask/Cargo.toml  |  9 ++++++
 xtask/src/main.rs | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 xtask/Cargo.toml
 create mode 100644 xtask/src/main.rs

(limited to 'xtask')

diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
new file mode 100644
index 00000000..cb890de9
--- /dev/null
+++ b/xtask/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "xtask"
+version = "0.5.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+helix-term = { version = "0.5", path = "../helix-term" }
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
new file mode 100644
index 00000000..4bf0ae9f
--- /dev/null
+++ b/xtask/src/main.rs
@@ -0,0 +1,86 @@
+use std::env;
+
+pub mod md_gen {
+    use super::path;
+    use std::fs;
+
+    use helix_term::commands::cmd::TYPABLE_COMMAND_LIST;
+
+    pub const TYPABLE_COMMANDS_MD_OUTPUT: &str = "typable-cmd.md";
+
+    pub fn typable_commands() -> String {
+        let mut md = String::new();
+        md.push_str("| Name | Description |\n");
+        md.push_str("| ---  | ---         |\n");
+
+        let cmdify = |s: &str| format!("`:{}`", s);
+
+        for cmd in TYPABLE_COMMAND_LIST {
+            let names = std::iter::once(&cmd.name)
+                .chain(cmd.aliases.iter())
+                .map(|a| cmdify(a))
+                .collect::<Vec<_>>()
+                .join(", ");
+
+            let entry = format!("| {} | {} |\n", names, cmd.doc);
+            md.push_str(&entry);
+        }
+
+        md
+    }
+
+    pub fn write(filename: &str, data: &str) {
+        let error = format!("Could not write to {}", filename);
+        let path = path::book_gen().join(filename);
+        fs::write(path, data).expect(&error);
+    }
+}
+
+pub mod path {
+    use std::path::{Path, PathBuf};
+
+    pub fn project_root() -> PathBuf {
+        Path::new(env!("CARGO_MANIFEST_DIR"))
+            .parent()
+            .unwrap()
+            .to_path_buf()
+    }
+
+    pub fn book_gen() -> PathBuf {
+        project_root().join("book/src/generated/")
+    }
+}
+
+pub mod tasks {
+    use super::md_gen;
+
+    pub fn bookgen() {
+        md_gen::write(
+            md_gen::TYPABLE_COMMANDS_MD_OUTPUT,
+            &md_gen::typable_commands(),
+        );
+    }
+
+    pub fn print_help() {
+        println!(
+            "
+Usage: Run with `cargo xtask <task>`, eg. `cargo xtask bookgen`.
+
+    Tasks:
+        bookgen: Generate files to be included in the mdbook output.
+"
+        );
+    }
+}
+
+fn main() -> Result<(), String> {
+    let task = env::args().nth(1);
+    match task {
+        None => tasks::print_help(),
+        Some(t) => match t.as_str() {
+            "bookgen" => tasks::bookgen(),
+            invalid => return Err(format!("Invalid task name: {}", invalid)),
+        },
+    };
+    Ok(())
+}
-- 
cgit v1.2.3-70-g09d2


From a78b7894066b6ccf56c404b7543b45e2dfd99982 Mon Sep 17 00:00:00 2001
From: Gokul Soumya
Date: Mon, 22 Nov 2021 00:25:08 +0530
Subject: Auto generate docs for language support

---
 Cargo.lock                         |   2 +
 book/src/SUMMARY.md                |   1 +
 book/src/generated/lang-support.md |  41 +++++++
 book/src/generated/typable-cmd.md  |   2 +-
 book/src/lang-support.md           |  10 ++
 docs/CONTRIBUTING.md               |   2 +-
 helix-core/src/indent.rs           |   1 +
 helix-core/src/syntax.rs           |   3 +-
 languages.toml                     |  40 +++++++
 xtask/Cargo.toml                   |   2 +
 xtask/src/main.rs                  | 229 ++++++++++++++++++++++++++++++++++---
 11 files changed, 311 insertions(+), 22 deletions(-)
 create mode 100644 book/src/generated/lang-support.md
 create mode 100644 book/src/lang-support.md

(limited to 'xtask')

diff --git a/Cargo.lock b/Cargo.lock
index b3032465..25b4f6cd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1264,5 +1264,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 name = "xtask"
 version = "0.5.0"
 dependencies = [
+ "helix-core",
  "helix-term",
+ "toml",
 ]
diff --git a/book/src/SUMMARY.md b/book/src/SUMMARY.md
index 4da79925..a8f165c0 100644
--- a/book/src/SUMMARY.md
+++ b/book/src/SUMMARY.md
@@ -4,6 +4,7 @@
 - [Usage](./usage.md)
   - [Keymap](./keymap.md)
   - [Commands](./commands.md)
+  - [Language Support](./lang-support.md)
 - [Migrating from Vim](./from-vim.md)
 - [Configuration](./configuration.md)
   - [Themes](./themes.md)
diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
new file mode 100644
index 00000000..729801ad
--- /dev/null
+++ b/book/src/generated/lang-support.md
@@ -0,0 +1,41 @@
+| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
+| --- | --- | --- | --- | --- |
+| Bash | ✓ |  |  | `bash-language-server` |
+| C | ✓ |  |  | `clangd` |
+| C# | ✓ |  |  |  |
+| CMake | ✓ |  |  | `cmake-language-server` |
+| C++ | ✓ |  |  | `clangd` |
+| CSS | ✓ |  |  |  |
+| Elixir | ✓ |  |  | `elixir-ls` |
+| GLSL | ✓ |  | ✓ |  |
+| Go | ✓ | ✓ | ✓ | `gopls` |
+| HTML | ✓ |  |  |  |
+| Java | ✓ |  |  |  |
+| JavaScript | ✓ |  | ✓ |  |
+| JSON | ✓ |  | ✓ |  |
+| Julia | ✓ |  |  | `julia` |
+| LaTeX | ✓ |  |  |  |
+| Ledger | ✓ |  |  |  |
+| LLVM | ✓ |  |  |  |
+| Lua | ✓ |  | ✓ |  |
+| Mint |  |  |  | `mint` |
+| Nix | ✓ |  | ✓ | `rnix-lsp` |
+| OCaml | ✓ |  | ✓ |  |
+| OCaml-Interface | ✓ |  |  |  |
+| Perl | ✓ | ✓ |  |  |
+| PHP | ✓ |  | ✓ |  |
+| Prolog |  |  |  | `swipl` |
+| Protobuf | ✓ |  | ✓ |  |
+| Python | ✓ | ✓ | ✓ | `pylsp` |
+| Racket |  |  |  | `racket` |
+| Ruby | ✓ |  |  | `solargraph` |
+| Rust | ✓ | ✓ | ✓ | `rust-analyzer` |
+| Svelte | ✓ |  | ✓ | `svelteserver` |
+| TOML | ✓ |  |  |  |
+| TSQ | ✓ |  |  |  |
+| TSX | ✓ |  |  | `typescript-language-server` |
+| TypeScript | ✓ |  | ✓ | `typescript-language-server` |
+| Vue | ✓ |  |  |  |
+| WGSL | ✓ |  |  |  |
+| YAML | ✓ |  | ✓ |  |
+| Zig | ✓ |  | ✓ | `zls` |
diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index 5de5c787..bb21fd6b 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -1,5 +1,5 @@
 | Name | Description |
-| ---  | ---         |
+| --- | --- |
 | `:quit`, `:q` | Close the current view. |
 | `:quit!`, `:q!` | Close the current view forcefully (ignoring unsaved changes). |
 | `:open`, `:o` | Open a file from disk into the current view. |
diff --git a/book/src/lang-support.md b/book/src/lang-support.md
new file mode 100644
index 00000000..3920f342
--- /dev/null
+++ b/book/src/lang-support.md
@@ -0,0 +1,10 @@
+# Language Support
+
+For more information like arguments passed to default LSP server,
+extensions assosciated with a filetype, custom LSP settings, filetype
+specific indent settings, etc see the default
+[`languages.toml`][languages.toml] file.
+
+{{#include ./generated/lang-support.md}}
+
+[languages.toml]: https://github.com/helix-editor/helix/blob/master/languages.toml
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 7b923db8..bdd771aa 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -23,7 +23,7 @@ like the list of `:commands` and supported languages. To generate these
 files, run
 
 ```shell
-cargo xtask bookgen
+cargo xtask docgen
 ```
 
 inside the project. We use [xtask][xtask] as an ad-hoc task runner and
diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index b6f5081a..3ce3620a 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -452,6 +452,7 @@ where
                 file_types: vec!["rs".to_string()],
                 shebangs: vec![],
                 language_id: "Rust".to_string(),
+                display_name: "Rust".to_string(),
                 highlight_config: OnceCell::new(),
                 config: None,
                 //
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index ba78adaa..3c65ae33 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -50,7 +50,8 @@ pub struct Configuration {
 #[serde(rename_all = "kebab-case", deny_unknown_fields)]
 pub struct LanguageConfiguration {
     #[serde(rename = "name")]
-    pub language_id: String,
+    pub language_id: String, // c-sharp, rust
+    pub display_name: String,    // C#, Rust
     pub scope: String,           // source.rust
     pub file_types: Vec<String>, // filename ends_with? <Gemfile, rb, etc>
     #[serde(default)]
diff --git a/languages.toml b/languages.toml
index 4208e4b6..ca339c98 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1,5 +1,6 @@
 [[language]]
 name = "rust"
+display-name = "Rust"
 scope = "source.rust"
 injection-regex = "rust"
 file-types = ["rs"]
@@ -14,6 +15,7 @@ procMacro = { enable = false }
 
 [[language]]
 name = "toml"
+display-name = "TOML"
 scope = "source.toml"
 injection-regex = "toml"
 file-types = ["toml"]
@@ -24,6 +26,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "protobuf"
+display-name = "Protobuf"
 scope = "source.proto"
 injection-regex = "protobuf"
 file-types = ["proto"]
@@ -34,6 +37,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "elixir"
+display-name = "Elixir"
 scope = "source.elixir"
 injection-regex = "elixir"
 file-types = ["ex", "exs"]
@@ -46,6 +50,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "mint"
+display-name = "Mint"
 scope = "source.mint"
 injection-regex = "mint"
 file-types = ["mint"]
@@ -58,6 +63,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "json"
+display-name = "JSON"
 scope = "source.json"
 injection-regex = "json"
 file-types = ["json"]
@@ -67,6 +73,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "c"
+display-name = "C"
 scope = "source.c"
 injection-regex = "c"
 file-types = ["c"] # TODO: ["h"]
@@ -78,6 +85,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "cpp"
+display-name = "C++"
 scope = "source.cpp"
 injection-regex = "cpp"
 file-types = ["cc", "hh", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino"]
@@ -89,6 +97,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "c-sharp"
+display-name = "C#"
 scope = "source.csharp"
 injection-regex = "c-?sharp"
 file-types = ["cs"]
@@ -99,6 +108,7 @@ indent = { tab-width = 4, unit = "\t" }
 
 [[language]]
 name = "go"
+display-name = "Go"
 scope = "source.go"
 injection-regex = "go"
 file-types = ["go"]
@@ -112,6 +122,7 @@ indent = { tab-width = 4, unit = "\t" }
 
 [[language]]
 name = "javascript"
+display-name = "JavaScript"
 scope = "source.js"
 injection-regex = "^(js|javascript)$"
 file-types = ["js", "mjs"]
@@ -124,6 +135,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "typescript"
+display-name = "TypeScript"
 scope = "source.ts"
 injection-regex = "^(ts|typescript)$"
 file-types = ["ts"]
@@ -136,6 +148,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "tsx"
+display-name = "TSX"
 scope = "source.tsx"
 injection-regex = "^(tsx)$" # |typescript
 file-types = ["tsx"]
@@ -147,6 +160,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "css"
+display-name = "CSS"
 scope = "source.css"
 injection-regex = "css"
 file-types = ["css"]
@@ -156,6 +170,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "html"
+display-name = "HTML"
 scope = "text.html.basic"
 injection-regex = "html"
 file-types = ["html"]
@@ -165,6 +180,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "python"
+display-name = "Python"
 scope = "source.python"
 injection-regex = "python"
 file-types = ["py"]
@@ -178,6 +194,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[language]]
 name = "nix"
+display-name = "Nix"
 scope = "source.nix"
 injection-regex = "nix"
 file-types = ["nix"]
@@ -190,6 +207,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "ruby"
+display-name = "Ruby"
 scope = "source.ruby"
 injection-regex = "ruby"
 file-types = ["rb"]
@@ -202,6 +220,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "bash"
+display-name = "Bash"
 scope = "source.bash"
 injection-regex = "bash"
 file-types = ["sh", "bash"]
@@ -214,6 +233,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "php"
+display-name = "PHP"
 scope = "source.php"
 injection-regex = "php"
 file-types = ["php"]
@@ -224,6 +244,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[language]]
 name = "latex"
+display-name = "LaTeX"
 scope = "source.tex"
 injection-regex = "tex"
 file-types = ["tex"]
@@ -234,6 +255,7 @@ indent = { tab-width = 4, unit = "\t" }
 
 [[language]]
 name = "julia"
+display-name = "Julia"
 scope = "source.julia"
 injection-regex = "julia"
 file-types = ["jl"]
@@ -259,6 +281,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "java"
+display-name = "Java"
 scope = "source.java"
 injection-regex = "java"
 file-types = ["java"]
@@ -267,6 +290,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[language]]
 name = "ledger"
+display-name = "Ledger"
 scope = "source.ledger"
 injection-regex = "ledger"
 file-types = ["ldg", "ledger", "journal"]
@@ -276,6 +300,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[language]]
 name = "ocaml"
+display-name = "OCaml"
 scope = "source.ocaml"
 injection-regex = "ocaml"
 file-types = ["ml"]
@@ -286,6 +311,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "ocaml-interface"
+display-name = "OCaml-Interface"
 scope = "source.ocaml.interface"
 file-types = ["mli"]
 shebangs = []
@@ -295,6 +321,7 @@ indent = { tab-width = 2, unit = "  "}
 
 [[language]]
 name = "lua"
+display-name = "Lua"
 scope = "source.lua"
 file-types = ["lua"]
 shebangs = ["lua"]
@@ -304,6 +331,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "svelte"
+display-name = "Svelte"
 scope = "source.svelte"
 injection-regex = "svelte"
 file-types = ["svelte"]
@@ -314,6 +342,7 @@ language-server = { command = "svelteserver", args = ["--stdio"] }
 
 [[language]]
 name = "vue"
+display-name = "Vue"
 scope = "source.vue"
 injection-regex = "vue"
 file-types = ["vue"]
@@ -322,6 +351,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "yaml"
+display-name = "YAML"
 scope = "source.yaml"
 file-types = ["yml", "yaml"]
 roots = []
@@ -330,6 +360,7 @@ indent = { tab-width = 2, unit = "  " }
 
 # [[language]]
 # name = "haskell"
+# display-name = "Haskell"
 # scope = "source.haskell"
 # injection-regex = "haskell"
 # file-types = ["hs"]
@@ -340,6 +371,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "zig"
+display-name = "Zig"
 scope = "source.zig"
 injection-regex = "zig"
 file-types = ["zig"]
@@ -352,6 +384,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[language]]
 name = "prolog"
+display-name = "Prolog"
 scope = "source.prolog"
 roots = []
 file-types = ["pl", "prolog"]
@@ -365,6 +398,7 @@ language-server = { command = "swipl", args = [
 
 [[language]]
 name = "tsq"
+display-name = "TSQ"
 scope = "source.tsq"
 file-types = ["scm"]
 roots = []
@@ -373,6 +407,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "cmake"
+display-name = "CMake"
 scope = "source.cmake"
 file-types = ["cmake", "CMakeLists.txt"]
 roots = []
@@ -382,6 +417,7 @@ language-server = { command = "cmake-language-server" }
 
 [[language]]
 name = "glsl"
+display-name = "GLSL"
 scope = "source.glsl"
 file-types = ["glsl", "vert", "tesc", "tese", "geom", "frag", "comp" ]
 roots = []
@@ -390,6 +426,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[language]]
 name = "perl"
+display-name = "Perl"
 scope = "source.perl"
 file-types = ["pl", "pm"]
 shebangs = ["perl"]
@@ -399,6 +436,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "racket"
+display-name = "Racket"
 scope = "source.rkt"
 roots = []
 file-types = ["rkt"]
@@ -408,6 +446,7 @@ language-server = { command = "racket", args = ["-l", "racket-langserver"] }
 
 [[language]]
 name = "wgsl"
+display-name = "WGSL"
 scope = "source.wgsl"
 file-types = ["wgsl"]
 roots = []
@@ -416,6 +455,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[language]]
 name = "llvm"
+display-name = "LLVM"
 scope = "source.llvm"
 roots = []
 file-types = ["ll"]
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index cb890de9..fe5d55d4 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -7,3 +7,5 @@ edition = "2021"
 
 [dependencies]
 helix-term = { version = "0.5", path = "../helix-term" }
+helix-core = { version = "0.5", path = "../helix-core" }
+toml = "0.5"
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 4bf0ae9f..37e70592 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -1,17 +1,138 @@
-use std::env;
+use std::{env, error::Error};
+
+type DynError = Box<dyn Error>;
+
+pub mod helpers {
+    use std::{
+        fmt::Display,
+        path::{Path, PathBuf},
+    };
+
+    use crate::path;
+    use helix_core::syntax::Configuration as LangConfig;
+
+    #[derive(Copy, Clone)]
+    pub enum TsFeature {
+        Highlight,
+        TextObjects,
+        AutoIndent,
+    }
+
+    impl TsFeature {
+        pub fn all() -> &'static [Self] {
+            &[Self::Highlight, Self::TextObjects, Self::AutoIndent]
+        }
+
+        pub fn runtime_filename(&self) -> &'static str {
+            match *self {
+                Self::Highlight => "highlights.scm",
+                Self::TextObjects => "textobjects.scm",
+                Self::AutoIndent => "indents.toml",
+            }
+        }
+    }
+
+    impl Display for TsFeature {
+        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+            write!(
+                f,
+                "{}",
+                match *self {
+                    Self::Highlight => "Syntax Highlighting",
+                    Self::TextObjects => "Treesitter Textobjects",
+                    Self::AutoIndent => "Auto Indent",
+                }
+            )
+        }
+    }
+
+    /// Get the list of languages that support a particular tree-sitter
+    /// based feature.
+    pub fn ts_lang_support(feat: TsFeature) -> Vec<String> {
+        let queries_dir = path::ts_queries();
+
+        find_files(&queries_dir, feat.runtime_filename())
+            .iter()
+            .map(|f| {
+                // .../helix/runtime/queries/python/highlights.scm
+                let tail = f.strip_prefix(&queries_dir).unwrap(); // python/highlights.scm
+                let lang = tail.components().next().unwrap(); // python
+                lang.as_os_str().to_string_lossy().to_string()
+            })
+            .collect()
+    }
+
+    /// Get the list of languages that have any form of tree-sitter
+    /// queries defined in the runtime directory.
+    pub fn langs_with_ts_queries() -> Vec<String> {
+        std::fs::read_dir(path::ts_queries())
+            .unwrap()
+            .filter_map(|entry| {
+                let entry = entry.ok()?;
+                entry
+                    .file_type()
+                    .ok()?
+                    .is_dir()
+                    .then(|| entry.file_name().to_string_lossy().to_string())
+            })
+            .collect()
+    }
+
+    // naive implementation, but suffices for our needs
+    pub fn find_files(dir: &Path, filename: &str) -> Vec<PathBuf> {
+        std::fs::read_dir(dir)
+            .unwrap()
+            .filter_map(|entry| {
+                let path = entry.ok()?.path();
+                if path.is_dir() {
+                    Some(find_files(&path, filename))
+                } else {
+                    (path.file_name()?.to_string_lossy() == filename).then(|| vec![path])
+                }
+            })
+            .flatten()
+            .collect()
+    }
+
+    pub fn lang_config() -> LangConfig {
+        let bytes = std::fs::read(path::lang_config()).unwrap();
+        toml::from_slice(&bytes).unwrap()
+    }
+}
 
 pub mod md_gen {
-    use super::path;
+    use crate::DynError;
+
+    use crate::helpers;
+    use crate::path;
     use std::fs;
 
     use helix_term::commands::cmd::TYPABLE_COMMAND_LIST;
 
     pub const TYPABLE_COMMANDS_MD_OUTPUT: &str = "typable-cmd.md";
+    pub const LANG_SUPPORT_MD_OUTPUT: &str = "lang-support.md";
+
+    fn md_table_heading(cols: &[String]) -> String {
+        let mut header = String::new();
+        header += &md_table_row(cols);
+        header += &md_table_row(&vec!["---".to_string(); cols.len()]);
+        header
+    }
+
+    fn md_table_row(cols: &[String]) -> String {
+        "| ".to_owned() + &cols.join(" | ") + " |\n"
+    }
+
+    fn md_mono(s: &str) -> String {
+        format!("`{}`", s)
+    }
 
-    pub fn typable_commands() -> String {
+    pub fn typable_commands() -> Result<String, DynError> {
         let mut md = String::new();
-        md.push_str("| Name | Description |\n");
-        md.push_str("| ---  | ---         |\n");
+        md.push_str(&md_table_heading(&[
+            "Name".to_owned(),
+            "Description".to_owned(),
+        ]));
 
         let cmdify = |s: &str| format!("`:{}`", s);
 
@@ -22,11 +143,72 @@ pub mod md_gen {
                 .collect::<Vec<_>>()
                 .join(", ");
 
-            let entry = format!("| {} | {} |\n", names, cmd.doc);
-            md.push_str(&entry);
+            md.push_str(&md_table_row(&[names.to_owned(), cmd.doc.to_owned()]));
+        }
+
+        Ok(md)
+    }
+
+    pub fn lang_features() -> Result<String, DynError> {
+        let mut md = String::new();
+        let ts_features = helpers::TsFeature::all();
+
+        let mut cols = vec!["Language".to_owned()];
+        cols.append(
+            &mut ts_features
+                .iter()
+                .map(|t| t.to_string())
+                .collect::<Vec<_>>(),
+        );
+        cols.push("Default LSP".to_owned());
+
+        md.push_str(&md_table_heading(&cols));
+        let config = helpers::lang_config();
+
+        let mut langs = config
+            .language
+            .iter()
+            .map(|l| l.language_id.clone())
+            .collect::<Vec<_>>();
+        langs.sort_unstable();
+
+        let mut ts_features_to_langs = Vec::new();
+        for &feat in ts_features {
+            ts_features_to_langs.push((feat, helpers::ts_lang_support(feat)));
         }
 
-        md
+        let mut row = Vec::new();
+        for lang in langs {
+            let lc = config
+                .language
+                .iter()
+                .find(|l| l.language_id == lang)
+                .unwrap(); // lang comes from config
+            row.push(lc.display_name.clone());
+
+            for (_feat, support_list) in &ts_features_to_langs {
+                row.push(
+                    if support_list.contains(&lang) {
+                        "✓"
+                    } else {
+                        ""
+                    }
+                    .to_owned(),
+                );
+            }
+            row.push(
+                lc.language_server
+                    .as_ref()
+                    .map(|s| s.command.clone())
+                    .map(|c| md_mono(&c))
+                    .unwrap_or_default(),
+            );
+
+            md.push_str(&md_table_row(&row));
+            row.clear();
+        }
+
+        Ok(md)
     }
 
     pub fn write(filename: &str, data: &str) {
@@ -49,37 +231,46 @@ pub mod path {
     pub fn book_gen() -> PathBuf {
         project_root().join("book/src/generated/")
     }
+
+    pub fn ts_queries() -> PathBuf {
+        project_root().join("runtime/queries")
+    }
+
+    pub fn lang_config() -> PathBuf {
+        project_root().join("languages.toml")
+    }
 }
 
 pub mod tasks {
-    use super::md_gen;
+    use crate::md_gen;
+    use crate::DynError;
 
-    pub fn bookgen() {
-        md_gen::write(
-            md_gen::TYPABLE_COMMANDS_MD_OUTPUT,
-            &md_gen::typable_commands(),
-        );
+    pub fn docgen() -> Result<(), DynError> {
+        use md_gen::*;
+        write(TYPABLE_COMMANDS_MD_OUTPUT, &typable_commands()?);
+        write(LANG_SUPPORT_MD_OUTPUT, &lang_features()?);
+        Ok(())
     }
 
     pub fn print_help() {
         println!(
             "
-Usage: Run with `cargo xtask <task>`, eg. `cargo xtask bookgen`.
+Usage: Run with `cargo xtask <task>`, eg. `cargo xtask docgen`.
 
     Tasks:
-        bookgen: Generate files to be included in the mdbook output.
+        docgen: Generate files to be included in the mdbook output.
 "
         );
     }
 }
 
-fn main() -> Result<(), String> {
+fn main() -> Result<(), DynError> {
     let task = env::args().nth(1);
     match task {
         None => tasks::print_help(),
         Some(t) => match t.as_str() {
-            "bookgen" => tasks::bookgen(),
-            invalid => return Err(format!("Invalid task name: {}", invalid)),
+            "docgen" => tasks::docgen()?,
+            invalid => return Err(format!("Invalid task name: {}", invalid).into()),
         },
     };
     Ok(())
-- 
cgit v1.2.3-70-g09d2


From d08bdfa838098769afc59146b62f9d613d4a7ff4 Mon Sep 17 00:00:00 2001
From: Gokul Soumya
Date: Tue, 7 Dec 2021 21:27:21 +0530
Subject: Use same name used in config files for langs in docs

---
 book/src/generated/lang-support.md | 78 +++++++++++++++++++-------------------
 helix-core/src/indent.rs           |  1 -
 helix-core/src/syntax.rs           |  1 -
 languages.toml                     | 41 --------------------
 xtask/src/main.rs                  |  2 +-
 5 files changed, 40 insertions(+), 83 deletions(-)

(limited to 'xtask')

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 729801ad..96d9b6a0 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -1,41 +1,41 @@
 | Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
 | --- | --- | --- | --- | --- |
-| Bash | ✓ |  |  | `bash-language-server` |
-| C | ✓ |  |  | `clangd` |
-| C# | ✓ |  |  |  |
-| CMake | ✓ |  |  | `cmake-language-server` |
-| C++ | ✓ |  |  | `clangd` |
-| CSS | ✓ |  |  |  |
-| Elixir | ✓ |  |  | `elixir-ls` |
-| GLSL | ✓ |  | ✓ |  |
-| Go | ✓ | ✓ | ✓ | `gopls` |
-| HTML | ✓ |  |  |  |
-| Java | ✓ |  |  |  |
-| JavaScript | ✓ |  | ✓ |  |
-| JSON | ✓ |  | ✓ |  |
-| Julia | ✓ |  |  | `julia` |
-| LaTeX | ✓ |  |  |  |
-| Ledger | ✓ |  |  |  |
-| LLVM | ✓ |  |  |  |
-| Lua | ✓ |  | ✓ |  |
-| Mint |  |  |  | `mint` |
-| Nix | ✓ |  | ✓ | `rnix-lsp` |
-| OCaml | ✓ |  | ✓ |  |
-| OCaml-Interface | ✓ |  |  |  |
-| Perl | ✓ | ✓ |  |  |
-| PHP | ✓ |  | ✓ |  |
-| Prolog |  |  |  | `swipl` |
-| Protobuf | ✓ |  | ✓ |  |
-| Python | ✓ | ✓ | ✓ | `pylsp` |
-| Racket |  |  |  | `racket` |
-| Ruby | ✓ |  |  | `solargraph` |
-| Rust | ✓ | ✓ | ✓ | `rust-analyzer` |
-| Svelte | ✓ |  | ✓ | `svelteserver` |
-| TOML | ✓ |  |  |  |
-| TSQ | ✓ |  |  |  |
-| TSX | ✓ |  |  | `typescript-language-server` |
-| TypeScript | ✓ |  | ✓ | `typescript-language-server` |
-| Vue | ✓ |  |  |  |
-| WGSL | ✓ |  |  |  |
-| YAML | ✓ |  | ✓ |  |
-| Zig | ✓ |  | ✓ | `zls` |
+| bash | ✓ |  |  | `bash-language-server` |
+| c | ✓ |  |  | `clangd` |
+| c-sharp | ✓ |  |  |  |
+| cmake | ✓ |  |  | `cmake-language-server` |
+| cpp | ✓ |  |  | `clangd` |
+| css | ✓ |  |  |  |
+| elixir | ✓ |  |  | `elixir-ls` |
+| glsl | ✓ |  | ✓ |  |
+| go | ✓ | ✓ | ✓ | `gopls` |
+| html | ✓ |  |  |  |
+| java | ✓ |  |  |  |
+| javascript | ✓ |  | ✓ |  |
+| json | ✓ |  | ✓ |  |
+| julia | ✓ |  |  | `julia` |
+| latex | ✓ |  |  |  |
+| ledger | ✓ |  |  |  |
+| llvm | ✓ |  |  |  |
+| lua | ✓ |  | ✓ |  |
+| mint |  |  |  | `mint` |
+| nix | ✓ |  | ✓ | `rnix-lsp` |
+| ocaml | ✓ |  | ✓ |  |
+| ocaml-interface | ✓ |  |  |  |
+| perl | ✓ | ✓ |  |  |
+| php | ✓ |  | ✓ |  |
+| prolog |  |  |  | `swipl` |
+| protobuf | ✓ |  | ✓ |  |
+| python | ✓ | ✓ | ✓ | `pylsp` |
+| racket |  |  |  | `racket` |
+| ruby | ✓ |  |  | `solargraph` |
+| rust | ✓ | ✓ | ✓ | `rust-analyzer` |
+| svelte | ✓ |  | ✓ | `svelteserver` |
+| toml | ✓ |  |  |  |
+| tsq | ✓ |  |  |  |
+| tsx | ✓ |  |  | `typescript-language-server` |
+| typescript | ✓ |  | ✓ | `typescript-language-server` |
+| vue | ✓ |  |  |  |
+| wgsl | ✓ |  |  |  |
+| yaml | ✓ |  | ✓ |  |
+| zig | ✓ |  | ✓ | `zls` |
diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index 3ce3620a..b6f5081a 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -452,7 +452,6 @@ where
                 file_types: vec!["rs".to_string()],
                 shebangs: vec![],
                 language_id: "Rust".to_string(),
-                display_name: "Rust".to_string(),
                 highlight_config: OnceCell::new(),
                 config: None,
                 //
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 3c65ae33..ef35fc75 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -51,7 +51,6 @@ pub struct Configuration {
 pub struct LanguageConfiguration {
     #[serde(rename = "name")]
     pub language_id: String, // c-sharp, rust
-    pub display_name: String,    // C#, Rust
     pub scope: String,           // source.rust
     pub file_types: Vec<String>, // filename ends_with? <Gemfile, rb, etc>
     #[serde(default)]
diff --git a/languages.toml b/languages.toml
index ca339c98..428051a7 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1,6 +1,5 @@
 [[language]]
 name = "rust"
-display-name = "Rust"
 scope = "source.rust"
 injection-regex = "rust"
 file-types = ["rs"]
@@ -15,7 +14,6 @@ procMacro = { enable = false }
 
 [[language]]
 name = "toml"
-display-name = "TOML"
 scope = "source.toml"
 injection-regex = "toml"
 file-types = ["toml"]
@@ -26,7 +24,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "protobuf"
-display-name = "Protobuf"
 scope = "source.proto"
 injection-regex = "protobuf"
 file-types = ["proto"]
@@ -37,7 +34,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "elixir"
-display-name = "Elixir"
 scope = "source.elixir"
 injection-regex = "elixir"
 file-types = ["ex", "exs"]
@@ -50,7 +46,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "mint"
-display-name = "Mint"
 scope = "source.mint"
 injection-regex = "mint"
 file-types = ["mint"]
@@ -63,7 +58,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "json"
-display-name = "JSON"
 scope = "source.json"
 injection-regex = "json"
 file-types = ["json"]
@@ -73,7 +67,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "c"
-display-name = "C"
 scope = "source.c"
 injection-regex = "c"
 file-types = ["c"] # TODO: ["h"]
@@ -85,7 +78,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "cpp"
-display-name = "C++"
 scope = "source.cpp"
 injection-regex = "cpp"
 file-types = ["cc", "hh", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino"]
@@ -97,7 +89,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "c-sharp"
-display-name = "C#"
 scope = "source.csharp"
 injection-regex = "c-?sharp"
 file-types = ["cs"]
@@ -108,7 +99,6 @@ indent = { tab-width = 4, unit = "\t" }
 
 [[language]]
 name = "go"
-display-name = "Go"
 scope = "source.go"
 injection-regex = "go"
 file-types = ["go"]
@@ -122,7 +112,6 @@ indent = { tab-width = 4, unit = "\t" }
 
 [[language]]
 name = "javascript"
-display-name = "JavaScript"
 scope = "source.js"
 injection-regex = "^(js|javascript)$"
 file-types = ["js", "mjs"]
@@ -135,7 +124,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "typescript"
-display-name = "TypeScript"
 scope = "source.ts"
 injection-regex = "^(ts|typescript)$"
 file-types = ["ts"]
@@ -148,7 +136,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "tsx"
-display-name = "TSX"
 scope = "source.tsx"
 injection-regex = "^(tsx)$" # |typescript
 file-types = ["tsx"]
@@ -160,7 +147,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "css"
-display-name = "CSS"
 scope = "source.css"
 injection-regex = "css"
 file-types = ["css"]
@@ -170,7 +156,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "html"
-display-name = "HTML"
 scope = "text.html.basic"
 injection-regex = "html"
 file-types = ["html"]
@@ -180,7 +165,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "python"
-display-name = "Python"
 scope = "source.python"
 injection-regex = "python"
 file-types = ["py"]
@@ -194,7 +178,6 @@ indent = { tab-width = 4, unit = "    " }
 
 [[language]]
 name = "nix"
-display-name = "Nix"
 scope = "source.nix"
 injection-regex = "nix"
 file-types = ["nix"]
@@ -207,7 +190,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "ruby"
-display-name = "Ruby"
 scope = "source.ruby"
 injection-regex = "ruby"
 file-types = ["rb"]
@@ -220,7 +202,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "bash"
-display-name = "Bash"
 scope = "source.bash"
 injection-regex = "bash"
 file-types = ["sh", "bash"]
@@ -233,7 +214,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "php"
-display-name = "PHP"
 scope = "source.php"
 injection-regex = "php"
 file-types = ["php"]
@@ -244,7 +224,6 @@ indent = { tab-width = 4, unit = "    " }
 
 [[language]]
 name = "latex"
-display-name = "LaTeX"
 scope = "source.tex"
 injection-regex = "tex"
 file-types = ["tex"]
@@ -255,7 +234,6 @@ indent = { tab-width = 4, unit = "\t" }
 
 [[language]]
 name = "julia"
-display-name = "Julia"
 scope = "source.julia"
 injection-regex = "julia"
 file-types = ["jl"]
@@ -271,7 +249,6 @@ language-server = { command = "julia", args = [
                 using Pkg;
                 import StaticLint;
                 env_path = dirname(Pkg.Types.Context().env.project_file);
-
                 server = LanguageServer.LanguageServerInstance(stdin, stdout, env_path, "");
                 server.runlinter = true;
                 run(server);
@@ -281,7 +258,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "java"
-display-name = "Java"
 scope = "source.java"
 injection-regex = "java"
 file-types = ["java"]
@@ -290,7 +266,6 @@ indent = { tab-width = 4, unit = "    " }
 
 [[language]]
 name = "ledger"
-display-name = "Ledger"
 scope = "source.ledger"
 injection-regex = "ledger"
 file-types = ["ldg", "ledger", "journal"]
@@ -300,7 +275,6 @@ indent = { tab-width = 4, unit = "    " }
 
 [[language]]
 name = "ocaml"
-display-name = "OCaml"
 scope = "source.ocaml"
 injection-regex = "ocaml"
 file-types = ["ml"]
@@ -311,7 +285,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "ocaml-interface"
-display-name = "OCaml-Interface"
 scope = "source.ocaml.interface"
 file-types = ["mli"]
 shebangs = []
@@ -321,7 +294,6 @@ indent = { tab-width = 2, unit = "  "}
 
 [[language]]
 name = "lua"
-display-name = "Lua"
 scope = "source.lua"
 file-types = ["lua"]
 shebangs = ["lua"]
@@ -331,7 +303,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "svelte"
-display-name = "Svelte"
 scope = "source.svelte"
 injection-regex = "svelte"
 file-types = ["svelte"]
@@ -342,7 +313,6 @@ language-server = { command = "svelteserver", args = ["--stdio"] }
 
 [[language]]
 name = "vue"
-display-name = "Vue"
 scope = "source.vue"
 injection-regex = "vue"
 file-types = ["vue"]
@@ -351,7 +321,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "yaml"
-display-name = "YAML"
 scope = "source.yaml"
 file-types = ["yml", "yaml"]
 roots = []
@@ -360,7 +329,6 @@ indent = { tab-width = 2, unit = "  " }
 
 # [[language]]
 # name = "haskell"
-# display-name = "Haskell"
 # scope = "source.haskell"
 # injection-regex = "haskell"
 # file-types = ["hs"]
@@ -371,7 +339,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "zig"
-display-name = "Zig"
 scope = "source.zig"
 injection-regex = "zig"
 file-types = ["zig"]
@@ -384,7 +351,6 @@ indent = { tab-width = 4, unit = "    " }
 
 [[language]]
 name = "prolog"
-display-name = "Prolog"
 scope = "source.prolog"
 roots = []
 file-types = ["pl", "prolog"]
@@ -398,7 +364,6 @@ language-server = { command = "swipl", args = [
 
 [[language]]
 name = "tsq"
-display-name = "TSQ"
 scope = "source.tsq"
 file-types = ["scm"]
 roots = []
@@ -407,7 +372,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "cmake"
-display-name = "CMake"
 scope = "source.cmake"
 file-types = ["cmake", "CMakeLists.txt"]
 roots = []
@@ -417,7 +381,6 @@ language-server = { command = "cmake-language-server" }
 
 [[language]]
 name = "glsl"
-display-name = "GLSL"
 scope = "source.glsl"
 file-types = ["glsl", "vert", "tesc", "tese", "geom", "frag", "comp" ]
 roots = []
@@ -426,7 +389,6 @@ indent = { tab-width = 4, unit = "    " }
 
 [[language]]
 name = "perl"
-display-name = "Perl"
 scope = "source.perl"
 file-types = ["pl", "pm"]
 shebangs = ["perl"]
@@ -436,7 +398,6 @@ indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "racket"
-display-name = "Racket"
 scope = "source.rkt"
 roots = []
 file-types = ["rkt"]
@@ -446,7 +407,6 @@ language-server = { command = "racket", args = ["-l", "racket-langserver"] }
 
 [[language]]
 name = "wgsl"
-display-name = "WGSL"
 scope = "source.wgsl"
 file-types = ["wgsl"]
 roots = []
@@ -455,7 +415,6 @@ indent = { tab-width = 4, unit = "    " }
 
 [[language]]
 name = "llvm"
-display-name = "LLVM"
 scope = "source.llvm"
 roots = []
 file-types = ["ll"]
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 37e70592..7256653a 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -184,7 +184,7 @@ pub mod md_gen {
                 .iter()
                 .find(|l| l.language_id == lang)
                 .unwrap(); // lang comes from config
-            row.push(lc.display_name.clone());
+            row.push(lc.language_id.clone());
 
             for (_feat, support_list) in &ts_features_to_langs {
                 row.push(
-- 
cgit v1.2.3-70-g09d2


From efaac6c5d381b2fdf24f0b91956ac6949f6a07e6 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Tue, 4 Jan 2022 18:54:05 +0900
Subject: Release 0.6

---
 Cargo.lock              | 14 +++++++-------
 helix-core/Cargo.toml   |  4 ++--
 helix-lsp/Cargo.toml    |  4 ++--
 helix-syntax/Cargo.toml |  2 +-
 helix-term/Cargo.toml   |  8 ++++----
 helix-tui/Cargo.toml    |  6 +++---
 helix-view/Cargo.toml   |  6 +++---
 xtask/Cargo.toml        |  6 +++---
 8 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'xtask')

diff --git a/Cargo.lock b/Cargo.lock
index e6a55b51..1a01da82 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -366,7 +366,7 @@ dependencies = [
 
 [[package]]
 name = "helix-core"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "arc-swap",
  "chrono",
@@ -392,7 +392,7 @@ dependencies = [
 
 [[package]]
 name = "helix-lsp"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "anyhow",
  "futures-executor",
@@ -410,7 +410,7 @@ dependencies = [
 
 [[package]]
 name = "helix-syntax"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "anyhow",
  "cc",
@@ -421,7 +421,7 @@ dependencies = [
 
 [[package]]
 name = "helix-term"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "anyhow",
  "chrono",
@@ -452,7 +452,7 @@ dependencies = [
 
 [[package]]
 name = "helix-tui"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "bitflags",
  "cassowary",
@@ -465,7 +465,7 @@ dependencies = [
 
 [[package]]
 name = "helix-view"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "anyhow",
  "bitflags",
@@ -1261,7 +1261,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "xtask"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "helix-core",
  "helix-term",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 3d7fe866..3c11ec76 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "helix-core"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
 edition = "2021"
 license = "MPL-2.0"
@@ -13,7 +13,7 @@ include = ["src/**/*", "README.md"]
 [features]
 
 [dependencies]
-helix-syntax = { version = "0.5", path = "../helix-syntax" }
+helix-syntax = { version = "0.6", path = "../helix-syntax" }
 
 ropey = "1.3"
 smallvec = "1.7"
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index b7fe94ab..ee485f57 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "helix-lsp"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
 edition = "2021"
 license = "MPL-2.0"
@@ -12,7 +12,7 @@ homepage = "https://helix-editor.com"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-helix-core = { version = "0.5", path = "../helix-core" }
+helix-core = { version = "0.6", path = "../helix-core" }
 
 anyhow = "1.0"
 futures-executor = "0.3"
diff --git a/helix-syntax/Cargo.toml b/helix-syntax/Cargo.toml
index cceec412..855839be 100644
--- a/helix-syntax/Cargo.toml
+++ b/helix-syntax/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "helix-syntax"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
 edition = "2021"
 license = "MPL-2.0"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 58c713cb..28b4fe2a 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "helix-term"
-version = "0.5.0"
+version = "0.6.0"
 description = "A post-modern text editor."
 authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
 edition = "2021"
@@ -22,9 +22,9 @@ name = "hx"
 path = "src/main.rs"
 
 [dependencies]
-helix-core = { version = "0.5", path = "../helix-core" }
-helix-view = { version = "0.5", path = "../helix-view" }
-helix-lsp = { version = "0.5", path = "../helix-lsp" }
+helix-core = { version = "0.6", path = "../helix-core" }
+helix-view = { version = "0.6", path = "../helix-view" }
+helix-lsp = { version = "0.6", path = "../helix-lsp" }
 
 anyhow = "1"
 once_cell = "1.9"
diff --git a/helix-tui/Cargo.toml b/helix-tui/Cargo.toml
index 6df65d36..4b8d7acb 100644
--- a/helix-tui/Cargo.toml
+++ b/helix-tui/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "helix-tui"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
 description = """
 A library to build rich terminal user interfaces or dashboards
@@ -21,5 +21,5 @@ cassowary = "0.3"
 unicode-segmentation = "1.8"
 crossterm = { version = "0.22", optional = true }
 serde = { version = "1", "optional" = true, features = ["derive"]}
-helix-view = { version = "0.5", path = "../helix-view", features = ["term"] }
-helix-core = { version = "0.5", path = "../helix-core" }
+helix-view = { version = "0.6", path = "../helix-view", features = ["term"] }
+helix-core = { version = "0.6", path = "../helix-core" }
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 121a518c..3c8866fc 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "helix-view"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
 edition = "2021"
 license = "MPL-2.0"
@@ -16,8 +16,8 @@ term = ["crossterm"]
 [dependencies]
 bitflags = "1.3"
 anyhow = "1"
-helix-core = { version = "0.5", path = "../helix-core" }
-helix-lsp = { version = "0.5", path = "../helix-lsp"}
+helix-core = { version = "0.6", path = "../helix-core" }
+helix-lsp = { version = "0.6", path = "../helix-lsp"}
 crossterm = { version = "0.22", optional = true }
 
 # Conversion traits
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index fe5d55d4..717530d0 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "xtask"
-version = "0.5.0"
+version = "0.6.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-helix-term = { version = "0.5", path = "../helix-term" }
-helix-core = { version = "0.5", path = "../helix-core" }
+helix-term = { version = "0.6", path = "../helix-term" }
+helix-core = { version = "0.6", path = "../helix-core" }
 toml = "0.5"
-- 
cgit v1.2.3-70-g09d2


From f88c077f992bbfc5ea3623441a9e2b2a0e9ca2b2 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Mon, 7 Feb 2022 14:03:04 +0900
Subject: Replace tendril with smartstring

Slightly smaller API surface, less dependencies.
---
 Cargo.lock                            | 56 ++++++++++-------------------------
 helix-core/Cargo.toml                 |  2 +-
 helix-core/src/auto_pairs.rs          | 14 +++++----
 helix-core/src/increment/date_time.rs |  2 +-
 helix-core/src/increment/number.rs    | 10 +++----
 helix-core/src/lib.rs                 |  5 +++-
 helix-core/src/transaction.rs         | 24 ++++++++-------
 helix-lsp/src/client.rs               |  2 +-
 helix-term/src/commands.rs            | 32 +++++++++++---------
 xtask/src/main.rs                     |  2 +-
 10 files changed, 69 insertions(+), 80 deletions(-)

(limited to 'xtask')

diff --git a/Cargo.lock b/Cargo.lock
index 3253e6cd..360ebcfb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -246,16 +246,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "futf"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843"
-dependencies = [
- "mac",
- "new_debug_unreachable",
-]
-
 [[package]]
 name = "futures-core"
 version = "0.3.21"
@@ -383,7 +373,7 @@ dependencies = [
  "similar",
  "slotmap",
  "smallvec",
- "tendril",
+ "smartstring",
  "toml",
  "tree-sitter",
  "unicode-general-category",
@@ -606,12 +596,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "mac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
-
 [[package]]
 name = "matches"
 version = "0.1.9"
@@ -655,12 +639,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "new_debug_unreachable"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
-
 [[package]]
 name = "ntapi"
 version = "0.3.6"
@@ -1010,6 +988,21 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
 
+[[package]]
+name = "smartstring"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31aa6a31c0c2b21327ce875f7e8952322acfcfd0c27569a6e18a647281352c9b"
+dependencies = [
+ "static_assertions",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
 [[package]]
 name = "str-buf"
 version = "1.0.5"
@@ -1027,17 +1020,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "tendril"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9ef557cb397a4f0a5a3a628f06515f78563f2209e64d47055d9dc6052bf5e33"
-dependencies = [
- "futf",
- "mac",
- "utf-8",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.30"
@@ -1212,12 +1194,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
 [[package]]
 name = "version_check"
 version = "0.9.4"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 3a1f9b3e..7ff91cfd 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -17,7 +17,7 @@ helix-syntax = { version = "0.6", path = "../helix-syntax" }
 
 ropey = "1.3"
 smallvec = "1.8"
-tendril = "0.4.2"
+smartstring = "0.2.9"
 unicode-segmentation = "1.9"
 unicode-width = "0.1"
 unicode-general-category = "0.5"
diff --git a/helix-core/src/auto_pairs.rs b/helix-core/src/auto_pairs.rs
index 40802680..f4359a34 100644
--- a/helix-core/src/auto_pairs.rs
+++ b/helix-core/src/auto_pairs.rs
@@ -214,7 +214,9 @@ fn handle_open(
         let change = match next_char {
             Some(ch) if !close_before.contains(ch) => {
                 len_inserted = open.len_utf8();
-                (cursor, cursor, Some(Tendril::from_char(open)))
+                let mut tendril = Tendril::new();
+                tendril.push(open);
+                (cursor, cursor, Some(tendril))
             }
             // None | Some(ch) if close_before.contains(ch) => {}
             _ => {
@@ -252,7 +254,9 @@ fn handle_close(doc: &Rope, selection: &Selection, _open: char, close: char) ->
             (cursor, cursor, None) // no-op
         } else {
             len_inserted += close.len_utf8();
-            (cursor, cursor, Some(Tendril::from_char(close)))
+            let mut tendril = Tendril::new();
+            tendril.push(close);
+            (cursor, cursor, Some(tendril))
         };
 
         let next_range = get_next_range(doc, start_range, offs, close, len_inserted);
@@ -290,15 +294,15 @@ fn handle_same(
             //  return transaction that moves past close
             (cursor, cursor, None) // no-op
         } else {
-            let mut pair = Tendril::with_capacity(2 * token.len_utf8() as u32);
-            pair.push_char(token);
+            let mut pair = Tendril::new();
+            pair.push(token);
 
             // for equal pairs, don't insert both open and close if either
             // side has a non-pair char
             if (next_char.is_none() || close_before.contains(next_char.unwrap()))
                 && (prev_char.is_none() || open_before.contains(prev_char.unwrap()))
             {
-                pair.push_char(token);
+                pair.push(token);
             }
 
             len_inserted += pair.len();
diff --git a/helix-core/src/increment/date_time.rs b/helix-core/src/increment/date_time.rs
index 1703c3ba..91fa5963 100644
--- a/helix-core/src/increment/date_time.rs
+++ b/helix-core/src/increment/date_time.rs
@@ -451,7 +451,7 @@ mod test {
                     .unwrap()
                     .increment(amount)
                     .1,
-                expected.into()
+                Tendril::from(expected)
             );
         }
     }
diff --git a/helix-core/src/increment/number.rs b/helix-core/src/increment/number.rs
index a19b7e75..57171f67 100644
--- a/helix-core/src/increment/number.rs
+++ b/helix-core/src/increment/number.rs
@@ -371,7 +371,7 @@ mod test {
                     .unwrap()
                     .increment(amount)
                     .1,
-                expected.into()
+                Tendril::from(expected)
             );
         }
     }
@@ -398,7 +398,7 @@ mod test {
                     .unwrap()
                     .increment(amount)
                     .1,
-                expected.into()
+                Tendril::from(expected)
             );
         }
     }
@@ -426,7 +426,7 @@ mod test {
                     .unwrap()
                     .increment(amount)
                     .1,
-                expected.into()
+                Tendril::from(expected)
             );
         }
     }
@@ -472,7 +472,7 @@ mod test {
                     .unwrap()
                     .increment(amount)
                     .1,
-                expected.into()
+                Tendril::from(expected)
             );
         }
     }
@@ -500,7 +500,7 @@ mod test {
                     .unwrap()
                     .increment(amount)
                     .1,
-                expected.into()
+                Tendril::from(expected)
             );
         }
     }
diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index 7fd23b97..0b03ead8 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -212,7 +212,10 @@ use etcetera::base_strategy::{choose_base_strategy, BaseStrategy};
 
 pub use ropey::{Rope, RopeBuilder, RopeSlice};
 
-pub use tendril::StrTendril as Tendril;
+// pub use tendril::StrTendril as Tendril;
+pub use smartstring::SmartString;
+
+pub type Tendril = SmartString<smartstring::LazyCompact>;
 
 #[doc(inline)]
 pub use {regex, tree_sitter};
diff --git a/helix-core/src/transaction.rs b/helix-core/src/transaction.rs
index 30995e8c..2e34a986 100644
--- a/helix-core/src/transaction.rs
+++ b/helix-core/src/transaction.rs
@@ -85,7 +85,7 @@ impl ChangeSet {
 
         let new_last = match self.changes.as_mut_slice() {
             [.., Insert(prev)] | [.., Insert(prev), Delete(_)] => {
-                prev.push_tendril(&fragment);
+                prev.push_str(&fragment);
                 return;
             }
             [.., last @ Delete(_)] => std::mem::replace(last, Insert(fragment)),
@@ -189,7 +189,7 @@ impl ChangeSet {
                             // TODO: cover this with a test
                             // figure out the byte index of the truncated string end
                             let (pos, _) = s.char_indices().nth(j).unwrap();
-                            s.pop_front(pos as u32);
+                            s.replace_range(0..pos, "");
                             head_a = Some(Insert(s));
                             head_b = changes_b.next();
                         }
@@ -211,9 +211,11 @@ impl ChangeSet {
                         Ordering::Greater => {
                             // figure out the byte index of the truncated string end
                             let (pos, _) = s.char_indices().nth(j).unwrap();
-                            let pos = pos as u32;
-                            changes.insert(s.subtendril(0, pos));
-                            head_a = Some(Insert(s.subtendril(pos, s.len() as u32 - pos)));
+                            let mut before = s;
+                            let after = before.split_off(pos);
+
+                            changes.insert(before);
+                            head_a = Some(Insert(after));
                             head_b = changes_b.next();
                         }
                     }
@@ -277,7 +279,7 @@ impl ChangeSet {
                 }
                 Delete(n) => {
                     let text = Cow::from(original_doc.slice(pos..pos + *n));
-                    changes.insert(Tendril::from_slice(&text));
+                    changes.insert(Tendril::from(text.as_ref()));
                     pos += n;
                 }
                 Insert(s) => {
@@ -710,19 +712,19 @@ mod test {
     #[test]
     fn optimized_composition() {
         let mut state = State::new("".into());
-        let t1 = Transaction::insert(&state.doc, &state.selection, Tendril::from_char('h'));
+        let t1 = Transaction::insert(&state.doc, &state.selection, Tendril::from("h"));
         t1.apply(&mut state.doc);
         state.selection = state.selection.clone().map(t1.changes());
-        let t2 = Transaction::insert(&state.doc, &state.selection, Tendril::from_char('e'));
+        let t2 = Transaction::insert(&state.doc, &state.selection, Tendril::from("e"));
         t2.apply(&mut state.doc);
         state.selection = state.selection.clone().map(t2.changes());
-        let t3 = Transaction::insert(&state.doc, &state.selection, Tendril::from_char('l'));
+        let t3 = Transaction::insert(&state.doc, &state.selection, Tendril::from("l"));
         t3.apply(&mut state.doc);
         state.selection = state.selection.clone().map(t3.changes());
-        let t4 = Transaction::insert(&state.doc, &state.selection, Tendril::from_char('l'));
+        let t4 = Transaction::insert(&state.doc, &state.selection, Tendril::from("l"));
         t4.apply(&mut state.doc);
         state.selection = state.selection.clone().map(t4.changes());
-        let t5 = Transaction::insert(&state.doc, &state.selection, Tendril::from_char('o'));
+        let t5 = Transaction::insert(&state.doc, &state.selection, Tendril::from("o"));
         t5.apply(&mut state.doc);
         state.selection = state.selection.clone().map(t5.changes());
 
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index c80f70b5..15cbca0e 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -438,7 +438,7 @@ impl Client {
 
                     changes.push(lsp::TextDocumentContentChangeEvent {
                         range: Some(lsp::Range::new(start, end)),
-                        text: s.into(),
+                        text: s.to_string(),
                         range_length: None,
                     });
                 }
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index d0882728..9918d26c 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2769,7 +2769,7 @@ pub mod cmd {
 
         let mut fragments: Vec<_> = selection
             .fragments(text)
-            .map(|fragment| Tendril::from_slice(&fragment))
+            .map(|fragment| Tendril::from(fragment.as_ref()))
             .collect();
 
         fragments.sort_by(match reverse {
@@ -3921,7 +3921,7 @@ fn try_restore_indent(doc: &mut Document, view_id: ViewId) {
         if let [Operation::Retain(move_pos), Operation::Insert(ref inserted_str), Operation::Retain(_)] =
             changes
         {
-            move_pos + inserted_str.len32() as usize == pos
+            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
@@ -4513,7 +4513,8 @@ pub mod insert {
     #[allow(clippy::unnecessary_wraps)] // need to use Option<> because of the Hook signature
     fn insert(doc: &Rope, selection: &Selection, ch: char) -> Option<Transaction> {
         let cursors = selection.clone().cursors(doc.slice(..));
-        let t = Tendril::from_char(ch);
+        let mut t = Tendril::new();
+        t.push(ch);
         let transaction = Transaction::insert(doc, &cursors, t);
         Some(transaction)
     }
@@ -5015,12 +5016,12 @@ fn replace_with_yanked(cx: &mut Context) {
             let repeat = std::iter::repeat(
                 values
                     .last()
-                    .map(|value| Tendril::from_slice(&value.repeat(count)))
+                    .map(|value| Tendril::from(&value.repeat(count)))
                     .unwrap(),
             );
             let mut values = values
                 .iter()
-                .map(|value| Tendril::from_slice(&value.repeat(count)))
+                .map(|value| Tendril::from(&value.repeat(count)))
                 .chain(repeat);
             let selection = doc.selection(view.id);
             let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
@@ -5530,7 +5531,7 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
     let selection = doc.selection(view.id);
     let mut fragments: Vec<_> = selection
         .fragments(text)
-        .map(|fragment| Tendril::from_slice(&fragment))
+        .map(|fragment| Tendril::from(fragment.as_ref()))
         .collect();
 
     let group = count
@@ -5891,8 +5892,12 @@ fn surround_add(cx: &mut Context) {
 
             let mut changes = Vec::with_capacity(selection.len() * 2);
             for range in selection.iter() {
-                changes.push((range.from(), range.from(), Some(Tendril::from_char(open))));
-                changes.push((range.to(), range.to(), Some(Tendril::from_char(close))));
+                let mut o = Tendril::new();
+                o.push(open);
+                let mut c = Tendril::new();
+                c.push(close);
+                changes.push((range.from(), range.from(), Some(o)));
+                changes.push((range.to(), range.to(), Some(c)));
             }
 
             let transaction = Transaction::change(doc.text(), changes.into_iter());
@@ -5921,11 +5926,9 @@ fn surround_replace(cx: &mut Context) {
                     let transaction = Transaction::change(
                         doc.text(),
                         change_pos.iter().enumerate().map(|(i, &pos)| {
-                            (
-                                pos,
-                                pos + 1,
-                                Some(Tendril::from_char(if i % 2 == 0 { open } else { close })),
-                            )
+                            let mut t = Tendril::new();
+                            t.push(if i % 2 == 0 { open } else { close });
+                            (pos, pos + 1, Some(t))
                         }),
                     );
                     doc.apply(&transaction, view.id);
@@ -6065,8 +6068,9 @@ fn shell_impl(
         log::error!("Shell error: {}", String::from_utf8_lossy(&output.stderr));
     }
 
-    let tendril = Tendril::try_from_byte_slice(&output.stdout)
+    let str = std::str::from_utf8(&output.stdout)
         .map_err(|_| anyhow!("Process did not output valid UTF-8"))?;
+    let tendril = Tendril::from(str);
     Ok((tendril, output.status.success()))
 }
 
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 7256653a..d24a29cc 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -120,7 +120,7 @@ pub mod md_gen {
     }
 
     fn md_table_row(cols: &[String]) -> String {
-        "| ".to_owned() + &cols.join(" | ") + " |\n"
+        format!("| {} |\n", cols.join(" | "))
     }
 
     fn md_mono(s: &str) -> String {
-- 
cgit v1.2.3-70-g09d2