From 155b0662667fd090b73f4dbeab0a018dc60bf38c Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Mon, 22 Jan 2018 10:38:44 +0100 Subject: [PATCH] post merge fixes --- src/vs/workbench/api/node/extHost.protocol.ts | 2 +- .../test/electron-browser/api/mainThreadEditors.test.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 347ab9e9328..4b2f6b6a404 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -52,7 +52,7 @@ import { IStat, FileChangeType } from 'vs/platform/files/common/files'; import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry'; import { ParsedArgs } from 'vs/platform/environment/common/environment'; import { CommentRule, CharacterPair, EnterAction } from 'vs/editor/common/modes/languageConfiguration'; -import { EndOfLineSequence, ISingleEditOperation } from 'vs/editor/common/model'; +import { ISingleEditOperation } from 'vs/editor/common/model'; import { ILineMatch, IPatternInfo } from 'vs/platform/search/common/search'; export interface IEnvironment { diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts index da8f3fb2498..03ad3ac7926 100644 --- a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts +++ b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts @@ -156,7 +156,6 @@ suite('MainThreadEditors', () => { function createMockFileStat(target: URI): IFileStat { return { etag: '', - hasChildren: false, isDirectory: false, name: target.path, mtime: 0,