ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.23.1 (#1520)

Browse Source
This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/platform/state/node/stateService.ts
View File

@@ -92,7 +92,7 @@ export class StateService implements IStateService {
private fileStorage: FileStorage;
constructor( @IEnvironmentService environmentService: IEnvironmentService, @ILogService logService: ILogService) {
constructor(@IEnvironmentService environmentService: IEnvironmentService, @ILogService logService: ILogService) {
this.fileStorage = new FileStorage(path.join(environmentService.userDataPath, 'storage.json'), error => logService.error(error));
}

15
src/vs/platform/state/test/node/state.test.ts
View File

@@ -6,11 +6,10 @@
'use strict';
import * as assert from 'assert';
import os = require('os');
import path = require('path');
import extfs = require('vs/base/node/extfs');
import * as os from 'os';
import * as path from 'path';
import * as extfs from 'vs/base/node/extfs';
import { getRandomTestPath } from 'vs/workbench/test/workbenchTestServices';
import { writeFileAndFlushSync, mkdirp } from 'vs/base/node/extfs';
import { FileStorage } from 'vs/platform/state/node/stateService';
suite('StateService', () => {
@@ -21,9 +20,9 @@ suite('StateService', () => {
extfs.del(parentDir, os.tmpdir(), done);
});
test('Basics', done => {
return mkdirp(parentDir).then(() => {
writeFileAndFlushSync(storageFile, '');
test('Basics', () => {
return extfs.mkdirp(parentDir).then(() => {
extfs.writeFileAndFlushSync(storageFile, '');
let service = new FileStorage(storageFile, () => null);
@@ -49,8 +48,6 @@ suite('StateService', () => {
service.setItem('some.null.key', null);
assert.equal(service.getItem('some.null.key', 'some.default'), 'some.default');
done();
});
});
});