Merge remote-tracking branch 'CppCXY/main' into dev

Author: xuhuanzy

.github/workflows/test.yml

@@ -9,7 +9,21 @@ on:
     branches:
       - main
 
+env:
+  RUST_BACKTRACE: 1
+  CARGO_TERM_COLOR: always
+  CLICOLOR: 1
+
 jobs:
+  spelling:
+    name: Spell Check with Typos
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Spell Check Repo
+      uses: crate-ci/typos@master
+
   test:
     runs-on: ubuntu-latest
     steps:

CHANGELOG.md

@@ -48,7 +48,7 @@
 
 `FIX` Fix possible panic due to integer overflow when calculating pows.
 
-`NEW` Support compile by winodws mingw
+`NEW` Support compile by windows mingw
 
 `NEW` `emmylua_check` now supports `workspace.library`
 

…_check/src/output/json_output_writter.rs …a_check/src/output/json_output_writer.rscrates/emmylua_check/src/output/json_output_writter.rs renamed to crates/emmylua_check/src/output/json_output_writer.rs crates/emmylua_check/src/output/json_output_writter.rs renamed to crates/emmylua_check/src/output/json_output_writer.rs

@@ -6,16 +6,16 @@ use serde_json::{json, Value};
 
 use crate::cmd_args::OutputDestination;
 
-use super::OutputWritter;
+use super::OutputWriter;
 
 #[derive(Debug)]
-pub struct JsonOutputWritter {
+pub struct JsonOutputWriter {
     output: Option<File>,
     first_write: bool,
     json_file_caches: Vec<Value>,
 }
 
-impl JsonOutputWritter {
+impl JsonOutputWriter {
     pub fn new(output: OutputDestination) -> Self {
         let output = match output {
             OutputDestination::Stdout => None,
@@ -29,15 +29,15 @@ impl JsonOutputWritter {
                 Some(std::fs::File::create(path).unwrap())
             }
         };
-        JsonOutputWritter {
+        JsonOutputWriter {
             output,
             first_write: true,
             json_file_caches: Vec::new(),
         }
     }
 }
 
-impl OutputWritter for JsonOutputWritter {
+impl OutputWriter for JsonOutputWriter {
     fn write(&mut self, db: &DbIndex, file_id: FileId, diagnostics: Vec<Diagnostic>) {
         let file_path = db.get_vfs().get_file_path(&file_id).unwrap();
         let file_path = file_path.to_str().unwrap();

crates/emmylua_check/src/output/mod.rs

@@ -1,5 +1,5 @@
-mod json_output_writter;
-mod text_output_writter;
+mod json_output_writer;
+mod text_output_writer;
 
 use std::path::PathBuf;
 
@@ -18,9 +18,9 @@ pub async fn output_result(
     output: OutputDestination,
     warnings_as_errors: bool,
 ) -> i32 {
-    let mut writter: Box<dyn OutputWritter> = match output_format {
-        OutputFormat::Json => Box::new(json_output_writter::JsonOutputWritter::new(output)),
-        OutputFormat::Text => Box::new(text_output_writter::TextOutputWritter::new(workspace)),
+    let mut writer: Box<dyn OutputWriter> = match output_format {
+        OutputFormat::Json => Box::new(json_output_writer::JsonOutputWriter::new(output)),
+        OutputFormat::Text => Box::new(text_output_writer::TextOutputWriter::new(workspace)),
     };
 
     let mut has_error = false;
@@ -39,15 +39,15 @@ pub async fn output_result(
                     break;
                 }
             }
-            writter.write(db, file_id, diagnostics);
+            writer.write(db, file_id, diagnostics);
         }
 
         if count == total_count {
             break;
         }
     }
 
-    writter.finish();
+    writer.finish();
 
     if has_error {
         1
@@ -56,7 +56,7 @@ pub async fn output_result(
     }
 }
 
-trait OutputWritter {
+trait OutputWriter {
     fn write(&mut self, db: &DbIndex, file_id: FileId, diagnostics: Vec<Diagnostic>);
 
     fn finish(&mut self);

…_check/src/output/text_output_writter.rs …a_check/src/output/text_output_writer.rscrates/emmylua_check/src/output/text_output_writter.rs renamed to crates/emmylua_check/src/output/text_output_writer.rs crates/emmylua_check/src/output/text_output_writter.rs renamed to crates/emmylua_check/src/output/text_output_writer.rs

@@ -3,21 +3,21 @@ use std::path::PathBuf;
 use emmylua_code_analysis::{DbIndex, FileId};
 use lsp_types::Diagnostic;
 
-use super::OutputWritter;
+use super::OutputWriter;
 use ariadne::{Color, Label, Report, ReportKind, Source};
 
 #[derive(Debug)]
-pub struct TextOutputWritter {
+pub struct TextOutputWriter {
     workspace: PathBuf,
 }
 
-impl TextOutputWritter {
+impl TextOutputWriter {
     pub fn new(workspace: PathBuf) -> Self {
-        TextOutputWritter { workspace }
+        TextOutputWriter { workspace }
     }
 }
 
-impl OutputWritter for TextOutputWritter {
+impl OutputWriter for TextOutputWriter {
     fn write(&mut self, db: &DbIndex, file_id: FileId, diagnostics: Vec<Diagnostic>) {
         if diagnostics.is_empty() {
             return;

crates/emmylua_code_analysis/locales/lint.yml

@@ -34,7 +34,7 @@ The property is protected and cannot be accessed outside its subclasses.:
   zh_CN: '该属性受保护，无法在其子类之外访问。'
   zh_HK: '該屬性受保護，無法在其子類之外訪問。'
   zh_TW: '該屬性受保護，無法在其子類之外訪問。'
-expected %{num} but founded %{found_num}. %{infos}:
+expected %{num} but found %{found_num}. %{infos}:
   en: 'expected %{num} but found %{found_num}. %{infos}'
   zh_CN: '期望 %{num} 但找到 %{found_num}。%{infos}'
   zh_HK: '期望 %{num} 但找到 %{found_num}。%{infos}'

crates/emmylua_code_analysis/resources/std/jit/util.lua

@@ -76,7 +76,7 @@ end
 ---@param tr Trace
 ---@param ref integer
 ---@return integer? m
----@return integer? ot
+---@return integer? ot --spellchecker:disable-line
 ---@return integer? op1
 ---@return integer? op2
 ---@return integer? prev

crates/emmylua_code_analysis/resources/std/string/buffer.lua

@@ -9,7 +9,7 @@
 ---
 --- The convenient string buffer API simplifies common string manipulation tasks, that would otherwise require creating many intermediate strings. String buffers improve performance by eliminating redundant memory copies, object creation, string interning and garbage collection overhead. In conjunction with the FFI library, they allow zero-copy operations.
 ---
---- The string buffer libary also includes a high-performance serializer for Lua objects.
+--- The string buffer library also includes a high-performance serializer for Lua objects.
 ---
 ---
 --- ## Streaming Serialization

crates/emmylua_code_analysis/src/db_index/type/type_assert.rs

@@ -220,34 +220,34 @@ fn narrow_down_type(source: LuaType, target: LuaType) -> LuaType {
     }
 }
 
-fn add_type(source: LuaType, addded_typ: LuaType) -> LuaType {
-    if addded_typ.is_nil() {
+fn add_type(source: LuaType, added_typ: LuaType) -> LuaType {
+    if added_typ.is_nil() {
         return LuaType::Nullable(source.into());
     }
 
     match source {
         LuaType::Union(union) => {
             let mut types = union.get_types().to_vec();
-            types.push(addded_typ);
+            types.push(added_typ);
             LuaType::Union(LuaUnionType::new(types).into())
         }
         LuaType::Nullable(inner) => {
-            let inner = add_type((*inner).clone(), addded_typ);
+            let inner = add_type((*inner).clone(), added_typ);
             LuaType::Nullable(inner.into())
         }
-        LuaType::Unknown | LuaType::Any => addded_typ,
+        LuaType::Unknown | LuaType::Any => added_typ,
         _ => {
-            if source.is_number() && addded_typ.is_number() {
+            if source.is_number() && added_typ.is_number() {
                 return LuaType::Number;
-            } else if source.is_string() && addded_typ.is_string() {
+            } else if source.is_string() && added_typ.is_string() {
                 return LuaType::String;
-            } else if source.is_boolean() && addded_typ.is_boolean() {
+            } else if source.is_boolean() && added_typ.is_boolean() {
                 return LuaType::Boolean;
-            } else if source.is_table() && addded_typ.is_table() {
+            } else if source.is_table() && added_typ.is_table() {
                 return LuaType::Table;
             } 
 
-            LuaType::Union(LuaUnionType::new(vec![source, addded_typ]).into())
+            LuaType::Union(LuaUnionType::new(vec![source, added_typ]).into())
         },
     }
 }

crates/emmylua_code_analysis/src/diagnostic/checker/access_invisible.rs

@@ -40,9 +40,9 @@ fn check_name_expr(
     }
 
     let name_token = name_expr.get_name_token()?;
-    if !semantic_model.is_property_visiable(name_token.syntax().clone(), property_owner.clone()) {
+    if !semantic_model.is_property_visible(name_token.syntax().clone(), property_owner.clone()) {
         let emmyrc = semantic_model.get_emmyrc();
-        report_reson(context, &emmyrc, name_token.get_range(), property_owner);
+        report_reason(context, &emmyrc, name_token.get_range(), property_owner);
     }
     Some(())
 }
@@ -62,15 +62,15 @@ fn check_index_expr(
     }
 
     let index_token = index_expr.get_index_name_token()?;
-    if !semantic_model.is_property_visiable(index_token.clone(), property_owner.clone()) {
+    if !semantic_model.is_property_visible(index_token.clone(), property_owner.clone()) {
         let emmyrc = semantic_model.get_emmyrc();
-        report_reson(context, &emmyrc, index_token.text_range(), property_owner);
+        report_reason(context, &emmyrc, index_token.text_range(), property_owner);
     }
 
     Some(())
 }
 
-fn report_reson(
+fn report_reason(
     context: &mut DiagnosticContext,
     emmyrc: &Emmyrc,
     range: TextRange,
@@ -83,8 +83,8 @@ fn report_reson(
 
     if let Some(version_conds) = &property.version_conds {
         let version_number = emmyrc.runtime.version.to_lua_version_number();
-        let visiable = version_conds.iter().any(|cond| cond.check(&version_number));
-        if !visiable {
+        let visible = version_conds.iter().any(|cond| cond.check(&version_number));
+        if !visible {
             let message = t!(
                 "The current Lua version %{version} is not accessible; expected %{conds}.",
                 version = version_number,
@@ -105,8 +105,8 @@ fn report_reson(
         }
     }
 
-    if let Some(visiblity) = property.visibility {
-        let message = match visiblity {
+    if let Some(visibility) = property.visibility {
+        let message = match visibility {
             VisibilityKind::Protected => {
                 t!("The property is protected and cannot be accessed outside its subclasses.")
             }