diff --git a/common/env/io.go b/common/env/io.go
index ec126f9c..9ef6334d 100644
--- a/common/env/io.go
+++ b/common/env/io.go
@@ -234,11 +234,15 @@ func (p *typeDescParser) parseTypeParamIdent() (string, error) {
 }
 
 func (p *typeDescParser) skipWhitespace() {
-	for p.pos < p.length && p.text[p.pos] == ' ' {
+	for p.pos < p.length && isWhitespace(p.text[p.pos]) {
 		p.pos++
 	}
 }
 
+func isWhitespace(c byte) bool {
+	return c == ' ' || c == '\t' || c == '\n' || c == '\r'
+}
+
 func isAlpha(c byte) bool {
 	return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
 }
diff --git a/common/env/io_test.go b/common/env/io_test.go
index b4068e9b..2aeeecc7 100644
--- a/common/env/io_test.go
+++ b/common/env/io_test.go
@@ -51,6 +51,18 @@ func TestParseTypeDesc(t *testing.T) {
 			"map<int, list<string>>",
 			NewTypeDesc("map", NewTypeDesc("int"), NewTypeDesc("list", NewTypeDesc("string"))),
 		},
+		{
+			"list<\n\tint\n>",
+			NewTypeDesc("list", NewTypeDesc("int")),
+		},
+		{
+			"map<\r\n  string,\r\n  list<string>\r\n>",
+			NewTypeDesc("map", NewTypeDesc("string"), NewTypeDesc("list", NewTypeDesc("string"))),
+		},
+		{
+			"map<string,\tint>",
+			NewTypeDesc("map", NewTypeDesc("string"), NewTypeDesc("int")),
+		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.text, func(t *testing.T) {
@@ -235,6 +247,35 @@ functions:
           return:
             type_name: V
             is_type_param: true
+`,
+		},
+		{
+			name: "multiline and tab whitespace in types",
+			yamlIn: `name: user_env
+variables:
+  - name: user_lookup_table
+    type: >-
+      map<
+        string,
+        list<string>
+      >
+  - name: permissions
+    type: "map<string,\tint>"
+`,
+			yamlOut: `name: user_env
+variables:
+    - name: user_lookup_table
+      type_name: map
+      params:
+        - type_name: string
+        - type_name: list
+          params:
+            - type_name: string
+    - name: permissions
+      type_name: map
+      params:
+        - type_name: string
+        - type_name: int
 `,
 		},
 	}