Update TDKMethLexer

Added a class method for creating package-specific Lexer

Author: TDKorn

sphinx_github_style/__init__.py

@@ -9,7 +9,7 @@
 from sphinx.application import Sphinx
 
 
-__version__ = "0.0.1b4"
+__version__ = "0.0.1b5"
 __author__ = 'Adam Korn <hello@dailykitten.net>'
 
 
@@ -30,13 +30,14 @@ def setup(app: Sphinx) -> Dict[str, Any]:
     app.connect('doctree-resolved', add_linkcode_node_class)
     # app.connect('build-finished', save_generated_rst_files)
 
+    app.add_config_value('pkg_name', pkg_name, 'html')
     app.add_config_value('linkcode_link_text', '[source]', 'html')
     app.add_config_value('linkcode_default_blob', 'master', 'html')
     app.config.pygments_style = 'sphinx_github_style.TDKStyle'
     app.config.html_context['github_version'] = get_linkcode_revision(app)
 
     app.add_css_file('github_linkcode.css')
-    app.add_lexer('python', TDKMethLexer)
+    app.add_lexer('python', TDKMethLexer.get_pkg_lexer(pkg_name))
 
     linkcode_url = get_linkcode_url(app)
 

sphinx_github_style/meth_lexer.py

@@ -1,19 +1,21 @@
 from pygments.lexers.python import NumPyLexer
-from inspect import getmembers, getmodule, isfunction, ismethod, ismodule, isclass
+from inspect import getmembers, isfunction, ismethod, ismodule, isclass
 from sphinx.application import Sphinx
+from typing import Type
 import types
-import sphinx_github_style
+
 
 def get_pkg_funcs(pkg: types.ModuleType):
-    funcs_meths = get_funcs(pkg)  # Get funcs/meths defined in pkg.__init__
-    modules = getmembers(pkg, ismodule)  # Modules of package
+    # Get funcs/meths defined in pkg.__init__
+    funcs_meths = get_funcs(pkg)
+    modules = getmembers(pkg, ismodule)
+    # Get funcs/meths of each module in pkg
     for name, module in modules:
-        funcs_meths += get_funcs(module)  # Get standalone funcs defined in module
-        classes = getmembers(module, isclass)  # Get classes in module
+        funcs_meths += get_funcs(module)
+        classes = getmembers(module, isclass)
         for class_name, _class in classes:
-            if getmodule(_class).__name__.startswith(
-                    pkg.__name__):  # If class is defined in the module, get its funcs/meths
-                funcs_meths += get_funcs(_class)
+            funcs_meths += get_funcs(_class)
+    # Set of all funcs/meths contained in modules used by package
     return set(funcs_meths)
 
 
@@ -22,20 +24,24 @@ def get_funcs(of):
     return list(dict(members))
 
 
-funcs = get_pkg_funcs(sphinx_github_style)
-
-
 class TDKMethLexer(NumPyLexer):
-
-    """Adds syntax highlighting for a python Package's methods
+    """Adds syntax highlighting for methods and functions within a python Package
 
     """
     name = 'TDK'
     url = 'https://github.com/TDKorn'
     aliases = ['tdk']
 
-    EXTRA_KEYWORDS = NumPyLexer.EXTRA_KEYWORDS.union(funcs)
+    EXTRA_KEYWORDS = NumPyLexer.EXTRA_KEYWORDS
+
+    @classmethod
+    def get_pkg_lexer(cls, pkg_name: str) -> Type["TDKMethLexer"]:
+        pkg = __import__(pkg_name)
+        funcs = get_pkg_funcs(pkg)
+        cls.EXTRA_KEYWORDS.update(funcs)
+        return cls
 
 
 def setup(app: Sphinx):
-    app.add_lexer('python', TDKMethLexer)
+    pkg_name = app.config._raw_config['pkg_name']
+    app.add_lexer('python', TDKMethLexer.get_pkg_lexer(pkg_name))