Merge pull request #90 from jabraham17/fix-links

Fix links for nested types

Reviewed by @lydia-duncan

doc-test/index.rst

@@ -21,6 +21,7 @@ Module 'Foo'
    Containers
    foo
    cpp_test
+   nested
 
 **Does it work???**
 

doc-test/nested.rst

@@ -0,0 +1,22 @@
+.. default-domain:: chpl
+
+Module: MyMod
+==============
+
+.. module:: MyMod
+
+.. record:: TopLevel
+
+   .. method:: proc foo
+
+   .. record:: Inner
+
+      .. method:: proc bar
+
+   .. method:: proc baz
+
+.. record:: TopLevel2
+
+   .. record:: Inner
+
+      .. method:: proc bar

sphinxcontrib/chapeldomain/__init__.py

@@ -422,18 +422,6 @@ def add_target_and_index(self, name_cls, sig, signode):
             self.indexnode['entries'].append(('single', indextext,
                                               fullname, '', None))
 
-    def before_content(self):
-        """Called before parsing content. Set flag to help with class scoping.
-        """
-        self.clsname_set = False
-
-    def after_content(self):
-        """Called after parsing content. If any classes were added to the env
-        temp_data, make sure they are removed.
-        """
-        if self.clsname_set:
-            self.env.temp_data.pop('chpl:class', None)
-
 
 class ChapelModule(Directive):
     """Directive to make description of a new module."""
@@ -596,7 +584,20 @@ def before_content(self):
         ChapelObject.before_content(self)
         if self.names:
             self.env.temp_data['chpl:class'] = self.names[0][0]
-            self.clsname_set = True
+            if not hasattr(self, 'clsname_set'):
+                self.clsname_set = 0
+            self.clsname_set += 1
+
+    def after_content(self):
+        """Called after parsing content. Pop the class name from the longer
+        class name
+        """
+        if self.clsname_set > 0:
+            val = self.env.temp_data.pop('chpl:class', None)
+            if val:
+                elms = val.split('.')[:-1]
+                self.env.temp_data['chpl:class'] = '.'.join(elms)
+            self.clsname_set -= 1
 
 
 class ChapelModuleLevel(ChapelObject):