From c7fef64c6aa981cd85d91ef0a9026e80df025be6 Mon Sep 17 00:00:00 2001
From: g2384 <g2384@users.noreply.github.com>
Date: Sat, 17 Oct 2020 11:16:20 +0100
Subject: [PATCH] add more type names, support "STD_LOGIC", "STD_LOGIC_VECTOR",
 "STD_ULOGIC", "STD_ULOGIC_VECTOR"

---
 VHDLFormatter.js            | 2 +-
 VHDLFormatter.ts            | 2 +-
 tests/VHDLFormatter.test.ts | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/VHDLFormatter.js b/VHDLFormatter.js
index c5fff1a..c3dfc08 100644
--- a/VHDLFormatter.js
+++ b/VHDLFormatter.js
@@ -271,7 +271,7 @@ class BeautifierSettings {
 }
 exports.BeautifierSettings = BeautifierSettings;
 let KeyWords = ["ABS", "ACCESS", "AFTER", "ALIAS", "ALL", "AND", "ARCHITECTURE", "ARRAY", "ASSERT", "ATTRIBUTE", "BEGIN", "BLOCK", "BODY", "BUFFER", "BUS", "CASE", "COMPONENT", "CONFIGURATION", "CONSTANT", "CONTEXT", "COVER", "DISCONNECT", "DOWNTO", "DEFAULT", "ELSE", "ELSIF", "END", "ENTITY", "EXIT", "FAIRNESS", "FILE", "FOR", "FORCE", "FUNCTION", "GENERATE", "GENERIC", "GROUP", "GUARDED", "IF", "IMPURE", "IN", "INERTIAL", "INOUT", "IS", "LABEL", "LIBRARY", "LINKAGE", "LITERAL", "LOOP", "MAP", "MOD", "NAND", "NEW", "NEXT", "NOR", "NOT", "NULL", "OF", "ON", "OPEN", "OR", "OTHERS", "OUT", "PACKAGE", "PORT", "POSTPONED", "PROCEDURE", "PROCESS", "PROPERTY", "PROTECTED", "PURE", "RANGE", "RECORD", "REGISTER", "REJECT", "RELEASE", "REM", "REPORT", "RESTRICT", "RESTRICT_GUARANTEE", "RETURN", "ROL", "ROR", "SELECT", "SEQUENCE", "SEVERITY", "SHARED", "SIGNAL", "SLA", "SLL", "SRA", "SRL", "STRONG", "SUBTYPE", "THEN", "TO", "TRANSPORT", "TYPE", "UNAFFECTED", "UNITS", "UNTIL", "USE", "VARIABLE", "VMODE", "VPROP", "VUNIT", "WAIT", "WHEN", "WHILE", "WITH", "XNOR", "XOR"];
-let TypeNames = ["BOOLEAN", "BIT", "CHARACTER", "INTEGER", "TIME", "NATURAL", "POSITIVE", "STRING"];
+let TypeNames = ["BOOLEAN", "BIT", "CHARACTER", "INTEGER", "TIME", "NATURAL", "POSITIVE", "STD_LOGIC", "STD_LOGIC_VECTOR", "STD_ULOGIC", "STD_ULOGIC_VECTOR", "STRING"];
 function beautify(input, settings) {
     input = input.replace(/\r\n/g, "\n");
     input = input.replace(/\n/g, "\r\n");
diff --git a/VHDLFormatter.ts b/VHDLFormatter.ts
index 541bb38..8acd3d4 100644
--- a/VHDLFormatter.ts
+++ b/VHDLFormatter.ts
@@ -321,7 +321,7 @@ export class BeautifierSettings {
 }
 
 let KeyWords: Array<string> = ["ABS", "ACCESS", "AFTER", "ALIAS", "ALL", "AND", "ARCHITECTURE", "ARRAY", "ASSERT", "ATTRIBUTE", "BEGIN", "BLOCK", "BODY", "BUFFER", "BUS", "CASE", "COMPONENT", "CONFIGURATION", "CONSTANT", "CONTEXT", "COVER", "DISCONNECT", "DOWNTO", "DEFAULT", "ELSE", "ELSIF", "END", "ENTITY", "EXIT", "FAIRNESS", "FILE", "FOR", "FORCE", "FUNCTION", "GENERATE", "GENERIC", "GROUP", "GUARDED", "IF", "IMPURE", "IN", "INERTIAL", "INOUT", "IS", "LABEL", "LIBRARY", "LINKAGE", "LITERAL", "LOOP", "MAP", "MOD", "NAND", "NEW", "NEXT", "NOR", "NOT", "NULL", "OF", "ON", "OPEN", "OR", "OTHERS", "OUT", "PACKAGE", "PORT", "POSTPONED", "PROCEDURE", "PROCESS", "PROPERTY", "PROTECTED", "PURE", "RANGE", "RECORD", "REGISTER", "REJECT", "RELEASE", "REM", "REPORT", "RESTRICT", "RESTRICT_GUARANTEE", "RETURN", "ROL", "ROR", "SELECT", "SEQUENCE", "SEVERITY", "SHARED", "SIGNAL", "SLA", "SLL", "SRA", "SRL", "STRONG", "SUBTYPE", "THEN", "TO", "TRANSPORT", "TYPE", "UNAFFECTED", "UNITS", "UNTIL", "USE", "VARIABLE", "VMODE", "VPROP", "VUNIT", "WAIT", "WHEN", "WHILE", "WITH", "XNOR", "XOR"];
-let TypeNames: Array<string> = ["BOOLEAN", "BIT", "CHARACTER", "INTEGER", "TIME", "NATURAL", "POSITIVE", "STRING"];
+let TypeNames: Array<string> = ["BOOLEAN", "BIT", "CHARACTER", "INTEGER", "TIME", "NATURAL", "POSITIVE", "STD_LOGIC", "STD_LOGIC_VECTOR", "STD_ULOGIC", "STD_ULOGIC_VECTOR", "STRING"];
 
 export function beautify(input: string, settings: BeautifierSettings) {
     input = input.replace(/\r\n/g, "\n");
diff --git a/tests/VHDLFormatter.test.ts b/tests/VHDLFormatter.test.ts
index 18d08d1..c1f9d90 100644
--- a/tests/VHDLFormatter.test.ts
+++ b/tests/VHDLFormatter.test.ts
@@ -44,6 +44,13 @@ describe('VHDLFormatter', function () {
         let result = beautify(input, settings);
         expect(result).toBe("test\r\n");
     });
+
+    it('upper case types', function () {
+        let settings = GetDefaultSettings();
+        let input = "x : string;\r\ny : std_logic_vector;";
+        let result = beautify(input, settings);
+        expect(result).toBe("x : STRING;\r\ny : STD_LOGIC_VECTOR;");
+    });
 });
 
 function GetDefaultSettings(indentation: string = "    "): BeautifierSettings {