ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-08 01:28:26 -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

6
src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts
View File

@@ -32,9 +32,9 @@ import { IModelService } from 'vs/editor/common/services/modelService';
import { SearchModel } from 'vs/workbench/parts/search/common/searchModel';
import { QueryBuilder } from 'vs/workbench/parts/search/common/queryBuilder';
import Event, * as event from 'vs/base/common/event';
import * as event from 'vs/base/common/event';
import { testWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
import { ILogService, NullLogService } from '../../../platform/log/common/log';
import { NullLogService, ILogService } from 'vs/platform/log/common/log';
declare var __dirname: string;
@@ -150,7 +150,7 @@ class TestTelemetryService implements ITelemetryService {
private emitter = new event.Emitter<any>();
public get eventLogged(): Event<any> {
public get eventLogged(): event.Event<any> {
return this.emitter.event;
}