fix: documenter with tables

TerosTechnology · Aug 4, 2023 · ffef6ea · ffef6ea
1 parent b770edc
commit ffef6ea
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -21,7 +21,7 @@ Code to reproduce the error.
  - VSCode version version [e.g. 22]
 
 **Screenshots**
-If applicable, add screenshots to help explain your problem.
+If applicable, add screenshots to help explain your problem. **Share the code as text, not as a screenshots!**
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/packages/colibri/src/documenter/doxygen_parser.ts b/packages/colibri/src/documenter/doxygen_parser.ts
@@ -53,7 +53,7 @@ export function parse_doxygen(text: string) {
                 text_s_new += `${line.trim()}\n`;
             }
             else {
-                text_s_new += `${line.trim()} `;
+                text_s_new += `${line.trim()}\n`;
             }
         }
     });

diff --git a/packages/colibri/src/project_manager/tool/edalize/run_edalize.py b/packages/colibri/src/project_manager/tool/edalize/run_edalize.py
@@ -110,7 +110,7 @@ def print_info(working_directory, developer_mode, edam_file, config_exec_file):
 if tool_name == "modelsim":
     vsim_path = which("vsim")
     if vsim_path == None:
-        print("{MSG_INTRO} Error ModelSim path is not configured!")
+        print(f"{MSG_INTRO} Error ModelSim path is not configured!")
         exit(-1)
     vsim_dir = os.path.dirname(vsim_path).replace("\\", "/")
     os.environ["MODEL_TECH"] = vsim_dir

diff --git a/packages/colibri/src/template/helpers/template_definition_verilog.ts b/packages/colibri/src/template/helpers/template_definition_verilog.ts
@@ -55,9 +55,9 @@ module {{ name }}_tb;
 {{ indent[1] }}//Ports
 {% for port_inst in port -%}
 {% if port_inst['direction'] == "input" -%}
-{{ indent[1] }}reg {{port_inst['type']}} {{port_inst['info']['name']}};
+{{ indent[1] }}reg {% if port_inst['type'] != 'wire' and port_inst['type'] != 'reg' %}{{ port_inst['type'] }}{% endif %} {{port_inst['info']['name']}};
 {% else -%}
-{{ indent[1] }}wire {{port_inst['type']}} {{port_inst['info']['name']}};
+{{ indent[1] }}wire {% if port_inst['type'] != 'wire' and port_inst['type'] != 'reg' %}{{ port_inst['type'] }}{% endif %} {{port_inst['info']['name']}};
 {% endif -%}
 {% endfor %}
 {{ indent[1] }}{{ instance }}
@@ -78,9 +78,9 @@ module {{ name }}_tb;
 {{ indent[1] }}//Ports
 {% for port_inst in port -%}
 {% if port_inst['direction'] == "input" -%}
-{{ indent[1] }}reg {{port_inst['type']}} {{port_inst['info']['name']}};
+{{ indent[1] }}reg {% if port_inst['type'] != 'wire' and port_inst['type'] != 'reg' %}{{ port_inst['type'] }}{% endif %} {{port_inst['info']['name']}};
 {% else -%}
-{{ indent[1] }}wire {{port_inst['type']}} {{port_inst['info']['name']}};
+{{ indent[1] }}wire {% if port_inst['type'] != 'wire' and port_inst['type'] != 'reg' %}{{ port_inst['type'] }}{% endif %} {{port_inst['info']['name']}};
 {% endif -%}
 {% endfor %}
 {{ indent[1] }}{{ instance }}

diff --git a/packages/teroshdl/resources/release_notes/release-notes.html b/packages/teroshdl/resources/release_notes/release-notes.html
@@ -33,11 +33,12 @@
     <br>
     <br>
 
-    <h4 id="release-notes"> Minor changes v5.0.5 and v5.0.7</h4>
+    <h4 id="release-notes"> Minor changes v5.0.5 and v5.0.8</h4>
     <p>
         <ul>
             <li> Auto detection of compilation order in simulations ⭐</li>
             <li> Linter is executed from file directory, so it's possible to use relative include directories ⭐</li>
+            <li> Fix error in documenter with templates</li>
             <li> Improve Python detection</li>
             <li> Improve linter/formatter path detection</li>
             <li> Fix bug VHDL component template</li>
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,7 +53,7 @@ export function parse_doxygen(text: string) { @@
                     text_s_new += `${line.trim()}\n`;
                 }
                 else {
-                    text_s_new += `${line.trim()} `;
+                    text_s_new += `${line.trim()}\n`;
                 }
             }
         });
@@ Expand Down @@