fix: project config and global config

packages/teroshdl/src/features/comander/run.ts

@@ -17,7 +17,6 @@
 // You should have received a copy of the GNU General Public License
 // along with TerosHDL.  If not, see <https://www.gnu.org/licenses/>.
 
-import * as opn from 'open';
 import * as vscode from 'vscode';
 import * as shelljs from 'shelljs';
 import { Base_webview } from './web';
@@ -26,7 +25,7 @@ import { OS } from "teroshdl2/out/process/common";
 import { get_os } from "teroshdl2/out/process/utils";
 import * as path_lib from 'path';
 import { globalLogger } from '../../logger';
-import { GlobalConfigManager } from 'teroshdl2/out/config/config_manager';
+import * as utils from '../../utils/utils';
 
 export class Comander {
 
@@ -52,6 +51,7 @@ export class Comander {
     }
 
     private open_waveform(args: vscode.Uri) {
+        const config = utils.getConfig(this.manager);
         const file_path = args.fsPath;
         globalLogger.info(`Opening the waveform: ${file_path}`);
 
@@ -62,14 +62,14 @@ export class Comander {
         }
 
         let gtkwave_path = "";
-        let base_path = GlobalConfigManager.getInstance().get_config().tools.general.gtkwave_installation_path;
+        let base_path = config.tools.general.gtkwave_installation_path;
         if (base_path !== "") {
             gtkwave_path = path_lib.join(base_path, gtkwave_binary);
         }
         else {
             gtkwave_path = gtkwave_binary;
         }
-        const extra_arguments = GlobalConfigManager.getInstance().get_config().tools.general.gtkwave_extra_arguments;
+        const extra_arguments = config.tools.general.gtkwave_extra_arguments;
 
         let command = `${gtkwave_path} ${file_path} ${extra_arguments}`;
         shelljs.exec(command, { async: true });

packages/teroshdl/src/features/dependency.ts

@@ -23,7 +23,7 @@ import * as fs from 'fs';
 import { t_Multi_project_manager } from '../type_declaration';
 import * as nunjucks from 'nunjucks';
 import { globalLogger } from '../logger';
-import { GlobalConfigManager } from 'teroshdl2/out/config/config_manager';
+import * as utils from '../utils/utils';
 
 const base_path = "dependencies_viewer";
 
@@ -135,7 +135,8 @@ export class Dependency_manager {
         }
         try {
             const selected_project = this.manager.get_selected_project();
-            const python_path = GlobalConfigManager.getInstance().get_config().general.general.pypath;
+            const config = utils.getConfig(this.manager);
+            const python_path = config.general.general.pypath;
             const result = await selected_project.get_dependency_graph(python_path);
             if (result.successful === false) {
                 globalLogger.error("Error while getting dependency graph.", true);

packages/teroshdl/src/features/documenter.ts

@@ -26,8 +26,6 @@ import * as fs from 'fs';
 import { t_Multi_project_manager } from '../type_declaration';
 import { Base_webview } from './base_webview';
 import { globalLogger } from '../logger';
-import { GlobalConfigManager } from 'teroshdl2/out/config/config_manager';
-
 
 export class Documenter_manager extends Base_webview {
 
@@ -134,7 +132,7 @@ export class Documenter_manager extends Base_webview {
     }
 
     private get_config(): teroshdl2.config.auxiliar_config.t_documenter_options {
-        const config = GlobalConfigManager.getInstance().get_config();
+        const config = utils.getConfig(this.manager);
         return <teroshdl2.config.auxiliar_config.t_documenter_options>{
             generic_visibility: config.documentation.general.generics,
             port_visibility: config.documentation.general.ports,

packages/teroshdl/src/features/formatter.ts

@@ -22,7 +22,6 @@ import * as teroshdl2 from 'teroshdl2';
 import { t_Multi_project_manager } from '../type_declaration';
 import * as utils from '../utils/utils';
 import { e_formatter_general_formatter_verilog, e_formatter_general_formatter_vhdl } from 'teroshdl2/out/config/config_declaration';
-import { GlobalConfigManager } from 'teroshdl2/out/config/config_manager';
 import { globalLogger } from '../logger';
 
 let formatter_vhdl: Formatter | undefined = undefined;
@@ -45,52 +44,50 @@ class Formatter {
     // Configuration
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     private get_formatter_name() {
+        const config = utils.getConfig(this.manager);
         if (this.lang === teroshdl2.common.general.LANGUAGE.VHDL) {
-            return GlobalConfigManager.getInstance().get_config().formatter.general.formatter_vhdl;
+            return config.formatter.general.formatter_vhdl;
         }
         else {
-            return GlobalConfigManager.getInstance().get_config().formatter.general.formatter_verilog;
+            return config.formatter.general.formatter_verilog;
         }
     }
 
     private get_formatter_config() {
+        const configCurrent = utils.getConfig(this.manager);
         if (this.lang === teroshdl2.common.general.LANGUAGE.VHDL) {
-            const formatter_name = GlobalConfigManager.getInstance().get_config().formatter.general.formatter_vhdl;
+            const formatter_name = configCurrent.formatter.general.formatter_vhdl;
             if (formatter_name === e_formatter_general_formatter_vhdl.standalone) {
-                return GlobalConfigManager.getInstance().get_config().formatter.standalone;
+                return configCurrent.formatter.standalone;
             }
             else if (formatter_name === e_formatter_general_formatter_vhdl.vsg) {
-                return GlobalConfigManager.getInstance().get_config().formatter.svg;
+                return configCurrent.formatter.svg;
             }
             else {
-                return GlobalConfigManager.getInstance().get_config().formatter.standalone;
+                return configCurrent.formatter.standalone;
             }
             }
         else {
-            const formatter_name = GlobalConfigManager.getInstance().get_config().formatter.general.formatter_verilog;
+            const formatter_name = configCurrent.formatter.general.formatter_verilog;
             if (formatter_name === e_formatter_general_formatter_verilog.istyle) {
-                return GlobalConfigManager.getInstance().get_config().formatter.istyle;
+                return configCurrent.formatter.istyle;
             }
             else if (formatter_name === e_formatter_general_formatter_verilog.s3sv) {
-                return GlobalConfigManager.getInstance().get_config().formatter.s3sv;
+                return configCurrent.formatter.s3sv;
             }
             else if (formatter_name === e_formatter_general_formatter_verilog.verible) {
                 const config = {
-                    format_args : GlobalConfigManager.getInstance().get_config().formatter.verible.format_args,
-                    path: GlobalConfigManager.getInstance().get_config().tools.verible.installation_path
+                    format_args : configCurrent.formatter.verible.format_args,
+                    path: configCurrent.tools.verible.installation_path
                 };
                 return config;
             }
             else {
-                return GlobalConfigManager.getInstance().get_config().formatter.istyle;
+                return configCurrent.formatter.istyle;
             }
         }
     }
 
-    private get_pytyon_path() {
-        return GlobalConfigManager.getInstance().get_config().general.general.pypath;
-    }
-
     public async format(code) {
         const formatter_name = this.get_formatter_name();
         const formater_config = this.get_formatter_config();

packages/teroshdl/src/features/language_provider/language_provider.ts

@@ -27,7 +27,7 @@ import { Logger } from "./ctags/Logger";
 import * as vscode from 'vscode';
 import { t_Multi_project_manager } from '../../type_declaration';
 import * as rusthdl_lib from './lsp/rust_hdl';
-import { GlobalConfigManager } from "teroshdl2/out/config/config_manager";
+import * as utils from '../../utils/utils';
 
 export type e_provider = {
     'completion': any,
@@ -107,7 +107,9 @@ export class LanguageProviderManager {
         let is_alive = false;
         let rusthdl; 
 
-        const enable_vhdl_provider = GlobalConfigManager.getInstance().get_config().general.general.go_to_definition_vhdl;
+        const config = utils.getConfig(this.manager);
+
+        const enable_vhdl_provider = config.general.general.go_to_definition_vhdl;
         if (enable_vhdl_provider === true) {
             rusthdl = new rusthdl_lib.Rusthdl_lsp(this.context, this.manager);
             is_alive = await rusthdl.run_rusthdl();
@@ -140,7 +142,8 @@ export class LanguageProviderManager {
         this.context.subscriptions.push(vscode.languages.registerDocumentSymbolProvider(verilogSelector, 
             this.provider_list.doc));
 
-        const enable_verilog_provider = GlobalConfigManager.getInstance().get_config().general.general.go_to_definition_verilog;
+        const config = utils.getConfig(this.manager);
+        const enable_verilog_provider = config.general.general.go_to_definition_verilog;
         if (enable_verilog_provider === true) {
             this.context.subscriptions.push(vscode.languages.registerHoverProvider(verilogSelector, 
                 this.provider_list.hover));

packages/teroshdl/src/features/language_provider/lsp/rust_hdl.ts

@@ -12,6 +12,7 @@ import { ExtensionContext } from 'vscode';
 import util = require('util');
 import * as teroshdl2 from 'teroshdl2';
 import { t_Multi_project_manager } from '../../../type_declaration';
+import * as utils from '../../../utils/utils';
 
 const exec = util.promisify(require('child_process').exec);
 
@@ -21,7 +22,6 @@ import {
     ServerOptions,
     RevealOutputChannelOn
 } from 'vscode-languageclient/node';
-import { GlobalConfigManager } from 'teroshdl2/out/config/config_manager';
 
 
 const isWindows = process.platform === 'win32';
@@ -149,7 +149,8 @@ export class Rusthdl_lsp {
     }
 
     getServerOptionsEmbedded(context: ExtensionContext) {
-        const linter_name = GlobalConfigManager.getInstance().get_config().linter.general.linter_vhdl;
+        const config = utils.getConfig(this.manager);
+        const linter_name = config.linter.general.linter_vhdl;
         let args: string[] = [];
         if (linter_name !== teroshdl2.config.config_declaration.e_linter_general_linter_vhdl.none) {
             args = ['--no-lint'];

packages/teroshdl/src/features/linter.ts

@@ -21,7 +21,6 @@ import * as vscode from 'vscode';
 import * as teroshdl2 from 'teroshdl2';
 import { t_Multi_project_manager } from '../type_declaration';
 import * as utils from '../utils/utils';
-import { GlobalConfigManager } from 'teroshdl2/out/config/config_manager';
 
 enum LINTER_MODE {
     STYLE = "style",
@@ -50,65 +49,67 @@ class Linter {
     // Configuration
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     private get_linter_name() {
+        const config = utils.getConfig(this.manager);
         if (this.lang === teroshdl2.common.general.LANGUAGE.VHDL && this.mode === LINTER_MODE.ERRORS) {
-            return GlobalConfigManager.getInstance().get_config().linter.general.linter_vhdl;
+            return config.linter.general.linter_vhdl;
         }
         else if ((this.lang === teroshdl2.common.general.LANGUAGE.VERILOG
             || this.lang === teroshdl2.common.general.LANGUAGE.SYSTEMVERILOG)
             && this.mode === LINTER_MODE.ERRORS) {
-            return GlobalConfigManager.getInstance().get_config().linter.general.linter_verilog;
+            return config.linter.general.linter_verilog;
         }
         else if (this.lang === teroshdl2.common.general.LANGUAGE.VHDL && this.mode === LINTER_MODE.STYLE) {
-            return GlobalConfigManager.getInstance().get_config().linter.general.lstyle_vhdl;
+            return config.linter.general.lstyle_vhdl;
         }
         else {
-            return GlobalConfigManager.getInstance().get_config().linter.general.lstyle_verilog;
+            return config.linter.general.lstyle_verilog;
         }
     }
 
     private get_options(lang: teroshdl2.common.general.LANGUAGE): teroshdl2.linter.common.l_options {
         let path = "";
         let argument = "";
         const linter_name = this.get_linter_name();
+        const config = utils.getConfig(this.manager);
 
         if (linter_name === teroshdl2.config.config_declaration.e_linter_general_linter_vhdl.ghdl){
-            path = GlobalConfigManager.getInstance().get_config().tools.ghdl.installation_path;
-            argument = GlobalConfigManager.getInstance().get_config().linter.ghdl.arguments;
+            path = config.tools.ghdl.installation_path;
+            argument = config.linter.ghdl.arguments;
         }
         else if (linter_name === teroshdl2.config.config_declaration.e_linter_general_linter_vhdl.modelsim &&
                 lang === teroshdl2.common.general.LANGUAGE.VHDL){
-            path = GlobalConfigManager.getInstance().get_config().tools.modelsim.installation_path;
-            argument = GlobalConfigManager.getInstance().get_config().linter.modelsim.vhdl_arguments;
+            path = config.tools.modelsim.installation_path;
+            argument = config.linter.modelsim.vhdl_arguments;
         }
         else if (linter_name === teroshdl2.config.config_declaration.e_linter_general_linter_vhdl.vivado &&
                 lang === teroshdl2.common.general.LANGUAGE.VHDL){
-            path = GlobalConfigManager.getInstance().get_config().tools.vivado.installation_path;
-            argument = GlobalConfigManager.getInstance().get_config().linter.vivado.vhdl_arguments;
+            path = config.tools.vivado.installation_path;
+            argument = config.linter.vivado.vhdl_arguments;
         }
         else if (linter_name === teroshdl2.config.config_declaration.e_linter_general_linter_verilog.icarus){
-            path = GlobalConfigManager.getInstance().get_config().tools.icarus.installation_path;
-            argument = GlobalConfigManager.getInstance().get_config().linter.icarus.arguments;
+            path = config.tools.icarus.installation_path;
+            argument = config.linter.icarus.arguments;
         }
         else if (linter_name === teroshdl2.config.config_declaration.e_linter_general_linter_verilog.modelsim &&
                 lang !== teroshdl2.common.general.LANGUAGE.VHDL){
-            path = GlobalConfigManager.getInstance().get_config().tools.modelsim.installation_path;
-            argument = GlobalConfigManager.getInstance().get_config().linter.modelsim.verilog_arguments;
+            path = config.tools.modelsim.installation_path;
+            argument = config.linter.modelsim.verilog_arguments;
         }
         else if (linter_name === teroshdl2.config.config_declaration.e_linter_general_linter_verilog.verilator){
-            path = GlobalConfigManager.getInstance().get_config().tools.verilator.installation_path;
-            argument = GlobalConfigManager.getInstance().get_config().linter.verilator.arguments;
+            path = config.tools.verilator.installation_path;
+            argument = config.linter.verilator.arguments;
         }
         else if (linter_name === teroshdl2.config.config_declaration.e_linter_general_linter_verilog.vivado &&
                 lang !== teroshdl2.common.general.LANGUAGE.VHDL){
-            path = GlobalConfigManager.getInstance().get_config().tools.vivado.installation_path;
-            argument = GlobalConfigManager.getInstance().get_config().linter.vivado.verilog_arguments;
+            path = config.tools.vivado.installation_path;
+            argument = config.linter.vivado.verilog_arguments;
         }
         else if (linter_name === teroshdl2.config.config_declaration.e_linter_general_lstyle_vhdl.vsg){
-            argument = GlobalConfigManager.getInstance().get_config().linter.vsg.arguments;
+            argument = config.linter.vsg.arguments;
         }
         else if (linter_name === teroshdl2.config.config_declaration.e_linter_general_lstyle_verilog.verible){
-            path = GlobalConfigManager.getInstance().get_config().tools.verible.installation_path;
-            argument = GlobalConfigManager.getInstance().get_config().linter.verible.arguments;
+            path = config.tools.verible.installation_path;
+            argument = config.linter.verible.arguments;
         }
 
         const options: teroshdl2.linter.common.l_options = {

packages/teroshdl/src/features/schematic.ts

@@ -263,7 +263,7 @@ export class Schematic_manager extends Base_webview {
             'empty': false
         };
 
-        let config = teroshdl2.config.configManager.GlobalConfigManager.getInstance().get_config();
+        let config = utils.getConfig(this.manager);
         try {
             const selectedProject = this.manager.get_selected_project();
             config = selectedProject.get_config();

packages/teroshdl/src/features/state_machine.ts

@@ -26,7 +26,6 @@ import * as utils from '../utils/utils';
 import * as nunjucks from 'nunjucks';
 import { Base_webview } from './base_webview';
 import { globalLogger } from '../logger';
-import { GlobalConfigManager } from 'teroshdl2/out/config/config_manager';
 
 export class State_machine_manager extends Base_webview {
 
@@ -153,7 +152,7 @@ export class State_machine_manager extends Base_webview {
     // Utils
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     private get_config(): teroshdl2.config.auxiliar_config.t_documenter_options {
-        const config = GlobalConfigManager.getInstance().get_config();
+        const config = utils.getConfig(this.manager);
         return <teroshdl2.config.auxiliar_config.t_documenter_options>{
             generic_visibility: config.documentation.general.generics,
             port_visibility: config.documentation.general.ports,

packages/teroshdl/src/features/stutter_mode.ts

@@ -32,7 +32,7 @@ import {
 import { t_Multi_project_manager } from '../type_declaration';
 import * as vscode from 'vscode';
 import * as teroshdl2 from 'teroshdl2';
-import { GlobalConfigManager } from 'teroshdl2/out/config/config_manager';
+import * as utils from '../utils/utils';
 
 const TRIGGER_CHARACTERS = [';', '.', "'", ',', '[', ']', '-', '\n'];
 
@@ -64,11 +64,12 @@ export class Stutter_mode_manager {
                         position: Position,
                         ch: string
                     ): ProviderResult<TextEdit[]> {
-                        const stutter_delimiters = GlobalConfigManager.getInstance().get_config().editor.general.stutter_delimiters;
-                        const stutter_bracket_shortcuts = GlobalConfigManager.getInstance().get_config().editor.general.stutter_bracket_shortcuts;
-                        const stutter_comment_shortcuts = GlobalConfigManager.getInstance().get_config().editor.general.stutter_comment_shortcuts;
-                        const stutter_block_width = GlobalConfigManager.getInstance().get_config().editor.general.stutter_block_width;
-                        const stutter_max_width = GlobalConfigManager.getInstance().get_config().editor.general.stutter_max_width;
+                        const config = utils.getConfig(element.manager);
+                        const stutter_delimiters = config.editor.general.stutter_delimiters;
+                        const stutter_bracket_shortcuts = config.editor.general.stutter_bracket_shortcuts;
+                        const stutter_comment_shortcuts = config.editor.general.stutter_comment_shortcuts;
+                        const stutter_block_width = config.editor.general.stutter_block_width;
+                        const stutter_max_width = config.editor.general.stutter_max_width;
 
                         let inComment = document.lineAt(position).text.match(/^.*--.*$/);
                         let linePrefix = document.lineAt(position).text.substr(0, position.character);
@@ -263,7 +264,8 @@ export class Stutter_mode_manager {
                         position: Position,
                         ch: string
                     ): ProviderResult<TextEdit[]> {
-                        const stutter_comment_shortcuts = GlobalConfigManager.getInstance().get_config().editor.general.stutter_comment_shortcuts;
+                        const config = utils.getConfig(element.manager);
+                        const stutter_comment_shortcuts = config.editor.general.stutter_comment_shortcuts;
 
                         let linePrefix = document.lineAt(position).text.substr(0, position.character);
                         switch (ch) {