Allow empty array for shell args in tasks

alexr00 · alexr00 · commit 36bd747e7901 · 2019-10-24T15:13:15.000+02:00
Fixes microsoft#53306
diff --git a/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts b/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts
@@ -552,7 +552,7 @@ interface MetaData<T, U> {
 }
 
 
-function _isEmpty<T>(this: void, value: T | undefined, properties: MetaData<T, any>[] | undefined): boolean {
+function _isEmpty<T>(this: void, value: T | undefined, properties: MetaData<T, any>[] | undefined, allowEmptyArray: boolean = false): boolean {
 	if (value === undefined || value === null || properties === undefined) {
 		return true;
 	}
@@ -561,7 +561,7 @@ function _isEmpty<T>(this: void, value: T | undefined, properties: MetaData<T, a
 		if (property !== undefined && property !== null) {
 			if (meta.type !== undefined && !meta.type.isEmpty(property)) {
 				return false;
-			} else if (!Array.isArray(property) || property.length > 0) {
+			} else if (!Array.isArray(property) || (property.length > 0) || allowEmptyArray) {
 				return false;
 			}
 		}
@@ -591,11 +591,11 @@ function _assignProperties<T>(this: void, target: T | undefined, source: T | und
 	return target;
 }
 
-function _fillProperties<T>(this: void, target: T | undefined, source: T | undefined, properties: MetaData<T, any>[] | undefined): T | undefined {
+function _fillProperties<T>(this: void, target: T | undefined, source: T | undefined, properties: MetaData<T, any>[] | undefined, allowEmptyArray: boolean = false): T | undefined {
 	if (!source || _isEmpty(source, properties)) {
 		return target;
 	}
-	if (!target || _isEmpty(target, properties)) {
+	if (!target || _isEmpty(target, properties, allowEmptyArray)) {
 		return source;
 	}
 	for (let meta of properties!) {
@@ -727,15 +727,15 @@ namespace ShellConfiguration {
 	}
 
 	export function isEmpty(this: void, value: Tasks.ShellConfiguration): boolean {
-		return _isEmpty(value, properties);
+		return _isEmpty(value, properties, true);
 	}
 
 	export function assignProperties(this: void, target: Tasks.ShellConfiguration | undefined, source: Tasks.ShellConfiguration | undefined): Tasks.ShellConfiguration | undefined {
 		return _assignProperties(target, source, properties);
 	}
 
 	export function fillProperties(this: void, target: Tasks.ShellConfiguration, source: Tasks.ShellConfiguration): Tasks.ShellConfiguration | undefined {
-		return _fillProperties(target, source, properties);
+		return _fillProperties(target, source, properties, true);
 	}
 
 	export function fillDefaults(this: void, value: Tasks.ShellConfiguration, context: ParseContext): Tasks.ShellConfiguration {

Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,7 @@ interface MetaData<T, U> {`
`552`	`552`	`}`
`553`	`553`
`554`	`554`
`555`		`-function _isEmpty<T>(this: void, value: T \| undefined, properties: MetaData<T, any>[] \| undefined): boolean {`
	`555`	`+function _isEmpty<T>(this: void, value: T \| undefined, properties: MetaData<T, any>[] \| undefined, allowEmptyArray: boolean = false): boolean {`
`556`	`556`	`if (value === undefined \|\| value === null \|\| properties === undefined) {`
`557`	`557`	`return true;`
`558`	`558`	`}`
`@@ -561,7 +561,7 @@ function _isEmpty<T>(this: void, value: T \| undefined, properties: MetaData<T, a`
`561`	`561`	`if (property !== undefined && property !== null) {`
`562`	`562`	`if (meta.type !== undefined && !meta.type.isEmpty(property)) {`
`563`	`563`	`return false;`
`564`		`- } else if (!Array.isArray(property) \|\| property.length > 0) {`
	`564`	`+ } else if (!Array.isArray(property) \|\| (property.length > 0) \|\| allowEmptyArray) {`
`565`	`565`	`return false;`
`566`	`566`	`}`
`567`	`567`	`}`
`@@ -591,11 +591,11 @@ function _assignProperties<T>(this: void, target: T \| undefined, source: T \| und`
`591`	`591`	`return target;`
`592`	`592`	`}`
`593`	`593`
`594`		`-function _fillProperties<T>(this: void, target: T \| undefined, source: T \| undefined, properties: MetaData<T, any>[] \| undefined): T \| undefined {`
	`594`	`+function _fillProperties<T>(this: void, target: T \| undefined, source: T \| undefined, properties: MetaData<T, any>[] \| undefined, allowEmptyArray: boolean = false): T \| undefined {`
`595`	`595`	`if (!source \|\| _isEmpty(source, properties)) {`
`596`	`596`	`return target;`
`597`	`597`	`}`
`598`		`- if (!target \|\| _isEmpty(target, properties)) {`
	`598`	`+ if (!target \|\| _isEmpty(target, properties, allowEmptyArray)) {`
`599`	`599`	`return source;`
`600`	`600`	`}`
`601`	`601`	`for (let meta of properties!) {`
`@@ -727,15 +727,15 @@ namespace ShellConfiguration {`
`727`	`727`	`}`
`728`	`728`
`729`	`729`	`export function isEmpty(this: void, value: Tasks.ShellConfiguration): boolean {`
`730`		`- return _isEmpty(value, properties);`
	`730`	`+ return _isEmpty(value, properties, true);`
`731`	`731`	`}`
`732`	`732`
`733`	`733`	`export function assignProperties(this: void, target: Tasks.ShellConfiguration \| undefined, source: Tasks.ShellConfiguration \| undefined): Tasks.ShellConfiguration \| undefined {`
`734`	`734`	`return _assignProperties(target, source, properties);`
`735`	`735`	`}`
`736`	`736`
`737`	`737`	`export function fillProperties(this: void, target: Tasks.ShellConfiguration, source: Tasks.ShellConfiguration): Tasks.ShellConfiguration \| undefined {`
`738`		`- return _fillProperties(target, source, properties);`
	`738`	`+ return _fillProperties(target, source, properties, true);`
`739`	`739`	`}`
`740`	`740`
`741`	`741`	`export function fillDefaults(this: void, value: Tasks.ShellConfiguration, context: ParseContext): Tasks.ShellConfiguration {`