Merge pull request #1113 from xuhuanzy/update

update

Author: CppCXY

.github/workflows/test.yml

@@ -58,7 +58,7 @@ jobs:
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
       - name: Run Tests
-        run: cargo test --workspace --features emmylua_ls/full-test
+        run: cargo test --workspace --all-features
 
   check-schema:
     name: Check schema generation

CHANGELOG.md

@@ -3,10 +3,34 @@
 *All notable changes to the EmmyLua Analyzer Rust project will be documented in this file.*
 
 ## [0.24.0] - Unreleased
+
+### ✨ Added
+
 - **Support LuaJIT-Ext**: Added support for LuaJIT‑Ext syntax, including compound assignment operators, null‑safe navigation, the null‑coalescing operator, constant variables, and the continue statement.
 
 - **Support LuaJIT3**: Besides LuaJIT‑Ext syntax, named variadic arguments and integer division are also supported.
 
+- **Support const generic parameters**: Added the `const T` syntax for generics, for example `---@generic const T`.
+
+- **emmylua_check severity filter**: Added the `--severity` option to filter diagnostic output by minimum severity.
+
+### ⚠️ Deprecated
+
+- **std.ConstTpl**: Marked `std.ConstTpl` as deprecated. Use the new `const T` generic syntax instead.
+
+### 🔧 Changed
+
+- **Rename table field optimization**: `lsp_optimization("skip_table_fields_check")` is now the documented name for skipping table field diagnostics. The old `check_table_field` name remains supported as a compatibility alias.
+- **Refactor hover signature**: Refactored signature rendering in hover.
+
+### 🗑️ Removed
+
+- **`---@attribute` tag**: Removed the `---@attribute` tag. Attribute definitions now use C#-like class definitions:
+```lua
+---@class NewAttribute: Attribute
+---@overload fun(args)
+```
+
 ## [0.23.2] - 2026-6-3
 
 - **Fix some stuck loading issue**: Fixed some issue that cause the language server stuck at loading workspace, and improve the loading performance of large workspace

crates/emmylua_check/README.md

@@ -73,6 +73,13 @@ Output diagnostics in JSON format to a file for further processing:
 emmylua_check . -f json --output ./diag.json
 ```
 
+#### Filter by Severity
+
+Only output warnings and errors:
+```shell
+emmylua_check . --severity warn
+```
+
 ---
 
 ## ⚙️ Configuration
@@ -130,9 +137,10 @@ Arguments:
 Options:
   -c, --config <CONFIG>                Path to configuration file. If not provided, ".emmyrc.json" and ".luarc.json" will be searched in the workspace directory
   -i, --ignore <IGNORE>                Comma-separated list of ignore patterns. Patterns must follow glob syntax
-  -f, --output-format <OUTPUT_FORMAT>  Specify output format [default: text] [possible values: json, text]
+  -f, --output-format <OUTPUT_FORMAT>  Specify output format [default: text] [possible values: json, text, sarif]
       --output <OUTPUT>                Specify output target (stdout or file path, only used when output_format is json) [default: stdout]
       --warnings-as-errors             Treat warnings as errors
+      --severity <SEVERITY>            Only output diagnostics at this severity or above [possible values: error, warn, info, hint]
       --verbose                        Verbose output
   -h, --help                           Print help information
   -V, --version                        Print version information

crates/emmylua_check/src/cmd_args.rs

@@ -1,6 +1,7 @@
 #[cfg(feature = "cli")]
 use clap::{Parser, ValueEnum};
 
+use lsp_types::DiagnosticSeverity;
 use std::path::PathBuf;
 
 #[allow(unused)]
@@ -44,6 +45,10 @@ pub struct CmdArgs {
     #[cfg_attr(feature = "cli", arg(long))]
     pub warnings_as_errors: bool,
 
+    /// Only output diagnostics at this severity or above
+    #[cfg_attr(feature = "cli", arg(long, value_enum, ignore_case = true))]
+    pub severity: Option<DiagnosticSeverityFilter>,
+
     /// Verbose output
     #[cfg_attr(feature = "cli", arg(long))]
     pub verbose: bool,
@@ -57,6 +62,35 @@ pub enum OutputFormat {
     Sarif,
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[cfg_attr(feature = "cli", derive(ValueEnum))]
+pub enum DiagnosticSeverityFilter {
+    Error,
+    Warn,
+    Info,
+    Hint,
+}
+
+impl DiagnosticSeverityFilter {
+    pub fn allows(self, severity: Option<DiagnosticSeverity>) -> bool {
+        match severity {
+            Some(severity) => severity <= self.into(),
+            None => false,
+        }
+    }
+}
+
+impl From<DiagnosticSeverityFilter> for DiagnosticSeverity {
+    fn from(value: DiagnosticSeverityFilter) -> Self {
+        match value {
+            DiagnosticSeverityFilter::Error => DiagnosticSeverity::ERROR,
+            DiagnosticSeverityFilter::Warn => DiagnosticSeverity::WARNING,
+            DiagnosticSeverityFilter::Info => DiagnosticSeverity::INFORMATION,
+            DiagnosticSeverityFilter::Hint => DiagnosticSeverity::HINT,
+        }
+    }
+}
+
 #[allow(unused)]
 #[derive(Debug, Clone)]
 pub enum OutputDestination {

crates/emmylua_check/src/lib.rs

@@ -74,6 +74,7 @@ pub async fn run_check(cmd_args: CmdArgs) -> Result<(), Box<dyn Error + Sync + S
         cmd_args.output_format,
         cmd_args.output,
         cmd_args.warnings_as_errors,
+        cmd_args.severity,
     )
     .await;
 

crates/emmylua_check/src/output/mod.rs

@@ -8,7 +8,7 @@ use emmylua_code_analysis::{DbIndex, FileId};
 use lsp_types::Diagnostic;
 use tokio::sync::mpsc::Receiver;
 
-use crate::cmd_args::{OutputDestination, OutputFormat};
+use crate::cmd_args::{DiagnosticSeverityFilter, OutputDestination, OutputFormat};
 
 use crate::terminal_display::TerminalDisplay;
 
@@ -23,6 +23,7 @@ pub async fn output_result(
     output_format: OutputFormat,
     output: OutputDestination,
     warnings_as_errors: bool,
+    severity_filter: Option<DiagnosticSeverityFilter>,
 ) -> i32 {
     let mut writer: Box<dyn OutputWriter> = match output_format {
         OutputFormat::Json => Box::new(json_output_writer::JsonOutputWriter::new(output)),
@@ -42,7 +43,11 @@ pub async fn output_result(
 
     while let Some((file_id, diagnostics)) = receiver.recv().await {
         count += 1;
-        if let Some(diagnostics) = diagnostics {
+        if let Some(mut diagnostics) = diagnostics {
+            if let Some(severity_filter) = severity_filter {
+                diagnostics.retain(|diagnostic| severity_filter.allows(diagnostic.severity));
+            }
+
             for diagnostic in &diagnostics {
                 match diagnostic.severity {
                     Some(lsp_types::DiagnosticSeverity::ERROR) => {

crates/emmylua_code_analysis/Cargo.toml

@@ -57,6 +57,7 @@ hashbrown.workspace = true
 [features]
 default = []
 reqwest = ["dep:reqwest"]
+slow-tests = []
 
 [package.metadata.i18n]
 available-locales = ["en", "zh_CN", "zh_HK"]

crates/emmylua_code_analysis/resources/std/builtin.lua

@@ -128,9 +128,8 @@
 --- built-in type for Rawget
 --- @alias std.RawGet<T, K> unknown
 
+--- built-in type for generic template, for match integer const and `true`/`false`
 --- @deprecated use `const T` as a replacement, for example `---@generic const T`.
----
---- built-in type for generic template, for match integer const and true/false
 --- @alias std.ConstTpl<T> unknown
 
 --- compact luals
@@ -171,24 +170,29 @@
 
 --- attribute
 
+--- @class Attribute
+
 ---
 --- Deprecated. Receives an optional message parameter.
---- @attribute deprecated(message: string?)
+--- @class deprecated: Attribute
+--- @overload fun(message?: string)
 
 ---
 --- Language Server Optimization Items.
 ---
 --- Parameters:
---- - `check_table_field`: Skip the assign check for table fields. It is recommended to use this option for all large configuration tables.
+--- - `skip_table_fields_check`: Skip table field diagnostics. It is recommended to use this option for all large configuration tables.
 --- - `delayed_definition`: Indicates that the type of the variable is determined by the first assignment.
 ---    Only valid for `local` declarations with no initial value.
---- @attribute lsp_optimization(code: "check_table_field"|"delayed_definition")
+--- @class lsp_optimization: Attribute
+--- @overload fun(code: "skip_table_fields_check"|"delayed_definition")
 
 ---
 --- Index field alias, will be displayed in `hint` and `completion`.
 ---
 --- Receives a string parameter for the alias name.
---- @attribute index_alias(name: string)
+--- @class index_alias: Attribute
+--- @overload fun(name: string)
 
 ---
 --- This attribute must be applied to function parameters, and the function parameter's type must be a string template generic,
@@ -201,7 +205,8 @@
 --- - `return_mode`: Constructor return strategy. `"self"` forces `self`, `"doc"` uses the documented return type,
 ---                 and `"default"` prefers the documented return type and falls back to `self`.
 ---                 Defaults to `"default"`
---- @attribute constructor(name: string, root_class: string?, strip_self: boolean?, return_mode: "self"|"doc"|"default"?)
+--- @class constructor: Attribute
+--- @overload fun(name: string, root_class?: string, strip_self?: boolean, return_mode?: "self"|"doc"|"default")
 
 ---
 --- Associates `getter` and `setter` methods with a field. Currently provides only definition navigation functionality,
@@ -211,4 +216,5 @@
 --- - `convention`: Naming convention, defaults to `camelCase`. Implicitly adds `get` and `set` prefixes. eg: `_age` -> `getAge`, `setAge`.
 --- - `getter`: Getter method name. Takes precedence over `convention`.
 --- - `setter`: Setter method name. Takes precedence over `convention`.
---- @attribute field_accessor(convention: "camelCase"|"PascalCase"|"snake_case"|nil, getter: string?, setter: string?)
+--- @class field_accessor: Attribute
+--- @overload fun(convention?: "camelCase"|"PascalCase"|"snake_case", getter?: string, setter?: string)

crates/emmylua_code_analysis/src/compilation/analyzer/decl/docs.rs

@@ -1,7 +1,6 @@
 use emmylua_parser::{
-    LuaAstNode, LuaAstToken, LuaComment, LuaDocTag, LuaDocTagAlias, LuaDocTagAttribute,
-    LuaDocTagClass, LuaDocTagEnum, LuaDocTagMeta, LuaDocTagNamespace, LuaDocTagUsing,
-    LuaDocTypeFlag,
+    LuaAstNode, LuaAstToken, LuaComment, LuaDocTag, LuaDocTagAlias, LuaDocTagClass, LuaDocTagEnum,
+    LuaDocTagMeta, LuaDocTagNamespace, LuaDocTagUsing, LuaDocTypeFlag,
 };
 use flagset::FlagSet;
 use rowan::TextRange;
@@ -62,8 +61,8 @@ fn get_type_flag_value(
                 "internal" => {
                     attr |= LuaTypeFlag::Internal;
                 }
-                "private" => {
-                    attr |= LuaTypeFlag::Private;
+                "private" | "file" => {
+                    attr |= LuaTypeFlag::File;
                 }
                 _ => {}
             }
@@ -100,24 +99,6 @@ pub fn analyze_doc_tag_alias(analyzer: &mut DeclAnalyzer, alias: LuaDocTagAlias)
     Some(())
 }
 
-pub fn analyze_doc_tag_attribute(
-    analyzer: &mut DeclAnalyzer,
-    attribute: LuaDocTagAttribute,
-) -> Option<()> {
-    let name_token = attribute.get_name_token()?;
-    let name = name_token.get_name_text().to_string();
-    let range = name_token.syntax().text_range();
-
-    add_type_decl(
-        analyzer,
-        &name,
-        range,
-        LuaDeclTypeKind::Attribute,
-        FlagSet::default(),
-    );
-    Some(())
-}
-
 pub fn analyze_doc_tag_namespace(
     analyzer: &mut DeclAnalyzer,
     namespace: LuaDocTagNamespace,
@@ -218,8 +199,8 @@ fn add_type_decl(
     let full_name = option_namespace
         .map(|ns| format!("{}.{}", ns, basic_name))
         .unwrap_or(basic_name.to_string());
-    let id = if flag.contains(LuaTypeFlag::Private) {
-        LuaTypeDeclId::local(file_id, &full_name)
+    let id = if flag.contains(LuaTypeFlag::File) {
+        LuaTypeDeclId::file(file_id, &full_name)
     } else if flag.contains(LuaTypeFlag::Internal) {
         LuaTypeDeclId::internal(workspace_id, &full_name)
     } else {

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

@@ -107,9 +107,6 @@ fn walk_node_enter(analyzer: &mut DeclAnalyzer, node: LuaAst) {
         LuaAst::LuaDocTagAlias(doc_tag) => {
             docs::analyze_doc_tag_alias(analyzer, doc_tag);
         }
-        LuaAst::LuaDocTagAttribute(doc_tag) => {
-            docs::analyze_doc_tag_attribute(analyzer, doc_tag);
-        }
         LuaAst::LuaDocTagNamespace(doc_tag) => {
             docs::analyze_doc_tag_namespace(analyzer, doc_tag);
         }