ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-31 01:00:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 5d18ad4c5902e3bddbc9f78da82dfc2ac349e908 (#9683)

Browse Source
This commit is contained in:
Anthony Dresser
2020-03-20 01:17:27 -07:00
committed by GitHub
parent 1520441b84
commit dd8fb9433b
89 changed files with 3095 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/contrib/snippets/browser/configureSnippets.ts
View File

@@ -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[] = [];

2
src/vs/workbench/contrib/snippets/browser/snippetsService.ts
View File

@@ -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));
}