ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-09 09:42:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.31.1 (#4283)

Browse Source
This commit is contained in:
Matt Irvine
2019-03-15 13:09:45 -07:00
committed by GitHub
parent 7d31575149
commit 86bac90001
1716 changed files with 53308 additions and 48375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/editor/test/common/services/modelService.test.ts
View File

@@ -27,7 +27,7 @@ suite('ModelService', () => {
configService.setUserConfiguration('files', { 'eol': '\n' });
configService.setUserConfiguration('files', { 'eol': '\r\n' }, URI.file(platform.isWindows ? 'c:\\myroot' : '/myroot'));
modelService = new ModelServiceImpl(null, configService, new TestTextResourcePropertiesService(configService));
modelService = new ModelServiceImpl(configService, new TestTextResourcePropertiesService(configService));
});
teardown(() => {
@@ -313,7 +313,7 @@ function assertComputeEdits(lines1: string[], lines2: string[]): void {
// console.log(`took ${Date.now() - start} ms.`);
// apply edits
model.pushEditOperations(null, edits, null);
model.pushEditOperations([], edits, null);
assert.equal(model.getValue(), lines2.join('\n'));
}
@@ -370,7 +370,7 @@ class TestTextResourcePropertiesService implements ITextResourcePropertiesServic
_serviceBrand: any;
constructor(
@IConfigurationService private configurationService: IConfigurationService,
@IConfigurationService private readonly configurationService: IConfigurationService,
) {
}