update

.github/workflows/test.yml

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

.pre-commit-config.yaml

@@ -9,6 +9,13 @@ repos:
         types: [rust]
         args: ["--all"]
         pass_filenames: false
+      - id: generate-schema-json
+        name: generate schema.json
+        description: regenerate schema.json from schema_json_gen
+        entry: cargo run --package schema_json_gen --bin schema_json_gen
+        language: system
+        files: ^tools/schema_json_gen/src/main\.rs$
+        pass_filenames: false
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v6.0.0
     hooks:

crates/emmylua_code_analysis/locales/lint.yml

@@ -245,6 +245,10 @@ Cannot use `...` outside a vararg function.:
   en: "type `%{found}` does not satisfy the constraint `%{source}`. %{reason}"
   zh_CN: "泛型约束要求为 `%{source}` 的子类, 但找到了 `%{found}`. %{reason}"
   zh_HK: "泛型约束要求为 `%{source}` 的子类, 但找到了 `%{found}`. %{reason}"
+"Generic type '%{name}' requires %{count} type argument(s)":
+  en: "Generic type '%{name}' requires %{count} type argument(s)"
+  zh_CN: "泛型类型“%{name}”需要 %{count} 个类型参数"
+  zh_HK: "泛型類型「%{name}」需要 %{count} 個類型參數"
 "the string template type does not match any type declaration":
   en: "the string template type does not match any type declaration"
   zh_CN: "字符串模板类型与任何类型声明不匹配"
@@ -278,3 +282,8 @@ Cannot use `...` outside a vararg function.:
   en: "Type '%{name}' has inconsistent access modifiers: %{modifiers}."
   zh_CN: "类型 '%{name}' 具有不一致的访问修饰符: %{modifiers}."
   zh_HK: "類型 '%{name}' 具有不一致的訪問修飾符: %{modifiers}."
+
+"Missing comment for function `%{name}`.":
+  en: "Missing comment for function `%{name}`."
+  zh_CN: "函数 `%{name}` 缺少注解。"
+  zh_HK: "函式 `%{name}` 缺少註解。"

crates/emmylua_code_analysis/resources/schema.json

@@ -446,6 +446,11 @@
           "description": "inconsistent-type-access-modifier",
           "type": "string",
           "const": "inconsistent-type-access-modifier"
+        },
+        {
+          "description": "missing-type-argument",
+          "type": "string",
+          "const": "missing-type-argument"
         }
       ]
     },

crates/emmylua_code_analysis/resources/std/builtin.lua

@@ -188,8 +188,10 @@
 --- - `name`: The name of the method as a constructor.
 --- - `root_class`: Used to mark the root class, will implicitly inherit this class, such as `System.Object` in c#. Defaults to empty.
 --- - `strip_self`: Whether the `self` parameter can be omitted when calling the constructor, defaults to `true`
---- - `return_self`: Whether the constructor is forced to return `self`, defaults to `true`
---- @attribute constructor(name: string, root_class: string?, strip_self: boolean?, return_self: boolean?)
+--- - `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"?)
 
 ---
 --- Associates `getter` and `setter` methods with a field. Currently provides only definition navigation functionality,

crates/emmylua_code_analysis/resources/std/string.lua

@@ -147,11 +147,37 @@ function string.format(fmt, ...) end
 --- @return fun(): string?...
 function string.gmatch(s, pattern) end
 
+---
+--- Returns an iterator function that, each time it is called, returns the
+--- next captures from `pattern` over the string `s`. If `pattern` specifies no
+--- captures, then the whole match is produced in each call. A third,
+--- optional numeric argument init specifies where to start the search;
+--- its default value is 1 and can be negative.
+---
+--- As an example, the following loop will iterate over all the words from
+--- string `s`, printing one per line:
+---
+--- `s = "hello world from Lua"`
+--- `for w in string.gmatch(s, "%a+") do`
+---  > `print(w)`
+--- `end`
+---
+--- The next example collects all pairs `key=value` from the given string into a
+--- table:
+---
+--- `t = {}`
+---  s = "from=world, to=Lua"`
+--- `for k, v in string.gmatch(s, "(%w+)=(%w+)") do`
+---  > `t[k] = v`
+--- `end`
+---
+--- For this function, a caret '`^`' at the start of a pattern does not work as
+--- an anchor, as this would prevent the iteration.
 --- @version > 5.4
---- @param s       string
+--- @param s string
 --- @param pattern string
---- @param init?   integer
---- @return fun(): string?...
+--- @param init? integer
+--- @return fun():string?...
 function string.gmatch(s, pattern, init) end
 
 ---

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

@@ -19,7 +19,15 @@ pub fn analyze_doc_tag_class(analyzer: &mut DeclAnalyzer, class: LuaDocTagClass)
     let range = name_token.syntax().text_range();
     let type_flag = get_type_flag_value(analyzer, class.get_type_flag());
 
-    add_type_decl(analyzer, &name, range, LuaDeclTypeKind::Class, type_flag);
+    let decl_id = add_type_decl(analyzer, &name, range, LuaDeclTypeKind::Class, type_flag);
+    if let Some(generic_decl) = class.get_generic_decl() {
+        analyzer.context.add_pending_type_generic_header(
+            analyzer.get_file_id(),
+            decl_id,
+            generic_decl,
+        );
+    }
+
     Some(())
 }
 
@@ -80,7 +88,15 @@ pub fn analyze_doc_tag_alias(analyzer: &mut DeclAnalyzer, alias: LuaDocTagAlias)
     let name = name_token.get_name_text().to_string();
     let range = name_token.syntax().text_range();
     let type_flag = get_type_flag_value(analyzer, alias.get_type_flag());
-    add_type_decl(analyzer, &name, range, LuaDeclTypeKind::Alias, type_flag);
+    let decl_id = add_type_decl(analyzer, &name, range, LuaDeclTypeKind::Alias, type_flag);
+    if let Some(generic_decl) = alias.get_generic_decl_list() {
+        analyzer.context.add_pending_type_generic_header(
+            analyzer.get_file_id(),
+            decl_id,
+            generic_decl,
+        );
+    }
+
     Some(())
 }
 
@@ -187,7 +203,7 @@ fn add_type_decl(
     range: TextRange,
     kind: LuaDeclTypeKind,
     flag: FlagSet<LuaTypeFlag>,
-) {
+) -> LuaTypeDeclId {
     let file_id = analyzer.get_file_id();
     let workspace_id = analyzer
         .db
@@ -212,6 +228,15 @@ fn add_type_decl(
     let simple_name = id.get_simple_name();
     type_index.add_type_decl(
         file_id,
-        LuaTypeDecl::new(file_id, range, simple_name.to_string(), kind, flag, id),
+        LuaTypeDecl::new(
+            file_id,
+            range,
+            simple_name.to_string(),
+            kind,
+            flag,
+            id.clone(),
+        ),
     );
+
+    id
 }

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

@@ -43,11 +43,11 @@ pub fn analyze_tag_attribute_use(
 
     let attribute_uses = infer_attribute_uses(analyzer, tag_use)?;
     for attribute_use in attribute_uses {
-        analyzer.db.get_property_index_mut().add_attribute_use(
-            analyzer.file_id,
-            owner_id.clone(),
-            attribute_use,
-        );
+        analyzer
+            .type_context
+            .db
+            .get_property_index_mut()
+            .add_attribute_use(analyzer.file_id, owner_id.clone(), attribute_use);
     }
     Some(())
 }
@@ -59,13 +59,17 @@ pub fn infer_attribute_uses(
     let attribute_uses = tag_use.get_attribute_uses();
     let mut result = Vec::new();
     for attribute_use in attribute_uses {
-        let attribute_type = infer_type(analyzer, LuaDocType::Name(attribute_use.get_type()?));
+        let attribute_type = infer_type(
+            &mut analyzer.type_context,
+            LuaDocType::Name(attribute_use.get_type()?),
+        );
         if let LuaType::Ref(type_id) = attribute_type {
             let arg_types: Vec<LuaType> = attribute_use
                 .get_arg_list()
                 .map(|arg_list| arg_list.get_args().map(infer_attribute_arg_type).collect())
                 .unwrap_or_default();
             let param_names = analyzer
+                .type_context
                 .db
                 .get_type_index()
                 .get_type_decl(&type_id)

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

@@ -35,8 +35,9 @@ fn analyze_diagnostic_disable(
     let owner_block = comment.ancestors::<LuaBlock>().next()?;
     let owner_block_range = owner_block.get_range();
     let is_file_disable = owner_block.get_parent::<LuaChunk>().is_some();
+    let file_id = analyzer.file_id;
 
-    let diagnostic_index = analyzer.db.get_diagnostic_index_mut();
+    let diagnostic_index = analyzer.get_db().get_diagnostic_index_mut();
     if let Some(diagnostic_code_list) = diagnostic.get_code_list() {
         for code in diagnostic_code_list.get_codes() {
             let name = code.get_name_text();
@@ -47,10 +48,10 @@ fn analyze_diagnostic_disable(
             };
 
             if is_file_disable {
-                diagnostic_index.add_file_diagnostic_disabled(analyzer.file_id, diagnostic_code);
+                diagnostic_index.add_file_diagnostic_disabled(file_id, diagnostic_code);
             } else {
                 diagnostic_index.add_diagnostic_action(
-                    analyzer.file_id,
+                    file_id,
                     DiagnosticAction::new(
                         owner_block_range,
                         DiagnosticActionKind::Disable(diagnostic_code),
@@ -60,7 +61,7 @@ fn analyze_diagnostic_disable(
         }
     } else {
         diagnostic_index.add_diagnostic_action(
-            analyzer.file_id,
+            file_id,
             DiagnosticAction::new(owner_block_range, DiagnosticActionKind::DisableAll),
         );
     }
@@ -74,12 +75,13 @@ fn analyze_diagnostic_disable_next_line(
 ) -> Option<()> {
     let comment = analyzer.comment.clone();
     let comment_range = comment.get_range();
-    let document = analyzer.db.get_vfs().get_document(&analyzer.file_id)?;
+    let file_id = analyzer.file_id;
+    let document = analyzer.get_db().get_vfs().get_document(&file_id)?;
     let comment_end_line = document.get_line(comment_range.end())?;
     let line_range = document.get_line_range(comment_end_line + 1)?;
     let valid_range = TextRange::new(comment_range.start(), line_range.end());
 
-    let diagnostic_index = analyzer.db.get_diagnostic_index_mut();
+    let diagnostic_index = analyzer.get_db().get_diagnostic_index_mut();
     if let Some(diagnostic_code_list) = diagnostic.get_code_list() {
         for code in diagnostic_code_list.get_codes() {
             let name = code.get_name_text();
@@ -90,13 +92,13 @@ fn analyze_diagnostic_disable_next_line(
             };
 
             diagnostic_index.add_diagnostic_action(
-                analyzer.file_id,
+                file_id,
                 DiagnosticAction::new(valid_range, DiagnosticActionKind::Disable(diagnostic_code)),
             );
         }
     } else {
         diagnostic_index.add_diagnostic_action(
-            analyzer.file_id,
+            file_id,
             DiagnosticAction::new(valid_range, DiagnosticActionKind::DisableAll),
         );
     }
@@ -110,11 +112,12 @@ fn analyze_diagnostic_disable_line(
 ) -> Option<()> {
     let comment = analyzer.comment.clone();
     let comment_range = comment.get_range();
-    let document = analyzer.db.get_vfs().get_document(&analyzer.file_id)?;
+    let file_id = analyzer.file_id;
+    let document = analyzer.get_db().get_vfs().get_document(&file_id)?;
     let comment_end_line = document.get_line(comment_range.end())?;
     let valid_range = document.get_line_range(comment_end_line)?;
 
-    let diagnostic_index = analyzer.db.get_diagnostic_index_mut();
+    let diagnostic_index = analyzer.get_db().get_diagnostic_index_mut();
     if let Some(diagnostic_code_list) = diagnostic.get_code_list() {
         for code in diagnostic_code_list.get_codes() {
             let name = code.get_name_text();
@@ -125,13 +128,13 @@ fn analyze_diagnostic_disable_line(
             };
 
             diagnostic_index.add_diagnostic_action(
-                analyzer.file_id,
+                file_id,
                 DiagnosticAction::new(valid_range, DiagnosticActionKind::Disable(diagnostic_code)),
             );
         }
     } else {
         diagnostic_index.add_diagnostic_action(
-            analyzer.file_id,
+            file_id,
             DiagnosticAction::new(valid_range, DiagnosticActionKind::DisableAll),
         );
     }
@@ -143,7 +146,8 @@ fn analyze_diagnostic_enable(
     analyzer: &mut DocAnalyzer,
     diagnostic: LuaDocTagDiagnostic,
 ) -> Option<()> {
-    let diagnostic_index = analyzer.db.get_diagnostic_index_mut();
+    let file_id = analyzer.file_id;
+    let diagnostic_index = analyzer.get_db().get_diagnostic_index_mut();
     let diagnostic_code_list = diagnostic.get_code_list()?;
     for code in diagnostic_code_list.get_codes() {
         let name = code.get_name_text();
@@ -153,7 +157,7 @@ fn analyze_diagnostic_enable(
             continue;
         };
 
-        diagnostic_index.add_file_diagnostic_enabled(analyzer.file_id, diagnostic_code);
+        diagnostic_index.add_file_diagnostic_enabled(file_id, diagnostic_code);
     }
 
     Some(())