Fix parsing of EmmyLua output

Author: taminomara

docs/source/autodoc.rst

@@ -228,7 +228,7 @@ Autodoc directives
    .. rst:directive:option:: class-doc-from: class | ctor | both | separate
 
       Specifies how to generate documentation for classes
-      if :py:data:`class_default_function_name` is configured.
+      if :py:data:`lua_ls_class_default_function_name` is configured.
 
       Options are:
 
@@ -245,7 +245,7 @@ Autodoc directives
    .. rst:directive:option:: class-signature: bases | ctor | both | minimal
 
       Specifies how to generate signatures for classes
-      if :py:data:`class_default_function_name` is configured.
+      if :py:data:`lua_ls_class_default_function_name` is configured.
 
       Options are:
 

docs/source/settings.rst

@@ -89,7 +89,7 @@ Settings
       .. lua:autoobject:: foo
          :no-undoc-members:
 
-.. py:data:: class_default_function_name
+.. py:data:: lua_ls_class_default_function_name
    :type: str
 
    Allows specifying which class method represents a class constructor.
@@ -98,22 +98,16 @@ Settings
    :rst:dir:`lua:autoobject:class-doc-from`
    and :rst:dir:`lua:autoobject:class-signature` options.
 
-   If using EmmyLua as lua analyzer, this option will be inferred from ``.emmyrc.json``.
-
-.. py:data:: class_default_force_non_colon
+.. py:data:: lua_ls_class_default_force_non_colon
    :type:
 
    If ``True``, Sphinx-LuaLs will remove ``self`` from class constructor's signature.
 
-   If using EmmyLua as lua analyzer, this option will be inferred from ``.emmyrc.json``.
-
-.. py:data:: class_default_force_return_self
+.. py:data:: lua_ls_class_default_force_return_self
    :type:
 
    If ``True``, Sphinx-LuaLs will replace class constructor's return type with ``self``.
 
-   If using EmmyLua as lua analyzer, this option will be inferred from ``.emmyrc.json``.
-
 .. py:data:: lua_ls_lua_version
    :type: str
 

sphinx_lua_ls/objtree.py

@@ -962,8 +962,8 @@ class EmmyLuaParser(Parser):
     def parse(self, json, path: str | pathlib.Path):
         self.path = pathlib.Path(path).expanduser().resolve()
 
-        class_default_config = json["config"]["runtime"]["classDefaultCall"]
-        if class_default_config["functionName"]:
+        class_default_config = json["config"]["runtime"].get("classDefaultCall")
+        if class_default_config and class_default_config.get("functionName"):
             self.class_default_function_name = class_default_config["functionName"]
             self.class_default_force_non_colon = class_default_config["forceNonColon"]
             self.class_default_force_return_self = class_default_config[

test/roots/test-autodoc-emmylua/conf.py

@@ -5,3 +5,6 @@
 extensions = ["sphinx_lua_ls"]
 lua_ls_backend = "emmylua"
 lua_ls_project_root = "lua"
+lua_ls_class_default_function_name = "__init"
+lua_ls_class_default_force_non_colon = True
+lua_ls_class_default_force_return_self = True

test/roots/test-autodoc-emmylua/lua/.emmyrc.json

@@ -34,12 +34,7 @@
     "requireLikeFunction": [],
     "frameworkVersions": [],
     "extensions": [],
-    "requirePattern": [],
-    "classDefaultCall": {
-      "functionName": "__init",
-      "forceNonColon": true,
-      "forceReturnSelf": true
-    }
+    "requirePattern": []
   },
   "workspace": {
     "ignoreDir": [],