Browse Source

indent multi-line signal and constant declarations

for example:
signal test_sig : type_sig := (
    a => '0', -- now correctly indented
    b => '0'
);
master
are512 4 years ago
committed by g2384
parent
commit
6ff72a4da9
2 changed files with 9 additions and 1 deletions
  1. +5
    -1
      VHDLFormatter.js
  2. +4
    -0
      VHDLFormatter.ts

+ 5
- 1
VHDLFormatter.js View File

@ -635,6 +635,10 @@ function beautify3(inputs, result, settings, startIndex, indent, endIndex) {
[i, endIndex] = beautifyPortGenericBlock(inputs, result, settings, i, endIndex, indent, "GENERIC"); [i, endIndex] = beautifyPortGenericBlock(inputs, result, settings, i, endIndex, indent, "GENERIC");
continue; continue;
} }
if (input.regexStartsWith(/.*?\:\=\s*\($/)) {
[i, endIndex] = beautifyPortGenericBlock(inputs, result, settings, i, endIndex, indent, ":=");
continue;
}
if (input.regexStartsWith(/[\w\s:]*PROCEDURE[\s\w]+\($/)) { if (input.regexStartsWith(/[\w\s:]*PROCEDURE[\s\w]+\($/)) {
[i, endIndex] = beautifyPortGenericBlock(inputs, result, settings, i, endIndex, indent, "PROCEDURE"); [i, endIndex] = beautifyPortGenericBlock(inputs, result, settings, i, endIndex, indent, "PROCEDURE");
if (inputs[i].regexStartsWith(/.*\)[\s]*IS/)) { if (inputs[i].regexStartsWith(/.*\)[\s]*IS/)) {
@ -760,4 +764,4 @@ function RemoveExtraNewLines(input) {
input = input.replace(/\r\n\r\n\r\n/g, '\r\n'); input = input.replace(/\r\n\r\n\r\n/g, '\r\n');
return input; return input;
} }
//# sourceMappingURL=VHDLFormatter.js.map
//# sourceMappingURL=VHDLFormatter.js.map

+ 4
- 0
VHDLFormatter.ts View File

@ -694,6 +694,10 @@ export function beautify3(inputs: Array<string>, result: (FormattedLine | Format
Mode = modeCache; Mode = modeCache;
continue; continue;
} }
if (input.regexStartsWith(/.*?\:\=\s*\($/)) {
[i, endIndex] = beautifyPortGenericBlock(inputs, result, settings, i, endIndex, indent, ":=");
continue;
}
if (input.regexStartsWith(/[\w\s:]*\bPORT\b([\s]|$)/)) { if (input.regexStartsWith(/[\w\s:]*\bPORT\b([\s]|$)/)) {
[i, endIndex] = beautifyPortGenericBlock(inputs, result, settings, i, endIndex, indent, "PORT"); [i, endIndex] = beautifyPortGenericBlock(inputs, result, settings, i, endIndex, indent, "PORT");
continue; continue;


Loading…
Cancel
Save