From 7846d86e0f3eec43e95dbb30c08c74d1369549b0 Mon Sep 17 00:00:00 2001 From: omarelfouly Date: Fri, 18 Oct 2024 23:30:27 +0300 Subject: [PATCH 1/2] Reads and uses workspace indentation --- src/commands/ModuleInstantiation.ts | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/commands/ModuleInstantiation.ts b/src/commands/ModuleInstantiation.ts index 5d1ef75c..0a62df75 100644 --- a/src/commands/ModuleInstantiation.ts +++ b/src/commands/ModuleInstantiation.ts @@ -73,9 +73,24 @@ async function instantiateModule(srcpath: string): Promise('insertSpaces', true); + const tabSize = editorConfig.get('tabSize', 4); + + if (useSpaces) { + return ' '.repeat(tabSize); + } else { + return '\t'; + } +} + function instantiatePort(ports: string[]): string { let port = ''; let maxLen = 0; + let indent = getIndentationString(); + for (let i = 0; i < ports.length; i++) { if (ports[i].length > maxLen) { maxLen = ports[i].length; @@ -86,7 +101,8 @@ function instantiatePort(ports: string[]): string { let element = ports[i]; let padding = maxLen - element.length + 1; element = element + ' '.repeat(padding); - port += `\t.${element}(${element})`; + port += indent; + port += `.${element}(${element})`; if (i !== ports.length - 1) { port += ','; } From e3d59dc03b43d9b6d5aaaeaf0c630ffceb6c529a Mon Sep 17 00:00:00 2001 From: omarelfouly Date: Fri, 18 Oct 2024 23:30:45 +0300 Subject: [PATCH 2/2] Updates changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index de5ca243..eaa2cac3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)\ +## Unreleased + +### Changed + +- Reads indentation preferences for current workspace and uses it in instantiate module + +### Fixed + +- Fix by reading preferences from workspace [#493](https://github.com/mshr-h/vscode-verilog-hdl-support/issues/493) + ## [1.15.1] - 2024-08-31 ### Changed