register platform services directly

sandy081 · sandy081 · commit cfb8230a9e70 · 2019-09-27T17:56:23.000+02:00
diff --git a/src/vs/platform/credentials/node/credentialsService.ts b/src/vs/platform/credentials/node/credentialsService.ts
@@ -5,7 +5,6 @@
 
 import { ICredentialsService } from 'vs/platform/credentials/common/credentials';
 import { IdleValue } from 'vs/base/common/async';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 type KeytarModule = typeof import('keytar');
 export class KeytarCredentialsService implements ICredentialsService {
@@ -39,5 +38,3 @@ export class KeytarCredentialsService implements ICredentialsService {
 		return keytar.findCredentials(service);
 	}
 }
-
-registerSingleton(ICredentialsService, KeytarCredentialsService, true);
diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts
@@ -46,7 +46,6 @@ import 'vs/workbench/services/extensionManagement/node/extensionManagementServic
 import 'vs/workbench/services/accessibility/node/accessibilityService';
 import 'vs/workbench/services/remote/node/tunnelService';
 import 'vs/workbench/services/backup/node/backupFileService';
-import 'vs/platform/credentials/node/credentialsService';
 import 'vs/workbench/services/url/electron-browser/urlService';
 import 'vs/workbench/services/workspaces/electron-browser/workspacesService';
 import 'vs/workbench/services/workspaces/electron-browser/workspaceEditingService';
@@ -63,6 +62,11 @@ import 'vs/workbench/services/update/electron-browser/updateService';
 import 'vs/workbench/services/issue/electron-browser/issueService';
 import 'vs/workbench/services/menubar/electron-browser/menubarService';
 
+import { ICredentialsService } from 'vs/platform/credentials/common/credentials';
+import { KeytarCredentialsService } from 'vs/platform/credentials/node/credentialsService';
+
+registerSingleton(ICredentialsService, KeytarCredentialsService, true);
+
 //#endregion
 
 
@@ -133,5 +137,6 @@ import 'vs/workbench/contrib/welcome/gettingStarted/electron-browser/openWebsite
 
 // Configuration Exporter
 import 'vs/workbench/contrib/configExporter/node/configurationExportHelper.contribution';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 //#endregion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`
`6`	`6`	`import { ICredentialsService } from 'vs/platform/credentials/common/credentials';`
`7`	`7`	`import { IdleValue } from 'vs/base/common/async';`
`8`		`-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';`
`9`	`8`
`10`	`9`	`type KeytarModule = typeof import('keytar');`
`11`	`10`	`export class KeytarCredentialsService implements ICredentialsService {`
`@@ -39,5 +38,3 @@ export class KeytarCredentialsService implements ICredentialsService {`
`39`	`38`	`return keytar.findCredentials(service);`
`40`	`39`	`}`
`41`	`40`	`}`
`42`		`-`
`43`		`-registerSingleton(ICredentialsService, KeytarCredentialsService, true);`