fix naming

weinand · weinand · commit e3df1e23cc9c · 2020-06-11T22:59:16.000+02:00
diff --git a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
@@ -105,25 +105,25 @@ export class ConfigurationManager implements IConfigurationManager {
 	}
 
 	createDebugAdapter(session: IDebugSession): IDebugAdapter | undefined {
-		let dap = this.debugAdapterFactories.get(session.configuration.type);
-		if (dap) {
-			return dap.createDebugAdapter(session);
+		let factory = this.debugAdapterFactories.get(session.configuration.type);
+		if (factory) {
+			return factory.createDebugAdapter(session);
 		}
 		return undefined;
 	}
 
 	substituteVariables(debugType: string, folder: IWorkspaceFolder | undefined, config: IConfig): Promise<IConfig> {
-		let dap = this.debugAdapterFactories.get(debugType);
-		if (dap) {
-			return dap.substituteVariables(folder, config);
+		let factory = this.debugAdapterFactories.get(debugType);
+		if (factory) {
+			return factory.substituteVariables(folder, config);
 		}
 		return Promise.resolve(config);
 	}
 
 	runInTerminal(debugType: string, args: DebugProtocol.RunInTerminalRequestArguments): Promise<number | undefined> {
-		let tl = this.debugAdapterFactories.get(debugType);
-		if (tl) {
-			return tl.runInTerminal(args);
+		let factory = this.debugAdapterFactories.get(debugType);
+		if (factory) {
+			return factory.runInTerminal(args);
 		}
 		return Promise.resolve(void 0);
 	}
diff --git a/src/vs/workbench/contrib/debug/common/debugger.ts b/src/vs/workbench/contrib/debug/common/debugger.ts
@@ -58,19 +58,21 @@ export class Debugger implements IDebugger {
 
 			if (isObject(source)) {
 				Object.keys(source).forEach(key => {
-					if (isObject(destination[key]) && isObject(source[key])) {
-						mixin(destination[key], source[key], overwrite, level + 1);
-					} else {
-						if (key in destination) {
-							if (overwrite) {
-								if (level === 0 && key === 'type') {
-									// don't merge the 'type' property
-								} else {
-									destination[key] = source[key];
+					if (key !== '__proto__') {
+						if (isObject(destination[key]) && isObject(source[key])) {
+							mixin(destination[key], source[key], overwrite, level + 1);
+						} else {
+							if (key in destination) {
+								if (overwrite) {
+									if (level === 0 && key === 'type') {
+										// don't merge the 'type' property
+									} else {
+										destination[key] = source[key];
+									}
 								}
+							} else {
+								destination[key] = source[key];
 							}
-						} else {
-							destination[key] = source[key];
 						}
 					}
 				});

Original file line number	Diff line number	Diff line change
`@@ -105,25 +105,25 @@ export class ConfigurationManager implements IConfigurationManager {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`createDebugAdapter(session: IDebugSession): IDebugAdapter \| undefined {`
`108`		`- let dap = this.debugAdapterFactories.get(session.configuration.type);`
`109`		`- if (dap) {`
`110`		`- return dap.createDebugAdapter(session);`
	`108`	`+ let factory = this.debugAdapterFactories.get(session.configuration.type);`
	`109`	`+ if (factory) {`
	`110`	`+ return factory.createDebugAdapter(session);`
`111`	`111`	`}`
`112`	`112`	`return undefined;`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`substituteVariables(debugType: string, folder: IWorkspaceFolder \| undefined, config: IConfig): Promise<IConfig> {`
`116`		`- let dap = this.debugAdapterFactories.get(debugType);`
`117`		`- if (dap) {`
`118`		`- return dap.substituteVariables(folder, config);`
	`116`	`+ let factory = this.debugAdapterFactories.get(debugType);`
	`117`	`+ if (factory) {`
	`118`	`+ return factory.substituteVariables(folder, config);`
`119`	`119`	`}`
`120`	`120`	`return Promise.resolve(config);`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`runInTerminal(debugType: string, args: DebugProtocol.RunInTerminalRequestArguments): Promise<number \| undefined> {`
`124`		`- let tl = this.debugAdapterFactories.get(debugType);`
`125`		`- if (tl) {`
`126`		`- return tl.runInTerminal(args);`
	`124`	`+ let factory = this.debugAdapterFactories.get(debugType);`
	`125`	`+ if (factory) {`
	`126`	`+ return factory.runInTerminal(args);`
`127`	`127`	`}`
`128`	`128`	`return Promise.resolve(void 0);`
`129`	`129`	`}`