From 6114a29c5c29f80db7e91b9589e17529f0251e71 Mon Sep 17 00:00:00 2001 From: "Tormod G. Hellen" Date: Wed, 11 May 2022 10:42:03 +0200 Subject: [PATCH 1/2] Run cargo fmt --all. --- lapce-core/src/language.rs | 58 ++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/lapce-core/src/language.rs b/lapce-core/src/language.rs index ccfdfbcb..fda4bf69 100644 --- a/lapce-core/src/language.rs +++ b/lapce-core/src/language.rs @@ -136,7 +136,7 @@ pub enum LapceLanguage { // `LapceLanguage` as they will be accessed using the enum variants as indices. const LANGUAGES: &[SyntaxProperties] = &[ #[cfg(feature = "lang-rust")] - SyntaxProperties{ + SyntaxProperties { id: LapceLanguage::Rust, language: tree_sitter_rust::language, highlight: tree_sitter_rust::HIGHLIGHT_QUERY, @@ -144,12 +144,12 @@ pub enum LapceLanguage { indent: " ", code_lens: ( &["source_file", "impl_item", "trait_item", "declaration_list"], - &["source_file", "use_declaration", "line_comment"] + &["source_file", "use_declaration", "line_comment"], ), extensions: &["rs"], }, #[cfg(feature = "lang-go")] - SyntaxProperties{ + SyntaxProperties { id: LapceLanguage::Go, language: tree_sitter_go::language, highlight: tree_sitter_go::HIGHLIGHT_QUERY, @@ -163,12 +163,12 @@ pub enum LapceLanguage { "interface_type", "method_spec_list", ], - &["source_file", "comment", "line_comment"] + &["source_file", "comment", "line_comment"], ), extensions: &["go"], }, #[cfg(feature = "lang-javascript")] - SyntaxProperties{ + SyntaxProperties { id: LapceLanguage::Javascript, language: tree_sitter_javascript::language, highlight: tree_sitter_javascript::HIGHLIGHT_QUERY, @@ -178,7 +178,7 @@ pub enum LapceLanguage { extensions: &["js"], }, #[cfg(feature = "lang-javascript")] - SyntaxProperties{ + SyntaxProperties { id: LapceLanguage::Jsx, language: tree_sitter_javascript::language, highlight: tree_sitter_javascript::JSX_HIGHLIGHT_QUERY, @@ -188,7 +188,7 @@ pub enum LapceLanguage { extensions: &["jsx"], }, #[cfg(feature = "lang-typescript")] - SyntaxProperties{ + SyntaxProperties { id: LapceLanguage::Typescript, language: tree_sitter_typescript::language_typescript, highlight: tree_sitter_typescript::HIGHLIGHT_QUERY, @@ -198,7 +198,7 @@ pub enum LapceLanguage { extensions: &["ts"], }, #[cfg(feature = "lang-typescript")] - SyntaxProperties{ + SyntaxProperties { id: LapceLanguage::Tsx, language: tree_sitter_typescript::language_tsx, highlight: tree_sitter_typescript::HIGHLIGHT_QUERY, @@ -208,7 +208,7 @@ pub enum LapceLanguage { extensions: &["tsx"], }, #[cfg(feature = "lang-python")] - SyntaxProperties{ + SyntaxProperties { id: LapceLanguage::Python, language: tree_sitter_python::language, highlight: tree_sitter_python::HIGHLIGHT_QUERY, @@ -224,12 +224,12 @@ pub enum LapceLanguage { "decorated_definition", "block", ], - &["source_file", "import_statement", "import_from_statement"] + &["source_file", "import_statement", "import_from_statement"], ), extensions: &["py"], }, #[cfg(feature = "lang-toml")] - SyntaxProperties{ + SyntaxProperties { id: LapceLanguage::Toml, language: tree_sitter_toml::language, highlight: tree_sitter_toml::HIGHLIGHT_QUERY, @@ -239,7 +239,7 @@ pub enum LapceLanguage { extensions: &["toml"], }, #[cfg(feature = "lang-php")] - SyntaxProperties{ + SyntaxProperties { id: LapceLanguage::Php, language: tree_sitter_php::language, highlight: tree_sitter_php::HIGHLIGHT_QUERY, @@ -249,7 +249,7 @@ pub enum LapceLanguage { extensions: &["php"], }, #[cfg(feature = "lang-elixir")] - SyntaxProperties{ + SyntaxProperties { id: LapceLanguage::Elixir, language: tree_sitter_elixir::language, highlight: tree_sitter_elixir::HIGHLIGHTS_QUERY, @@ -259,7 +259,7 @@ pub enum LapceLanguage { extensions: &["ex"], }, #[cfg(feature = "lang-c")] - SyntaxProperties{ + SyntaxProperties { id: LapceLanguage::C, language: tree_sitter_c::language, highlight: tree_sitter_c::HIGHLIGHT_QUERY, @@ -269,7 +269,7 @@ pub enum LapceLanguage { extensions: &["c"], }, #[cfg(feature = "lang-cpp")] - SyntaxProperties{ + SyntaxProperties { id: LapceLanguage::Cpp, language: tree_sitter_cpp::language, highlight: tree_sitter_cpp::HIGHLIGHT_QUERY, @@ -279,7 +279,7 @@ pub enum LapceLanguage { extensions: &["cpp", "cxx", "cc", "c++", "hpp", "hxx", "hh", "h++"], }, #[cfg(feature = "lang-json")] - SyntaxProperties{ + SyntaxProperties { id: LapceLanguage::Json, language: tree_sitter_json::language, highlight: tree_sitter_json::HIGHLIGHT_QUERY, @@ -289,7 +289,7 @@ pub enum LapceLanguage { extensions: &["json"], }, #[cfg(feature = "lang-md")] - SyntaxProperties{ + SyntaxProperties { id: LapceLanguage::Markdown, language: tree_sitter_md::language, highlight: tree_sitter_md::HIGHLIGHTS_QUERY, @@ -299,7 +299,7 @@ pub enum LapceLanguage { extensions: &["md"], }, #[cfg(feature = "lang-ruby")] - SyntaxProperties{ + SyntaxProperties { id: LapceLanguage::Ruby, language: tree_sitter_ruby::language, highlight: tree_sitter_ruby::HIGHLIGHT_QUERY, @@ -309,7 +309,7 @@ pub enum LapceLanguage { extensions: &["rb"], }, #[cfg(feature = "lang-html")] - SyntaxProperties{ + SyntaxProperties { id: LapceLanguage::Html, language: tree_sitter_html::language, highlight: tree_sitter_html::HIGHLIGHT_QUERY, @@ -319,7 +319,7 @@ pub enum LapceLanguage { extensions: &["html", "htm"], }, #[cfg(feature = "lang-java")] - SyntaxProperties{ + SyntaxProperties { id: LapceLanguage::Java, language: tree_sitter_java::language, highlight: tree_sitter_java::HIGHLIGHT_QUERY, @@ -337,7 +337,7 @@ pub fn from_path(path: &Path) -> Option { // isn't called in any tight loop. for properties in LANGUAGES { if properties.extensions.contains(&extension.as_str()) { - return Some(properties.id) + return Some(properties.id); } } None @@ -349,7 +349,12 @@ pub fn from_path(path: &Path) -> Option { fn properties(&self) -> &SyntaxProperties { let i = *self as usize; let l = &LANGUAGES[i]; - debug_assert!(l.id == *self, "LANGUAGES[{i}]: Setting::id mismatch: {:?} != {:?}", l.id, self); + debug_assert!( + l.id == *self, + "LANGUAGES[{i}]: Setting::id mismatch: {:?} != {:?}", + l.id, + self + ); l } @@ -417,8 +422,8 @@ mod test { // function(s) in the module become unused. Hence turning off the lints. #![allow(unused, unreachable_code)] - use std::path::PathBuf; use super::LapceLanguage; + use std::path::PathBuf; fn assert_language(expected: LapceLanguage, exts: &[&str]) { for ext in exts { @@ -512,7 +517,10 @@ fn test_c_lang() { #[test] #[cfg(feature = "lang-cpp")] fn test_cpp_lang() { - assert_language(LapceLanguage::Cpp, &["cpp", "cxx", "cc", "c++", "hpp", "hxx", "hh", "h++"]); + assert_language( + LapceLanguage::Cpp, + &["cpp", "cxx", "cc", "c++", "hpp", "hxx", "hh", "h++"], + ); } #[test] @@ -538,4 +546,4 @@ fn test_html_lang() { fn test_java_lang() { assert_language(LapceLanguage::Java, &["java"]); } -} \ No newline at end of file +} From 2fb6366ee7e8d0e316f5fe5988e9a1f3de84a80e Mon Sep 17 00:00:00 2001 From: "Tormod G. Hellen" Date: Wed, 11 May 2022 10:39:19 +0200 Subject: [PATCH 2/2] Fix indentation. --- .github/workflows/pr.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 17e88f26..16ec1c87 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -32,18 +32,18 @@ jobs: command: test args: --workspace - fmt: - name: Rustfmt - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - - run: rustup component add rustfmt - - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check + fmt: + name: Rustfmt + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable + override: true + - run: rustup component add rustfmt + - uses: actions-rs/cargo@v1 + with: + command: fmt + args: --all -- --check