Merge branch 'master' into lsp-exit

helix-editor · Jun 19, 2021 · c3f6356 · c3f6356
2 parents ec9d995 + 03d1ca7
commit c3f6356
Show file tree

Hide file tree

Showing 29 changed files with 680 additions and 348 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/book/src/configuration.md b/book/src/configuration.md
@@ -1,5 +1,12 @@
 # Configuration
 
+## LSP
+
+To disable language server progress report from being displayed in the status bar add this option to your `config.toml`:
+```toml
+lsp-progress = false
+```
+
 ## Theme
 
 Use a custom theme by placing a theme.toml in your config directory (i.e ~/.config/helix/theme.toml). The default theme.toml can be found [here](https://github.com/helix-editor/helix/blob/master/theme.toml), and user submitted themes [here](https://github.com/helix-editor/helix/blob/master/contrib/themes).
@@ -32,11 +39,11 @@ Possible modifiers:
 | `dim`          |
 | `italic`       |
 | `underlined`   |
-| `slow\_blink`  |
-| `rapid\_blink` |
+| `slow_blink`  |
+| `rapid_blink` |
 | `reversed`     |
 | `hidden`       |
-| `crossed\_out` |
+| `crossed_out` |
 
 Possible keys:
 
@@ -87,3 +94,4 @@ Possible keys:
 These keys match [tree-sitter scopes](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#theme). We half-follow the common scopes from [macromates language grammars](https://macromates.com/manual/en/language_grammars) with some differences.
 
 For a given highlight produced, styling will be determined based on the longest matching theme key. So it's enough to provide function to highlight `function.macro` and `function.builtin` as well, but you can use more specific scopes to highlight specific cases differently.
+
diff --git a/book/src/remapping.md b/book/src/remapping.md
@@ -26,9 +26,9 @@ Control, Shift and Alt modifiers are encoded respectively with the prefixes
 * Space => "space"
 * Return/Enter => "ret"
 * < => "lt"
-* > => "gt"
-* + => "plus"
-* - => "minus"
+* \> => "gt"
+* \+ => "plus"
+* \- => "minus"
 * ; => "semicolon"
 * % => "percent"
 * Left => "left"

diff --git a/contrib/themes/bogster.toml b/contrib/themes/bogster.toml
@@ -31,15 +31,16 @@
 "ui.background" = { bg = "#161c23" }
 "ui.linenr" = { fg = "#415367" }
 "ui.linenr.selected" = { fg = "#e5ded6" }  # TODO
-"ui.statusline" = { bg = "#232d38" }
+"ui.statusline" = { fg = "#e5ded6", bg = "#232d38" }
+"ui.statusline.inactive" = { fg = "#c6b8ad", bg = "#232d38" }
 "ui.popup" = { bg = "#232d38" }
 "ui.window" = { bg = "#232d38" }
 "ui.help" = { bg = "#232d38", fg = "#e5ded6" }
 
 "ui.text" = { fg = "#e5ded6" }
 "ui.text.focus" = { fg = "#e5ded6", modifiers= ["bold"] }
 
-"ui.selection" = { bg = "#540099" }
+"ui.selection" = { bg = "#313f4e" }
 "ui.menu.selected" = { fg = "#e5ded6", bg = "#313f4e" }
 
 "warning" = "#dc7759"

diff --git a/contrib/themes/ingrid.toml b/contrib/themes/ingrid.toml
@@ -31,7 +31,8 @@
 "ui.background" = { bg = "#FFFCFD" }
 "ui.linenr" = { fg = "#bbbbbb" }
 "ui.linenr.selected" = { fg = "#F3EAE9" }  # TODO
-"ui.statusline" = { bg = "#F3EAE9" }
+"ui.statusline" = { fg = "#250E07", bg = "#F3EAE9" }
+"ui.statusline.inactive" = { fg = "#7b91b3", bg = "#F3EAE9" }
 "ui.popup" = { bg = "#F3EAE9" }
 "ui.window" = { bg = "#D8B8B3" }
 "ui.help" = { bg = "#D8B8B3", fg = "#250E07" }

diff --git a/contrib/themes/onedark.toml b/contrib/themes/onedark.toml
@@ -36,6 +36,7 @@
 "ui.linenr.selected" = { fg = "#ABB2BF" }
 "ui.popup" = { bg = "#3E4452" }
 "ui.statusline" = { fg = "#ABB2BF", bg = "#2C323C" }
+"ui.statusline.inactive" = { fg = "#ABB2Bf", bg = "#2C323C" }
 "ui.selection" = { bg = "#3E4452" }
 "ui.text" = { fg = "#ABB2BF", bg = "#282C34" }
 "ui.text.focus" = { fg = "#ABB2BF", bg = "#2C323C", modifiers = ['bold'] }

diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
@@ -4,17 +4,19 @@ version = "0.2.0"
 authors = ["Blaž Hrastnik <[email protected]>"]
 edition = "2018"
 license = "MPL-2.0"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
+description = "Helix editor core editing primitives"
+categories = ["editor"]
+repository = "https://github.com/helix-editor/helix"
+homepage = "https://helix-editor.com"
+include = ["src/**/*", "README.md"]
 
 [features]
 embed_runtime = ["rust-embed"]
 
 [dependencies]
-helix-syntax = { path = "../helix-syntax" }
+helix-syntax = { version = "0.2", path = "../helix-syntax" }
 
-ropey = "1.2"
+ropey = "1.3"
 smallvec = "1.4"
 tendril = "0.4.2"
 unicode-segmentation = "1.7.1"

diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
@@ -89,6 +89,8 @@ pub fn cache_dir() -> std::path::PathBuf {
     path
 }
 
+pub use etcetera::home_dir;
+
 use etcetera::base_strategy::{choose_base_strategy, BaseStrategy};
 
 pub use ropey::{Rope, RopeSlice};

diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
@@ -4,11 +4,15 @@ version = "0.2.0"
 authors = ["Blaž Hrastnik <[email protected]>"]
 edition = "2018"
 license = "MPL-2.0"
+description = "LSP client implementation for Helix project"
+categories = ["editor"]
+repository = "https://github.com/helix-editor/helix"
+homepage = "https://helix-editor.com"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-helix-core = { path = "../helix-core" }
+helix-core = { version = "0.2", path = "../helix-core" }
 
 anyhow = "1.0"
 futures-executor = "0.3"
@@ -20,4 +24,4 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
 tokio = { version = "1.6", features = ["full"] }
-tokio-stream = "0.1.6"
+tokio-stream = "0.1.6"
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,6 +89,8 @@ pub fn cache_dir() -> std::path::PathBuf { @@
         path
     }
+    pub use etcetera::home_dir;
     use etcetera::base_strategy::{choose_base_strategy, BaseStrategy};
     pub use ropey::{Rope, RopeSlice};
@@ Expand Down @@