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 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)

Browse Source 
* Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d

* Fix vs unit tests and hygiene issue

* Fix strict null check issue
This commit is contained in:
Chris LaFreniere
2019-06-10 18:27:09 -07:00
committed by GitHub
parent ff38bc8143
commit d15a3fcc98
926 changed files with 19529 additions and 11383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/workbench/contrib/snippets/browser/snippets.contribution.ts
View File

@@ -43,7 +43,7 @@ const languageScopeSchema: IJSONSchema = {
type: ['string', 'array']
},
body: {
description: nls.localize('snippetSchema.json.body', 'The snippet content. Use \'$1\', \'${1:defaultText}\' to define cursor positions, use \'$0\' for the final cursor position. Insert variable values with \'${varName}\' and \'${varName:defaultText}\', e.g \'This is file: $TM_FILENAME\'.'),
description: nls.localize('snippetSchema.json.body', 'The snippet content. Use \'$1\', \'${1:defaultText}\' to define cursor positions, use \'$0\' for the final cursor position. Insert variable values with \'${varName}\' and \'${varName:defaultText}\', e.g. \'This is file: $TM_FILENAME\'.'),
type: ['string', 'array'],
items: {
type: 'string'
@@ -78,11 +78,11 @@ const globalSchema: IJSONSchema = {
type: ['string', 'array']
},
scope: {
description: nls.localize('snippetSchema.json.scope', "A list of language names to which this snippet applies, e.g 'typescript,javascript'."),
description: nls.localize('snippetSchema.json.scope', "A list of language names to which this snippet applies, e.g. 'typescript,javascript'."),
type: 'string'
},
body: {
description: nls.localize('snippetSchema.json.body', 'The snippet content. Use \'$1\', \'${1:defaultText}\' to define cursor positions, use \'$0\' for the final cursor position. Insert variable values with \'${varName}\' and \'${varName:defaultText}\', e.g \'This is file: $TM_FILENAME\'.'),
description: nls.localize('snippetSchema.json.body', 'The snippet content. Use \'$1\', \'${1:defaultText}\' to define cursor positions, use \'$0\' for the final cursor position. Insert variable values with \'${varName}\' and \'${varName:defaultText}\', e.g. \'This is file: $TM_FILENAME\'.'),
type: ['string', 'array'],
items: {
type: 'string'

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

@@ -5,7 +5,7 @@
import { join } from 'vs/base/common/path';
import { IJSONSchema } from 'vs/base/common/jsonSchema';
import { combinedDisposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
import { combinedDisposable, dispose, IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
import { values } from 'vs/base/common/map';
import * as resources from 'vs/base/common/resources';
import { endsWith, isFalsyOrWhitespace } from 'vs/base/common/strings';
@@ -114,7 +114,7 @@ namespace snippetExt {
}
function watch(service: IFileService, resource: URI, callback: (type: FileChangeType, resource: URI) => any): IDisposable {
return combinedDisposable([
return combinedDisposable(
service.watch(resource),
service.onFileChanges(e => {
for (const change of e.changes) {
@@ -123,7 +123,7 @@ function watch(service: IFileService, resource: URI, callback: (type: FileChange
}
}
})
]);
);
}
class SnippetsService implements ISnippetsService {
@@ -295,15 +295,16 @@ class SnippetsService implements ISnippetsService {
}
private _initFolderSnippets(source: SnippetSource, folder: URI, bucket: IDisposable[]): Promise<any> {
let disposables: IDisposable[] = [];
let addFolderSnippets = (type?: FileChangeType) => {
disposables = dispose(disposables);
const disposables = new DisposableStore();
const addFolderSnippets = (type?: FileChangeType) => {
disposables.clear();
if (type === FileChangeType.DELETED) {
return Promise.resolve();
}
return this._fileService.resolve(folder).then(stat => {
for (const entry of stat.children || []) {
disposables.push(this._addSnippetFile(entry.resource, source));
disposables.add(this._addSnippetFile(entry.resource, source));
}
}, err => {
this._logService.error(`Failed snippets from folder '${folder.toString()}'`, err);
@@ -311,7 +312,7 @@ class SnippetsService implements ISnippetsService {
};
bucket.push(watch(this._fileService, folder, addFolderSnippets));
bucket.push(combinedDisposable(disposables));
bucket.push(disposables);
return addFolderSnippets();
}