compact luals config and overload syntax

Author: CppCXY

.github/workflows/build.yml

@@ -60,7 +60,7 @@ jobs:
         if: ${{ matrix.cross == 'general-macos-intel' }}
         run: |
           rustup target add ${{ matrix.target }}
-          RUSTFLAGS="-C link-args=-mmacos-version-min=10.15" cargo build --release --target ${{ matrix.target }} -p emmylua_ls
+          cargo build --release --target ${{ matrix.target }} -p emmylua_ls
           otool -l ./target/${{ matrix.target }}/release/emmylua_ls | grep -A4 "LC_BUILD_VERSION\|LC_VERSION_MIN_MACOSX"
       - name: copy-binary
         if: ${{ matrix.os != 'windows-latest'  }}

crates/emmylua_code_analysis/src/compilation/analyzer/doc/infer_type.rs

@@ -375,6 +375,15 @@ fn infer_func_type(analyzer: &mut DocAnalyzer, func: LuaDocFuncType) -> LuaType
         }
     }
 
+    // compact luals
+    if is_colon {
+        if let Some(first_param) = params_result.first() {
+            if first_param.0 == "self" {
+                is_colon = false
+            }
+        }
+    }
+
     LuaType::DocFunction(
         LuaFunctionType::new(is_async, is_colon, params_result, return_types).into(),
     )

crates/emmylua_code_analysis/src/compilation/analyzer/flow/mod.rs

@@ -13,20 +13,15 @@ pub(crate) fn analyze(db: &mut DbIndex, context: &mut AnalyzeContext) {
     let tree_list = context.tree_list.clone();
     // build decl and ref flow chain
     for in_filed_tree in &tree_list {
-        let mut analyzer =
-            FlowAnalyzer::new(db, in_filed_tree.file_id, in_filed_tree.value.clone());
-        flow_analyze(&mut analyzer);
+        flow_analyze(db, in_filed_tree.file_id, in_filed_tree.value.clone());
     }
 }
 
-fn flow_analyze(analyzer: &mut FlowAnalyzer) -> Option<()> {
-    let references_index = analyzer.db.get_reference_index();
-    let refs_map = references_index
-        .get_decl_references_map(&analyzer.file_id)?
-        .clone();
-    let root = analyzer.root.syntax();
-    let file_id = analyzer.file_id;
+fn flow_analyze(db: &mut DbIndex, file_id: FileId, root: LuaChunk) -> Option<()> {
+    let references_index = db.get_reference_index();
+    let refs_map = references_index.get_decl_references_map(&file_id)?.clone();
 
+    let mut analyzer = FlowAnalyzer::new(db, file_id, root.clone());
     for (decl_id, decl_refs) in refs_map {
         let mut flow_chains = LuaFlowChain::new(decl_id);
 
@@ -35,16 +30,18 @@ fn flow_analyze(analyzer: &mut FlowAnalyzer) -> Option<()> {
             if !decl_ref.is_write {
                 let syntax_id =
                     LuaSyntaxId::new(LuaSyntaxKind::NameExpr.into(), decl_ref.range.clone());
-                if let Some(name_expr) = LuaNameExpr::cast(syntax_id.to_node_from_root(root)?) {
-                    infer_name_expr(analyzer, &mut flow_chains, name_expr);
+                if let Some(name_expr) =
+                    LuaNameExpr::cast(syntax_id.to_node_from_root(root.syntax())?)
+                {
+                    infer_name_expr(&mut analyzer, &mut flow_chains, name_expr);
                 }
             } else {
                 need_assign_infer = true;
             }
         }
 
         if need_assign_infer {
-            infer_from_assign_stats(analyzer, &mut flow_chains, decl_refs.iter().collect());
+            infer_from_assign_stats(&mut analyzer, &mut flow_chains, decl_refs.iter().collect());
         }
 
         analyzer

crates/emmylua_code_analysis/src/config/configs/runtime.rs

@@ -34,25 +34,25 @@ impl Default for EmmyrcRuntime {
     }
 }
 
-#[derive(Serialize, Deserialize, Debug, JsonSchema, Clone, Copy)]
+#[derive(Serialize, Deserialize, Debug, JsonSchema, Clone, Copy, PartialEq, Eq)]
 pub enum EmmyrcLuaVersion {
     /// Lua 5.1
-    #[serde(rename = "Lua5.1")]
+    #[serde(rename = "Lua5.1", alias = "Lua 5.1")]
     Lua51,
     /// LuaJIT
     #[serde(rename = "LuaJIT")]
     LuaJIT,
     /// Lua 5.2
-    #[serde(rename = "Lua5.2")]
+    #[serde(rename = "Lua5.2", alias = "Lua 5.2")]
     Lua52,
     /// Lua 5.3
-    #[serde(rename = "Lua5.3")]
+    #[serde(rename = "Lua5.3", alias = "Lua 5.3")]
     Lua53,
     /// Lua 5.4
-    #[serde(rename = "Lua5.4")]
+    #[serde(rename = "Lua5.4", alias = "Lua 5.4")]
     Lua54,
-    /// Lua 5.4
-    #[serde(rename = "LuaLatest")]
+    /// Lua Latest
+    #[serde(rename = "LuaLatest", alias = "Lua Latest")]
     LuaLatest,
 }
 
@@ -73,4 +73,25 @@ impl EmmyrcLuaVersion {
             EmmyrcLuaVersion::LuaLatest => LuaVersionNumber::new(5, 4, 0),
         }
     }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_emmyrc_runtime() {
+        let json1 = r#"{
+            "version": "Lua5.1"
+        }"#;
+        let runtime: EmmyrcRuntime = serde_json::from_str(json1).unwrap();
+        assert_eq!(runtime.version, EmmyrcLuaVersion::Lua51);
+
+        let json2 = r#"{
+            "version": "Lua 5.1"
+        }"#;
+
+        let runtime: EmmyrcRuntime = serde_json::from_str(json2).unwrap();
+        assert_eq!(runtime.version, EmmyrcLuaVersion::Lua51);
+    }
 }