use peeks in jinja

Author: Daniil159x

elixir/web.py

@@ -635,23 +635,26 @@ def generate_source_page(ctx, q, project, version, path):
 # type: type of the symbol
 # path: path of the file that contains the symbol
 # line: list of LineWithURL
-SymbolEntry = namedtuple('SymbolEntry', 'type, path, lines')
+# peeks: map of code line previews for this path
+SymbolEntry = namedtuple('SymbolEntry', 'type, path, lines, peeks')
 
 # Converts SymbolInstance into SymbolEntry
 # path of SymbolInstance will be appended to base_url
-def symbol_instance_to_entry(base_url, symbol):
+def symbol_instance_to_entry(base_url, symbol, peeks):
     # TODO this should be a responsibility of Query
     if type(symbol.line) is str:
         line_numbers = symbol.line.split(',')
     else:
         line_numbers = [symbol.line]
 
     lines = [
-        LineWithURL(l, f'{ base_url }/{ symbol.path }#L{ l }')
+        LineWithURL(int(l), f'{ base_url }/{ symbol.path }#L{ l }')
         for l in line_numbers
     ]
 
-    return SymbolEntry(symbol.type, symbol.path, lines)
+    current_peeks = peeks.get(symbol.path, {})
+
+    return SymbolEntry(symbol.type, symbol.path, lines, current_peeks)
 
 # Generates response (status code and optionally HTML) of the `ident` route
 # ctx: RequestContext
@@ -662,15 +665,16 @@ def generate_ident_page(ctx, q, project, version, family, ident):
 
     source_base_url = get_source_base_url(project, version)
 
-    symbol_definitions, symbol_references, symbol_doccomments = q.query('ident', version, ident, family)
+    symbol_definitions, symbol_references, symbol_doccomments, peeks = q.query('ident', version, ident, family)
 
     symbol_sections = []
+    empty_peeks = {}
 
     if len(symbol_definitions) or len(symbol_references):
         if len(symbol_doccomments):
             symbol_sections.append({
                 'title': 'Documented',
-                'symbols': {'_unknown': [symbol_instance_to_entry(source_base_url, sym) for sym in symbol_doccomments]},
+                'symbols': {'_unknown': [symbol_instance_to_entry(source_base_url, sym, empty_peeks) for sym in symbol_doccomments]},
             })
 
         if len(symbol_definitions):
@@ -679,9 +683,9 @@ def generate_ident_page(ctx, q, project, version, family, ident):
             # TODO this should be a responsibility of Query
             for sym in symbol_definitions:
                 if sym.type not in defs_by_type:
-                    defs_by_type[sym.type] = [symbol_instance_to_entry(source_base_url, sym)]
+                    defs_by_type[sym.type] = [symbol_instance_to_entry(source_base_url, sym, peeks)]
                 else:
-                    defs_by_type[sym.type].append(symbol_instance_to_entry(source_base_url, sym))
+                    defs_by_type[sym.type].append(symbol_instance_to_entry(source_base_url, sym, peeks))
 
             symbol_sections.append({
                 'title': 'Defined',
@@ -695,7 +699,7 @@ def generate_ident_page(ctx, q, project, version, family, ident):
         if len(symbol_references):
             symbol_sections.append({
                 'title': 'Referenced',
-                'symbols': {'_unknown': [symbol_instance_to_entry(source_base_url, sym) for sym in symbol_references]},
+                'symbols': {'_unknown': [symbol_instance_to_entry(source_base_url, sym, peeks) for sym in symbol_references]},
             })
         else:
             symbol_sections.append({

templates/ident.html

@@ -33,7 +33,7 @@ <h2>{{ section['title'] }} in {{ symbols|length }} files
                     <li>
                     <a href="{{ symbol.lines[0].url }}">
                         <strong>{{ symbol.path }}</strong>
-                        {%- if symbol.lines|length == 1 %},
+                        {%- if symbol.lines|length == 1 and symbol.peeks|length == 0 %},
                             line {{ symbol.lines[0].lineno }}
                         {%- elif symbols|length > 100 %},
                             <em>{{ symbol.lines|length }} times</em>
@@ -42,10 +42,14 @@ <h2>{{ section['title'] }} in {{ symbols|length }} files
                             <em>(as a {{ symbol.type }})</em>
                         {% endif %}
                     </a>
-                    {% if symbol.lines|length > 1 and symbols|length <= 100 %}
+                    {% if (symbol.lines|length > 1 or symbol.peeks|length > 0) and symbols|length <= 100 %}
                         <ul>
                         {% for line, url in symbol.lines %}
-                            <li><a href="{{ url }}">line {{ line }}</a>
+                            <li><a href="{{ url }}"><span>line {{ line }}</span>
+                                {% if line in symbol.peeks %}
+                                    <pre>{{ symbol.peeks[line] }}</pre>
+                                {% endif %}
+                            </a></li>
                         {% endfor %}
                         </ul>
                     {% endif %}