Merge branch 'master' into great_line_ending_and_cursor_range_cleanup

3 files changed, 15 insertions, 15 deletions

diff --git a/Cargo.lock b/Cargo.lock
index e262f081..0d96b700 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1009,9 +1009,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.8.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98c8b05dc14c75ea83d63dd391100353789f5f24b8b3866542a5e85c8be8e985"
+checksum = "c2602b8af3767c285202012822834005f596c811042315fa7e9f5b12b2a43207"
 dependencies = [
  "autocfg",
  "bytes",
diff --git a/helix-view/src/tree.rs b/helix-view/src/tree.rs
index 6d5be390..576f64f0 100644
--- a/helix-view/src/tree.rs
+++ b/helix-view/src/tree.rs
@@ -1,7 +1,7 @@
 use crate::{graphics::Rect, View, ViewId};
 use slotmap::HopSlotMap;
 
-// the dimensions are recomputed on windo resize/tree change.
+// the dimensions are recomputed on window resize/tree change.
 //
 #[derive(Debug)]
 pub struct Tree {
diff --git a/languages.toml b/languages.toml
index 05268ddd..123ec882 100644
--- a/languages.toml
+++ b/languages.toml
@@ -5,7 +5,7 @@ injection-regex = "rust"
 file-types = ["rs"]
 roots = []
 auto-format = true
-comment_token = "//"
+comment-token = "//"
 config = """
 {
   "cargo": {
@@ -26,7 +26,7 @@ scope = "source.toml"
 injection-regex = "toml"
 file-types = ["toml"]
 roots = []
-comment_token = "#"
+comment-token = "#"
 
 indent = { tab-width = 2, unit = "  " }
 
@@ -54,7 +54,7 @@ scope = "source.c"
 injection-regex = "c"
 file-types = ["c"] # TODO: ["h"]
 roots = []
-comment_token = "//"
+comment-token = "//"
 
 language-server = { command = "clangd" }
 indent = { tab-width = 2, unit = "  " }
@@ -65,7 +65,7 @@ scope = "source.cpp"
 injection-regex = "cpp"
 file-types = ["cc", "cpp", "hpp", "h"]
 roots = []
-comment_token = "//"
+comment-token = "//"
 
 language-server = { command = "clangd" }
 indent = { tab-width = 2, unit = "  " }
@@ -77,7 +77,7 @@ injection-regex = "go"
 file-types = ["go"]
 roots = ["Gopkg.toml", "go.mod"]
 auto-format = true
-comment_token = "//"
+comment-token = "//"
 
 language-server = { command = "gopls" }
 # TODO: gopls needs utf-8 offsets?
@@ -89,7 +89,7 @@ scope = "source.js"
 injection-regex = "^(js|javascript)$"
 file-types = ["js"]
 roots = []
-comment_token = "//"
+comment-token = "//"
 # TODO: highlights-jsx, highlights-params
 
 indent = { tab-width = 2, unit = "  " }
@@ -129,7 +129,7 @@ scope = "source.python"
 injection-regex = "python"
 file-types = ["py"]
 roots = []
-comment_token = "#"
+comment-token = "#"
 
 language-server = { command = "pyls" }
 # TODO: pyls needs utf-8 offsets
@@ -150,7 +150,7 @@ scope = "source.ruby"
 injection-regex = "ruby"
 file-types = ["rb"]
 roots = []
-comment_token = "#"
+comment-token = "#"
 
 language-server = { command = "solargraph", args = ["stdio"] }
 indent = { tab-width = 2, unit = "  " }
@@ -161,7 +161,7 @@ scope = "source.bash"
 injection-regex = "bash"
 file-types = ["sh", "bash"]
 roots = []
-comment_token = "#"
+comment-token = "#"
 
 language-server = { command = "bash-language-server", args = ["start"] }
 indent = { tab-width = 2, unit = "  " }
@@ -181,7 +181,7 @@ scope = "source.tex"
 injection-regex = "tex"
 file-types = ["tex"]
 roots = []
-comment_token = "%"
+comment-token = "%"
 
 indent = { tab-width = 4, unit = "\t" }
 
@@ -191,7 +191,7 @@ scope = "source.julia"
 injection-regex = "julia"
 file-types = ["jl"]
 roots = []
-comment_token = "#"
+comment-token = "#"
 language-server = { command = "julia", args = [ "--startup-file=no", "--history-file=no", "-e", "using LanguageServer;using Pkg;import StaticLint;import SymbolServer;env_path = dirname(Pkg.Types.Context().env.project_file);server = LanguageServer.LanguageServerInstance(stdin, stdout, env_path, \"\");server.runlinter = true;run(server);" ] }
 indent = { tab-width = 2, unit = "  " }
 
@@ -201,6 +201,6 @@ indent = { tab-width = 2, unit = "  " }
 # injection-regex = "haskell"
 # file-types = ["hs"]
 # roots = []
-# comment_token = "--"
+# comment-token = "--"
 #
 # indent = { tab-width = 2, unit = "  " }