microsoft#86678 define snippets home property in env service

sandy081 · sandy081 · commit f50e30330428 · 2020-03-19T15:57:43.000+01:00
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
@@ -124,6 +124,7 @@ export interface IEnvironmentService extends IUserHomeProvider {
 	keybindingsResource: URI;
 	keyboardLayoutResource: URI;
 	argvResource: URI;
+	snippetsHome: URI;
 
 	// sync resources
 	userDataSyncLogResource: URI;
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
@@ -142,6 +142,9 @@ export class EnvironmentService implements IEnvironmentService {
 		return URI.file(path.join(this.userHome, product.dataFolderName, 'argv.json'));
 	}
 
+	@memoize
+	get snippetsHome(): URI { return resources.joinPath(this.userRoamingDataHome, 'snippets'); }
+
 	@memoize
 	get isExtensionDevelopment(): boolean { return !!this._args.extensionDevelopmentPath; }
 
diff --git a/src/vs/workbench/contrib/snippets/browser/configureSnippets.ts b/src/vs/workbench/contrib/snippets/browser/configureSnippets.ts
@@ -87,7 +87,7 @@ async function computePicks(snippetService: ISnippetsService, envService: IEnvir
 		}
 	}
 
-	const dir = joinPath(envService.userRoamingDataHome, 'snippets');
+	const dir = envService.snippetsHome;
 	for (const mode of modeService.getRegisteredModes()) {
 		const label = modeService.getLanguageName(mode);
 		if (label && !seen.has(mode)) {
@@ -219,7 +219,7 @@ CommandsRegistry.registerCommand(id, async (accessor): Promise<any> => {
 	const globalSnippetPicks: SnippetPick[] = [{
 		scope: nls.localize('new.global_scope', 'global'),
 		label: nls.localize('new.global', "New Global Snippets file..."),
-		uri: joinPath(envService.userRoamingDataHome, 'snippets')
+		uri: envService.snippetsHome
 	}];
 
 	const workspaceSnippetPicks: SnippetPick[] = [];
diff --git a/src/vs/workbench/contrib/snippets/browser/snippetsService.ts b/src/vs/workbench/contrib/snippets/browser/snippetsService.ts
@@ -289,7 +289,7 @@ class SnippetsService implements ISnippetsService {
 	}
 
 	private _initUserSnippets(): Promise<any> {
-		const userSnippetsFolder = resources.joinPath(this._environmentService.userRoamingDataHome, 'snippets');
+		const userSnippetsFolder = this._environmentService.snippetsHome;
 		return this._fileService.createFolder(userSnippetsFolder).then(() => this._initFolderSnippets(SnippetSource.User, userSnippetsFolder, this._disposables));
 	}
 
diff --git a/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts b/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts
@@ -20,7 +20,7 @@ import { configurationTelemetry } from 'vs/platform/telemetry/common/telemetryUt
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { ITextFileService, ITextFileSaveEvent, ITextFileLoadEvent } from 'vs/workbench/services/textfile/common/textfiles';
-import { extname, basename, isEqual, isEqualOrParent, joinPath } from 'vs/base/common/resources';
+import { extname, basename, isEqual, isEqualOrParent } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { Schemas } from 'vs/base/common/network';
 import { guessMimeTypes } from 'vs/base/common/mime';
@@ -175,7 +175,7 @@ export class TelemetryContribution extends Disposable implements IWorkbenchContr
 		}
 
 		// Check for snippets
-		if (isEqualOrParent(resource, joinPath(this.environmentService.userRoamingDataHome, 'snippets'))) {
+		if (isEqualOrParent(resource, this.environmentService.snippetsHome)) {
 			return 'snippets';
 		}
 
diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts
@@ -102,6 +102,9 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
 	@memoize
 	get argvResource(): URI { return joinPath(this.userRoamingDataHome, 'argv.json'); }
 
+	@memoize
+	get snippetsHome(): URI { return joinPath(this.userRoamingDataHome, 'snippets'); }
+
 	@memoize
 	get userDataSyncHome(): URI { return joinPath(this.userRoamingDataHome, 'sync'); }
 

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,9 @@ export class EnvironmentService implements IEnvironmentService {`
`142`	`142`	`return URI.file(path.join(this.userHome, product.dataFolderName, 'argv.json'));`
`143`	`143`	`}`
`144`	`144`
	`145`	`+ @memoize`
	`146`	`+ get snippetsHome(): URI { return resources.joinPath(this.userRoamingDataHome, 'snippets'); }`
	`147`	`+`
`145`	`148`	`@memoize`
`146`	`149`	`get isExtensionDevelopment(): boolean { return !!this._args.extensionDevelopmentPath; }`
`147`	`150`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ class SnippetsService implements ISnippetsService {`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`private _initUserSnippets(): Promise<any> {`
`292`		`- const userSnippetsFolder = resources.joinPath(this._environmentService.userRoamingDataHome, 'snippets');`
	`292`	`+ const userSnippetsFolder = this._environmentService.snippetsHome;`
`293`	`293`	`return this._fileService.createFolder(userSnippetsFolder).then(() => this._initFolderSnippets(SnippetSource.User, userSnippetsFolder, this._disposables));`
`294`	`294`	`}`
`295`	`295`