Rooba
/
lapce
mirror of https://github.com/lapce/lapce.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge mistakes

This commit is contained in:
VitorTrin 2022-03-28 10:57:06 -03:00
parent edc71c6e39
commit 0ddd26ff76
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Cargo.lock generated
View File

@ -1862,9 +1862,9 @@ dependencies = [
"serde_json",
"thiserror",
"tree-sitter",
"tree-sitter-elixir",
"tree-sitter-c",
"tree-sitter-cpp",
"tree-sitter-elixir",
"tree-sitter-go",
"tree-sitter-highlight",
"tree-sitter-javascript",
@ -4063,15 +4063,6 @@ dependencies = [
"regex",
]
[[package]]
name = "tree-sitter-elixir"
version = "0.19.0"
source = "git+https://github.com/VitorTrin/tree-sitter-elixir.git#6a4315c39f176646f3e7efcef559f9e6e5bdd527"
dependencies = [
"cc",
"tree-sitter",
]
[[package]]
name = "tree-sitter-c"
version = "0.20.1"
@ -4092,6 +4083,15 @@ dependencies = [
"tree-sitter",
]
[[package]]
name = "tree-sitter-elixir"
version = "0.19.0"
source = "git+https://github.com/VitorTrin/tree-sitter-elixir.git#6a4315c39f176646f3e7efcef559f9e6e5bdd527"
dependencies = [
"cc",
"tree-sitter",
]
[[package]]
name = "tree-sitter-go"
version = "0.19.1"

4
lapce-core/src/language.rs
View File

@ -97,7 +97,7 @@ pub fn indent_unit(&self) -> &str {
LapceLanguage::Python => " ",
LapceLanguage::Toml => " ",
LapceLanguage::Php => " ",
LapceLanguage::Elixir => " "
LapceLanguage::Elixir => " ",
LapceLanguage::C => " ",
LapceLanguage::Cpp => " ",
}
@ -116,7 +116,7 @@ fn tree_sitter_language(&self) -> tree_sitter::Language {
LapceLanguage::Python => tree_sitter_python::language(),
LapceLanguage::Toml => tree_sitter_toml::language(),
LapceLanguage::Php => tree_sitter_php::language(),
LapceLanguage::Elixir => tree_sitter_elixir::language()
LapceLanguage::Elixir => tree_sitter_elixir::language(),
LapceLanguage::C => tree_sitter_c::language(),
LapceLanguage::Cpp => tree_sitter_cpp::language(),
}