Merge pull request microsoft#74544 from tony-xia/wrong-var-name

sandy081 · web-flow · commit 7ee7705cc809 · 2019-06-03T17:39:28.000+02:00
identfier -&gt; identifier, Servuce -&gt; Service
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -480,12 +480,12 @@ export class ExtensionManagementService extends Disposable implements IExtension
 				e => Promise.reject(new ExtensionManagementError(this.joinErrors(e).message, INSTALL_ERROR_DELETING)));
 	}
 
-	private rename(identfier: IExtensionIdentifier, extractPath: string, renamePath: string, retryUntil: number): Promise<void> {
+	private rename(identifier: IExtensionIdentifier, extractPath: string, renamePath: string, retryUntil: number): Promise<void> {
 		return pfs.rename(extractPath, renamePath)
 			.then(undefined, error => {
 				if (isWindows && error && error.code === 'EPERM' && Date.now() < retryUntil) {
-					this.logService.info(`Failed renaming ${extractPath} to ${renamePath} with 'EPERM' error. Trying again...`, identfier.id);
-					return this.rename(identfier, extractPath, renamePath, retryUntil);
+					this.logService.info(`Failed renaming ${extractPath} to ${renamePath} with 'EPERM' error. Trying again...`, identifier.id);
+					return this.rename(identifier, extractPath, renamePath, retryUntil);
 				}
 				return Promise.reject(new ExtensionManagementError(error.message || nls.localize('renameError', "Unknown error while renaming {0} to {1}", extractPath, renamePath), error.code || INSTALL_ERROR_RENAMING));
 			});
@@ -835,8 +835,8 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		return pfs.rimraf(extension.location.fsPath).then(() => this.logService.info('Deleted from disk', extension.identifier.id, extension.location.fsPath));
 	}
 
-	private isUninstalled(identfier: ExtensionIdentifierWithVersion): Promise<boolean> {
-		return this.filterUninstalled(identfier).then(uninstalled => uninstalled.length === 1);
+	private isUninstalled(identifier: ExtensionIdentifierWithVersion): Promise<boolean> {
+		return this.filterUninstalled(identifier).then(uninstalled => uninstalled.length === 1);
 	}
 
 	private filterUninstalled(...identifiers: ExtensionIdentifierWithVersion[]): Promise<string[]> {
diff --git a/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts b/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts
@@ -16,11 +16,11 @@ export class ExtensionsManifestCache extends Disposable {
 
 	constructor(
 		private readonly environmentService: IEnvironmentService,
-		extensionsManagementServuce: IExtensionManagementService
+		extensionsManagementService: IExtensionManagementService
 	) {
 		super();
-		this._register(extensionsManagementServuce.onDidInstallExtension(e => this.onDidInstallExtension(e)));
-		this._register(extensionsManagementServuce.onDidUninstallExtension(e => this.onDidUnInstallExtension(e)));
+		this._register(extensionsManagementService.onDidInstallExtension(e => this.onDidInstallExtension(e)));
+		this._register(extensionsManagementService.onDidUninstallExtension(e => this.onDidUnInstallExtension(e)));
 	}
 
 	private onDidInstallExtension(e: DidInstallExtensionEvent): void {

Original file line number	Diff line number	Diff line change
`@@ -480,12 +480,12 @@ export class ExtensionManagementService extends Disposable implements IExtension`
`480`	`480`	`e => Promise.reject(new ExtensionManagementError(this.joinErrors(e).message, INSTALL_ERROR_DELETING)));`
`481`	`481`	`}`
`482`	`482`
`483`		`- private rename(identfier: IExtensionIdentifier, extractPath: string, renamePath: string, retryUntil: number): Promise<void> {`
	`483`	`+ private rename(identifier: IExtensionIdentifier, extractPath: string, renamePath: string, retryUntil: number): Promise<void> {`
`484`	`484`	`return pfs.rename(extractPath, renamePath)`
`485`	`485`	`.then(undefined, error => {`
`486`	`486`	`if (isWindows && error && error.code === 'EPERM' && Date.now() < retryUntil) {`
`487`		- this.logService.info(`Failed renaming ${extractPath} to ${renamePath} with 'EPERM' error. Trying again...`, identfier.id);
`488`		`- return this.rename(identfier, extractPath, renamePath, retryUntil);`
	`487`	+ this.logService.info(`Failed renaming ${extractPath} to ${renamePath} with 'EPERM' error. Trying again...`, identifier.id);
	`488`	`+ return this.rename(identifier, extractPath, renamePath, retryUntil);`
`489`	`489`	`}`
`490`	`490`	`return Promise.reject(new ExtensionManagementError(error.message \|\| nls.localize('renameError', "Unknown error while renaming {0} to {1}", extractPath, renamePath), error.code \|\| INSTALL_ERROR_RENAMING));`
`491`	`491`	`});`
`@@ -835,8 +835,8 @@ export class ExtensionManagementService extends Disposable implements IExtension`
`835`	`835`	`return pfs.rimraf(extension.location.fsPath).then(() => this.logService.info('Deleted from disk', extension.identifier.id, extension.location.fsPath));`
`836`	`836`	`}`
`837`	`837`
`838`		`- private isUninstalled(identfier: ExtensionIdentifierWithVersion): Promise<boolean> {`
`839`		`- return this.filterUninstalled(identfier).then(uninstalled => uninstalled.length === 1);`
	`838`	`+ private isUninstalled(identifier: ExtensionIdentifierWithVersion): Promise<boolean> {`
	`839`	`+ return this.filterUninstalled(identifier).then(uninstalled => uninstalled.length === 1);`
`840`	`840`	`}`
`841`	`841`
`842`	`842`	`private filterUninstalled(...identifiers: ExtensionIdentifierWithVersion[]): Promise<string[]> {`