Merge branch 'TerosTechnology:dev' into dev

TerosTechnology · Dec 31, 2024 · 83d9918 · 83d9918
2 parents 3500324 + f9e430c
commit 83d9918
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,8 +8,6 @@ dist
 tmp
 out_*
 coverage
-yarn.lock
-package-lock.json
 test_folder
 *.save
 examples/yosys/**/*.json
@@ -24,6 +22,5 @@ package-lock.json
 config.html
 resources/project_manager/examples
 resources/project_manager/help
-yarn.lock
 *.log.save
 *quartus.rec
diff --git a/src/teroshdl/features/tree_views/tasks/manager.ts b/src/teroshdl/features/tree_views/tasks/manager.ts
@@ -289,8 +289,8 @@ export class Tasks_manager extends BaseView {
                 shellArgs: consoleDefinition.options,
                 isTransient: true,
                 iconPath: {
-                    light: vscode.Uri.file(get_icon(consoleDefinition.iconName).light),
-                    dark: vscode.Uri.file(get_icon(consoleDefinition.iconName).dark)
+                    light: get_icon(consoleDefinition.iconName).light,
+                    dark: get_icon(consoleDefinition.iconName).dark,
                 }
             });
             terminal.show();

diff --git a/src/teroshdl/features/tree_views/utils.ts b/src/teroshdl/features/tree_views/utils.ts
@@ -31,16 +31,16 @@ import { GlobalConfigManager } from "colibri/config/config_manager";
 
 const BASE_PATH_ICON = path_lib.join(__dirname, "..", "..", "..", "..", "resources", "icon");
 
-export function get_icon(name: string) {
+export function get_icon(name: string) : {dark: vscode.Uri, light: vscode.Uri} {
     let extension = "svg";
     const pathToCheck = path_lib.join(BASE_PATH_ICON, "dark", `${name}.svg`);
     if (!check_if_path_exist(pathToCheck)) {
         extension = "png";
     }
 
     const icon_path = {
-        dark: path_lib.join(BASE_PATH_ICON, "dark", `${name}.${extension}`),
-        light: path_lib.join(BASE_PATH_ICON, "light", `${name}.${extension}`)
+        dark: vscode.Uri.file(path_lib.join(BASE_PATH_ICON, "dark", `${name}.${extension}`)),
+        light: vscode.Uri.file(path_lib.join(BASE_PATH_ICON, "light", `${name}.${extension}`)),
     };
     return icon_path;
 }