Fix 'The operand of a 'delete' operator must be optional' errors in VS Code codebase. For microsoft#96022

aeschli · aeschli · commit a80db0cce4e3 · 2020-04-24T16:01:35.000+02:00
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
@@ -249,23 +249,25 @@ export function parseArgs<T>(args: string[], options: OptionDescriptions<T>, err
 	const parsedArgs = minimist(args, { string, boolean, alias });
 
 	const cleanedArgs: any = {};
+	const remainingArgs: any = parsedArgs;
 
 	// https://github.com/microsoft/vscode/issues/58177
 	cleanedArgs._ = parsedArgs._.filter(arg => arg.length > 0);
-	delete parsedArgs._;
+
+	delete remainingArgs._;
 
 	for (let optionId in options) {
 		const o = options[optionId];
 		if (o.alias) {
-			delete parsedArgs[o.alias];
+			delete remainingArgs[o.alias];
 		}
 
-		let val = parsedArgs[optionId];
-		if (o.deprecates && parsedArgs.hasOwnProperty(o.deprecates)) {
+		let val = remainingArgs[optionId];
+		if (o.deprecates && remainingArgs.hasOwnProperty(o.deprecates)) {
 			if (!val) {
-				val = parsedArgs[o.deprecates];
+				val = remainingArgs[o.deprecates];
 			}
-			delete parsedArgs[o.deprecates];
+			delete remainingArgs[o.deprecates];
 		}
 
 		if (typeof val !== 'undefined') {
@@ -281,10 +283,10 @@ export function parseArgs<T>(args: string[], options: OptionDescriptions<T>, err
 			}
 			cleanedArgs[optionId] = val;
 		}
-		delete parsedArgs[optionId];
+		delete remainingArgs[optionId];
 	}
 
-	for (let key in parsedArgs) {
+	for (let key in remainingArgs) {
 		errorReporter.onUnknownOption(key);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -249,23 +249,25 @@ export function parseArgs<T>(args: string[], options: OptionDescriptions<T>, err`
`249`	`249`	`const parsedArgs = minimist(args, { string, boolean, alias });`
`250`	`250`
`251`	`251`	`const cleanedArgs: any = {};`
	`252`	`+ const remainingArgs: any = parsedArgs;`
`252`	`253`
`253`	`254`	`// https://github.com/microsoft/vscode/issues/58177`
`254`	`255`	`cleanedArgs._ = parsedArgs._.filter(arg => arg.length > 0);`
`255`		`- delete parsedArgs._;`
	`256`	`+`
	`257`	`+ delete remainingArgs._;`
`256`	`258`
`257`	`259`	`for (let optionId in options) {`
`258`	`260`	`const o = options[optionId];`
`259`	`261`	`if (o.alias) {`
`260`		`- delete parsedArgs[o.alias];`
	`262`	`+ delete remainingArgs[o.alias];`
`261`	`263`	`}`
`262`	`264`
`263`		`- let val = parsedArgs[optionId];`
`264`		`- if (o.deprecates && parsedArgs.hasOwnProperty(o.deprecates)) {`
	`265`	`+ let val = remainingArgs[optionId];`
	`266`	`+ if (o.deprecates && remainingArgs.hasOwnProperty(o.deprecates)) {`
`265`	`267`	`if (!val) {`
`266`		`- val = parsedArgs[o.deprecates];`
	`268`	`+ val = remainingArgs[o.deprecates];`
`267`	`269`	`}`
`268`		`- delete parsedArgs[o.deprecates];`
	`270`	`+ delete remainingArgs[o.deprecates];`
`269`	`271`	`}`
`270`	`272`
`271`	`273`	`if (typeof val !== 'undefined') {`
`@@ -281,10 +283,10 @@ export function parseArgs<T>(args: string[], options: OptionDescriptions<T>, err`
`281`	`283`	`}`
`282`	`284`	`cleanedArgs[optionId] = val;`
`283`	`285`	`}`
`284`		`- delete parsedArgs[optionId];`
	`286`	`+ delete remainingArgs[optionId];`
`285`	`287`	`}`
`286`	`288`
`287`		`- for (let key in parsedArgs) {`
	`289`	`+ for (let key in remainingArgs) {`
`288`	`290`	`errorReporter.onUnknownOption(key);`
`289`	`291`	`}`
`290`	`292`