Merge VS Code 1.23.1 (#1520)

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

View File

@@ -6,11 +6,11 @@
import URI from 'vs/base/common/uri';
import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import arrays = require('vs/base/common/arrays');
import * as arrays from 'vs/base/common/arrays';
import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
import { IFilesConfiguration } from 'vs/platform/files/common/files';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import Event, { Emitter, once } from 'vs/base/common/event';
import { Event, Emitter, once } from 'vs/base/common/event';
import { ResourceMap } from 'vs/base/common/map';
import { TPromise } from 'vs/base/common/winjs.base';
import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel';
@@ -116,10 +116,10 @@ export class UntitledEditorService implements IUntitledEditorService {
private mapResourceToInput = new ResourceMap<UntitledEditorInput>();
private mapResourceToAssociatedFilePath = new ResourceMap<boolean>();
private _onDidChangeContent: Emitter<URI>;
private _onDidChangeDirty: Emitter<URI>;
private _onDidChangeEncoding: Emitter<URI>;
private _onDidDisposeModel: Emitter<URI>;
private readonly _onDidChangeContent: Emitter<URI>;
private readonly _onDidChangeDirty: Emitter<URI>;
private readonly _onDidChangeEncoding: Emitter<URI>;
private readonly _onDidDisposeModel: Emitter<URI>;
constructor(
@IInstantiationService private instantiationService: IInstantiationService,