@@ -14,7 +14,7 @@ import * as platform from 'vs/base/common/platform';
1414import { Gesture } from 'vs/base/browser/touch' ;
1515import { KeyCode } from 'vs/base/common/keyCodes' ;
1616import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent' ;
17- import { Event , Emitter , EventBufferer , chain , mapEvent , anyEvent , debounceEvent , reduceEvent } from 'vs/base/common/event' ;
17+ import { Event , Emitter , EventBufferer } from 'vs/base/common/event' ;
1818import { domEvent } from 'vs/base/browser/event' ;
1919import { IListVirtualDelegate , IListRenderer , IListEvent , IListContextMenuEvent , IListMouseEvent , IListTouchEvent , IListGestureEvent , IIdentityProvider , ITypeLabelProvider } from './list' ;
2020import { ListView , IListViewOptions } from './listView' ;
@@ -246,7 +246,7 @@ class KeyboardController<T> implements IDisposable {
246246
247247 this . openController = options . openController || DefaultOpenController ;
248248
249- const onKeyDown = chain ( domEvent ( view . domNode , 'keydown' ) )
249+ const onKeyDown = Event . chain ( domEvent ( view . domNode , 'keydown' ) )
250250 . filter ( e => ! isInputElement ( e . target as HTMLElement ) )
251251 . map ( e => new StandardKeyboardEvent ( e ) ) ;
252252
@@ -338,7 +338,7 @@ class TypeLabelController<T> implements IDisposable {
338338 private view : ListView < T > ,
339339 private typeLabelProvider : ITypeLabelProvider < T >
340340 ) {
341- const onChar = chain ( domEvent ( view . domNode , 'keydown' ) )
341+ const onChar = Event . chain ( domEvent ( view . domNode , 'keydown' ) )
342342 . map ( event => new StandardKeyboardEvent ( event ) )
343343 . filter ( event => {
344344 if ( event . ctrlKey || event . metaKey || event . altKey ) {
@@ -352,8 +352,8 @@ class TypeLabelController<T> implements IDisposable {
352352 . map ( event => event . browserEvent . key )
353353 . event ;
354354
355- const onClear = debounceEvent < string , null > ( onChar , ( ) => null , 800 ) ;
356- const onInput = reduceEvent < string | null , string | null > ( anyEvent ( onChar , onClear ) , ( r , i ) => i === null ? null : ( ( r || '' ) + i ) ) ;
355+ const onClear = Event . debounce < string , null > ( onChar , ( ) => null , 800 ) ;
356+ const onInput = Event . reduce < string | null , string | null > ( Event . any ( onChar , onClear ) , ( r , i ) => i === null ? null : ( ( r || '' ) + i ) ) ;
357357
358358 onInput ( this . onInput , this , this . disposables ) ;
359359 }
@@ -396,7 +396,7 @@ class DOMFocusController<T> implements IDisposable {
396396 ) {
397397 this . disposables = [ ] ;
398398
399- const onKeyDown = chain ( domEvent ( view . domNode , 'keydown' ) )
399+ const onKeyDown = Event . chain ( domEvent ( view . domNode , 'keydown' ) )
400400 . filter ( e => ! isInputElement ( e . target as HTMLElement ) )
401401 . map ( e => new StandardKeyboardEvent ( e ) ) ;
402402
@@ -947,19 +947,19 @@ export class List<T> implements ISpliceable<T>, IDisposable {
947947 private styleController : IStyleController ;
948948
949949 @memoize get onFocusChange ( ) : Event < IListEvent < T > > {
950- return mapEvent ( this . eventBufferer . wrapEvent ( this . focus . onChange ) , e => this . toListEvent ( e ) ) ;
950+ return Event . map ( this . eventBufferer . wrapEvent ( this . focus . onChange ) , e => this . toListEvent ( e ) ) ;
951951 }
952952
953953 @memoize get onSelectionChange ( ) : Event < IListEvent < T > > {
954- return mapEvent ( this . eventBufferer . wrapEvent ( this . selection . onChange ) , e => this . toListEvent ( e ) ) ;
954+ return Event . map ( this . eventBufferer . wrapEvent ( this . selection . onChange ) , e => this . toListEvent ( e ) ) ;
955955 }
956956
957957 private _onOpen = new Emitter < IListEvent < T > > ( ) ;
958958 readonly onOpen : Event < IListEvent < T > > = this . _onOpen . event ;
959959
960960 private _onPin = new Emitter < number [ ] > ( ) ;
961961 @memoize get onPin ( ) : Event < IListEvent < T > > {
962- return mapEvent ( this . _onPin . event , indexes => this . toListEvent ( { indexes } ) ) ;
962+ return Event . map ( this . _onPin . event , indexes => this . toListEvent ( { indexes } ) ) ;
963963 }
964964
965965 get onMouseClick ( ) : Event < IListMouseEvent < T > > { return this . view . onMouseClick ; }
@@ -975,7 +975,7 @@ export class List<T> implements ISpliceable<T>, IDisposable {
975975
976976 private didJustPressContextMenuKey : boolean = false ;
977977 @memoize get onContextMenu ( ) : Event < IListContextMenuEvent < T > > {
978- const fromKeydown = chain ( domEvent ( this . view . domNode , 'keydown' ) )
978+ const fromKeydown = Event . chain ( domEvent ( this . view . domNode , 'keydown' ) )
979979 . map ( e => new StandardKeyboardEvent ( e ) )
980980 . filter ( e => this . didJustPressContextMenuKey = e . keyCode === KeyCode . ContextMenu || ( e . shiftKey && e . keyCode === KeyCode . F10 ) )
981981 . filter ( e => { e . preventDefault ( ) ; e . stopPropagation ( ) ; return false ; } )
@@ -987,7 +987,7 @@ export class List<T> implements ISpliceable<T>, IDisposable {
987987 } )
988988 . event ;
989989
990- const fromKeyup = chain ( domEvent ( this . view . domNode , 'keyup' ) )
990+ const fromKeyup = Event . chain ( domEvent ( this . view . domNode , 'keyup' ) )
991991 . filter ( ( ) => {
992992 const didJustPressContextMenuKey = this . didJustPressContextMenuKey ;
993993 this . didJustPressContextMenuKey = false ;
@@ -1003,12 +1003,12 @@ export class List<T> implements ISpliceable<T>, IDisposable {
10031003 . filter ( ( { anchor } ) => ! ! anchor )
10041004 . event ;
10051005
1006- const fromMouse = chain ( this . view . onContextMenu )
1006+ const fromMouse = Event . chain ( this . view . onContextMenu )
10071007 . filter ( ( ) => ! this . didJustPressContextMenuKey )
10081008 . map ( ( { element, index, browserEvent } ) => ( { element, index, anchor : { x : browserEvent . clientX + 1 , y : browserEvent . clientY } , browserEvent } ) )
10091009 . event ;
10101010
1011- return anyEvent < IListContextMenuEvent < T > > ( fromKeydown , fromKeyup , fromMouse ) ;
1011+ return Event . any < IListContextMenuEvent < T > > ( fromKeydown , fromKeyup , fromMouse ) ;
10121012 }
10131013
10141014 get onKeyDown ( ) : Event < KeyboardEvent > { return domEvent ( this . view . domNode , 'keydown' ) ; }
@@ -1057,8 +1057,8 @@ export class List<T> implements ISpliceable<T>, IDisposable {
10571057
10581058 this . disposables = [ this . focus , this . selection , this . view , this . _onDidDispose ] ;
10591059
1060- this . onDidFocus = mapEvent ( domEvent ( this . view . domNode , 'focus' , true ) , ( ) => null ! ) ;
1061- this . onDidBlur = mapEvent ( domEvent ( this . view . domNode , 'blur' , true ) , ( ) => null ! ) ;
1060+ this . onDidFocus = Event . map ( domEvent ( this . view . domNode , 'focus' , true ) , ( ) => null ! ) ;
1061+ this . onDidBlur = Event . map ( domEvent ( this . view . domNode , 'blur' , true ) , ( ) => null ! ) ;
10621062
10631063 this . disposables . push ( new DOMFocusController ( this , this . view ) ) ;
10641064
0 commit comments