refactoring

Author: espdev

jupyter_sphinx/execute.py

@@ -187,6 +187,21 @@ def run(self):
             self.assert_has_content()
             content = self.content
 
+        emphasize_linespec = self.options.get('emphasize-lines')
+        if emphasize_linespec:
+            try:
+                nlines = len(content)
+                hl_lines = parselinenos(emphasize_linespec, nlines)
+                if any(i >= nlines for i in hl_lines):
+                    logger.warning(
+                        'Line number spec is out of range(1-{}): {}'.format(
+                            nlines, emphasize_linespec), location=location)
+                hl_lines = [i + 1 for i in hl_lines if i < nlines]
+            except ValueError as err:
+                return [self.state.document.reporter.warning(err, line=self.lineno)]
+        else:
+            hl_lines = []
+
         return [JupyterCellNode(
             '',
             docutils.nodes.literal_block(
@@ -196,10 +211,9 @@ def run(self):
             hide_output=('hide-output' in self.options),
             code_below=('code-below' in self.options),
             linenos=('linenos' in self.options),
-            emphasize_lines=self.options.get('emphasize-lines'),
+            emphasize_lines=hl_lines,
             raises=self.options.get('raises'),
             stderr=('stderr' in self.options),
-            _location=location,
         )]
 
 
@@ -420,14 +434,8 @@ def apply(self):
                     source['highlight_args'] = {'linenostart': linenostart}
                     linenostart += nlines
 
-                emphasize_linespec = node['emphasize_lines']
-                if emphasize_linespec:
-                    hl_lines = parselinenos(emphasize_linespec, nlines)
-                    if any(i >= nlines for i in hl_lines):
-                        logger.warning(
-                            'Line number spec is out of range(1-{}): {}'.format(
-                                nlines, emphasize_linespec), location=node['_location'])
-                    hl_lines = [i + 1 for i in hl_lines if i < nlines]
+                hl_lines = node['emphasize_lines']
+                if hl_lines:
                     highlight_args = source.setdefault('highlight_args', {})
                     highlight_args['hl_lines'] = hl_lines
 

tests/test_execute.py

@@ -185,15 +185,26 @@ def test_emphasize_lines(doctree):
     .. jupyter-execute::
         :emphasize-lines: 1,3-5
 
+        1 + 1
+        2 + 2
+        3 + 3
+        4 + 4
+        5 + 5
+    
+    .. jupyter-execute::
+        :emphasize-lines: 2, 4
+
         1 + 1
         2 + 2
         3 + 3
         4 + 4
         5 + 5
     '''
     tree = doctree(source)
-    cell, = tree.traverse(JupyterCellNode)
-    assert cell.attributes['emphasize_lines'] == '1,3-5'
+    cell0, cell1 = tree.traverse(JupyterCellNode)
+
+    assert cell0.attributes['emphasize_lines'] == [1, 3, 4, 5]
+    assert cell1.attributes['emphasize_lines'] == [2, 4]
 
 
 def test_execution_environment_carries_over(doctree):