From 6af8618c810e938aff138671dafb81ff9a2e3a4d Mon Sep 17 00:00:00 2001 From: vvakame Date: Sat, 10 May 2014 19:31:25 +0900 Subject: [PATCH 1/2] improve atom/atom.d.ts and text-buffer/text-buffer.d.ts --- atom/atom.d.ts | 86 +++++++++++++++++++++++++++++++----- text-buffer/text-buffer.d.ts | 67 +++++++++++++++------------- 2 files changed, 112 insertions(+), 41 deletions(-) diff --git a/atom/atom.d.ts b/atom/atom.d.ts index 7fead9efdd..b2399515ad 100644 --- a/atom/atom.d.ts +++ b/atom/atom.d.ts @@ -118,8 +118,7 @@ declare module AtomCore { afterAttach(onDom?:any):any; beforeRemove():any; handleMouseEvents(e:JQueryMouseEventObject):any; - getEditorView():any /* EditorView */ - ; + getEditorView():any; /* EditorView */ getEditor():IEditor; getLineNumberElements():HTMLCollection; getLineNumberElementsForClass(klass:string):NodeList; @@ -341,8 +340,75 @@ declare module AtomCore { foldForMarker(marker:any):any; } - interface ICursor { - // TBD + interface ICursorStatic { + new (arg:{editor:IEditor; marker:IDisplayBufferMarker; id: number;}):ICursor; + } + + interface ICursor /* extends Theorist.Model */ { + screenPosition:any; + bufferPosition:any; + goalColumn:any; + visible:boolean; + needsAutoscroll:boolean; + + editor:IEditor; + marker:IDisplayBufferMarker; + id: number; + + destroy():any; + changePosition(options:any, fn:Function):any; + getPixelRect():any; + setScreenPosition(screenPosition:any, options?:any):any; + getScreenPosition():TextBuffer.IPoint; + getScreenRange():TextBuffer.IRange; + setBufferPosition(bufferPosition:any, options?:any):any; + getBufferPosition():TextBuffer.IPoint; + autoscroll():any; + updateVisibility():any; + setVisible(visible:boolean):any; + isVisible():boolean; + wordRegExp(arg?:any):any; + isLastCursor():boolean; + isSurroundedByWhitespace():boolean; + isBetweenWordAndNonWord():boolean; + isInsideWord():boolean; + clearAutoscroll():void; + clearSelection():void; + getScreenRow():number; + getScreenColumn():number; + getBufferRow():number; + getBufferColumn():number; + getCurrentBufferLine():string; + moveUp(rowCount:number, arg?:any):any; + moveDown(rowCount:number, arg?:any):any; + moveLeft(arg?:any):any; + moveRight(arg?:any):any; + moveToTop():any; + moveToBottom():void; + moveToBeginningOfScreenLine():void; + moveToBeginningOfLine():void; + moveToFirstCharacterOfLine():void; + moveToEndOfScreenLine():void; + moveToEndOfLine():void; + moveToBeginningOfWord():void; + moveToEndOfWord():void; + moveToBeginningOfNextWord():void; + moveToPreviousWordBoundary():void; + moveToNextWordBoundary():void; + getBeginningOfCurrentWordBufferPosition(options?:any):TextBuffer.IPoint; + getPreviousWordBoundaryBufferPosition(options?:any):TextBuffer.IPoint; + getMoveNextWordBoundaryBufferPosition(options?:any):TextBuffer.IPoint; + getEndOfCurrentWordBufferPosition(options?:any):TextBuffer.IPoint; + getBeginningOfNextWordBufferPosition(options?:any):TextBuffer.IPoint; + getCurrentWordBufferRange(options?:any):TextBuffer.IPoint; + getCurrentLineBufferRange(options?:any):TextBuffer.IPoint; + getCurrentParagraphBufferRange():any; + getCurrentWordPrefix():string; + isAtBeginningOfLine():boolean; + getIndentLevel():number; + isAtEndOfLine():boolean; + getScopes():string[]; + hasPrecedingCharactersOnLine():boolean; } interface ILanguageMode { @@ -568,12 +634,12 @@ declare module AtomCore { replaceSelectedText(options:any, fn:(selection:string)=>any):any; getMarker(id:number):IDisplayBufferMarker; getMarkers():IDisplayBufferMarker[]; - findMarkers(properties:any):IDisplayBufferMarker[]; - markScreenRange(value:number):IDisplayBufferMarker; - markBufferRange(value:number):IDisplayBufferMarker; - markScreenPosition(value:number):IDisplayBufferMarker; - markBufferPosition():IDisplayBufferMarker; - destroyMarker():boolean; + findMarkers(...args:any[]):IDisplayBufferMarker[]; + markScreenRange(...args:any[]):IDisplayBufferMarker; + markBufferRange(...args:any[]):IDisplayBufferMarker; + markScreenPosition(...args:any[]):IDisplayBufferMarker; + markBufferPosition(...args:any[]):IDisplayBufferMarker; + destroyMarker(...args:any[]):boolean; getMarkerCount():number; hasMultipleCursors():boolean; getCursors():ICursor[]; diff --git a/text-buffer/text-buffer.d.ts b/text-buffer/text-buffer.d.ts index b631618ca6..09066e61d4 100644 --- a/text-buffer/text-buffer.d.ts +++ b/text-buffer/text-buffer.d.ts @@ -15,19 +15,19 @@ declare module TextBuffer { fromObject(point:IPoint, copy?:boolean):IPoint; fromObject(object:number[]):IPoint; - fromObject(object:{row:number; col:number;}):IPoint; + fromObject(object:{row:number; column:number;}):IPoint; min(point1:IPoint, point2:IPoint):IPoint; min(point1:number[], point2:IPoint):IPoint; - min(point1:{row:number; col:number;}, point2:IPoint):IPoint; + min(point1:{row:number; column:number;}, point2:IPoint):IPoint; min(point1:IPoint, point2:number[]):IPoint; min(point1:number[], point2:number[]):IPoint; - min(point1:{row:number; col:number;}, point2:number[]):IPoint; + min(point1:{row:number; column:number;}, point2:number[]):IPoint; - min(point1:IPoint, point2:{row:number; col:number;}):IPoint; - min(point1:number[], point2:{row:number; col:number;}):IPoint; - min(point1:{row:number; col:number;}, point2:{row:number; col:number;}):IPoint; + min(point1:IPoint, point2:{row:number; column:number;}):IPoint; + min(point1:number[], point2:{row:number; column:number;}):IPoint; + min(point1:{row:number; column:number;}, point2:{row:number; column:number;}):IPoint; } interface IPoint { @@ -41,11 +41,11 @@ declare module TextBuffer { translate(delta:IPoint):IPoint; translate(delta:number[]):IPoint; - translate(delta:{row:number; col:number;}):IPoint; + translate(delta:{row:number; column:number;}):IPoint; add(other:IPoint):IPoint; add(other:number[]):IPoint; - add(other:{row:number; col:number;}):IPoint; + add(other:{row:number; column:number;}):IPoint; splitAt(column:number):IPoint[]; compare(other:IPoint):number; @@ -67,36 +67,36 @@ declare module TextBuffer { fromObject(object:{start: IPoint; end: IPoint}):IRange; fromObject(object:{start: number[]; end: IPoint}):IRange; - fromObject(object:{start: {row:number; col:number;}; end: IPoint}):IRange; + fromObject(object:{start: {row:number; column:number;}; end: IPoint}):IRange; fromObject(object:{start: IPoint; end: number[]}):IRange; fromObject(object:{start: number[]; end: number[]}):IRange; - fromObject(object:{start: {row:number; col:number;}; end: number[]}):IRange; + fromObject(object:{start: {row:number; column:number;}; end: number[]}):IRange; - fromObject(object:{start: IPoint; end: {row:number; col:number;}}):IRange; - fromObject(object:{start: number[]; end: {row:number; col:number;}}):IRange; - fromObject(object:{start: {row:number; col:number;}; end: {row:number; col:number;}}):IRange; + fromObject(object:{start: IPoint; end: {row:number; column:number;}}):IRange; + fromObject(object:{start: number[]; end: {row:number; column:number;}}):IRange; + fromObject(object:{start: {row:number; column:number;}; end: {row:number; column:number;}}):IRange; fromText(point:IPoint, text:string):IRange; fromText(point:number[], text:string):IRange; - fromText(point:{row:number; col:number;}, text:string):IRange; + fromText(point:{row:number; column:number;}, text:string):IRange; fromText(text:string):IRange; fromPointWithDelta(startPoint:IPoint, rowDelta:number, columnDelta:number):IRange; fromPointWithDelta(startPoint:number[], rowDelta:number, columnDelta:number):IRange; - fromPointWithDelta(startPoint:{row:number; col:number;}, rowDelta:number, columnDelta:number):IRange; + fromPointWithDelta(startPoint:{row:number; column:number;}, rowDelta:number, columnDelta:number):IRange; new(point1:IPoint, point2:IPoint):IRange; new(point1:number[], point2:IPoint):IRange; - new(point1:{row:number; col:number;}, point2:IPoint):IRange; + new(point1:{row:number; column:number;}, point2:IPoint):IRange; new(point1:IPoint, point2:number[]):IRange; new(point1:number[], point2:number[]):IRange; - new(point1:{row:number; col:number;}, point2:number[]):IRange; + new(point1:{row:number; column:number;}, point2:number[]):IRange; - new(point1:IPoint, point2:{row:number; col:number;}):IRange; - new(point1:number[], point2:{row:number; col:number;}):IRange; - new(point1:{row:number; col:number;}, point2:{row:number; col:number;}):IRange; + new(point1:IPoint, point2:{row:number; column:number;}):IRange; + new(point1:number[], point2:{row:number; column:number;}):IRange; + new(point1:{row:number; column:number;}, point2:{row:number; column:number;}):IRange; } interface IRange { @@ -115,15 +115,15 @@ declare module TextBuffer { compare(object:{start: IPoint; end: IPoint}):number; compare(object:{start: number[]; end: IPoint}):number; - compare(object:{start: {row:number; col:number;}; end: IPoint}):number; + compare(object:{start: {row:number; column:number;}; end: IPoint}):number; compare(object:{start: IPoint; end: number[]}):number; compare(object:{start: number[]; end: number[]}):number; - compare(object:{start: {row:number; col:number;}; end: number[]}):number; + compare(object:{start: {row:number; column:number;}; end: number[]}):number; - compare(object:{start: IPoint; end: {row:number; col:number;}}):number; - compare(object:{start: number[]; end: {row:number; col:number;}}):number; - compare(object:{start: {row:number; col:number;}; end: {row:number; col:number;}}):number; + compare(object:{start: IPoint; end: {row:number; column:number;}}):number; + compare(object:{start: number[]; end: {row:number; column:number;}}):number; + compare(object:{start: {row:number; column:number;}; end: {row:number; column:number;}}):number; isSingleLine():boolean; coversSameRows(other:IRange):boolean; @@ -132,15 +132,15 @@ declare module TextBuffer { add(object:{start: IPoint; end: IPoint}):IRange; add(object:{start: number[]; end: IPoint}):IRange; - add(object:{start: {row:number; col:number;}; end: IPoint}):IRange; + add(object:{start: {row:number; column:number;}; end: IPoint}):IRange; add(object:{start: IPoint; end: number[]}):IRange; add(object:{start: number[]; end: number[]}):IRange; - add(object:{start: {row:number; col:number;}; end: number[]}):IRange; + add(object:{start: {row:number; column:number;}; end: number[]}):IRange; - add(object:{start: IPoint; end: {row:number; col:number;}}):IRange; - add(object:{start: number[]; end: {row:number; col:number;}}):IRange; - add(object:{start: {row:number; col:number;}; end: {row:number; col:number;}}):IRange; + add(object:{start: IPoint; end: {row:number; column:number;}}):IRange; + add(object:{start: number[]; end: {row:number; column:number;}}):IRange; + add(object:{start: {row:number; column:number;}; end: {row:number; column:number;}}):IRange; translate(startPoint:IPoint, endPoint:IPoint):IRange; translate(startPoint:IPoint):IRange; @@ -150,7 +150,7 @@ declare module TextBuffer { containsPoint(point:IPoint, exclusive:boolean):boolean; containsPoint(point:number[], exclusive:boolean):boolean; - containsPoint(point:{row:number; col:number;}, exclusive:boolean):boolean; + containsPoint(point:{row:number; column:number;}, exclusive:boolean):boolean; intersectsRow(row:number):boolean; intersectsRowRange(startRow:number, endRow:number):boolean; @@ -296,3 +296,8 @@ declare module TextBuffer { getMarkerCount():number; } } + +declare module "text-buffer" { + var _: TextBuffer.ITextBufferStatic; + export = _; +} \ No newline at end of file From 21be490958279ed9ae18e4e0077af7d9253d5cb4 Mon Sep 17 00:00:00 2001 From: vvakame Date: Sat, 10 May 2014 19:34:25 +0900 Subject: [PATCH 2/2] fix travis-ci --- text-buffer/text-buffer-tests.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/text-buffer/text-buffer-tests.ts b/text-buffer/text-buffer-tests.ts index 075851a3b7..8621c30918 100644 --- a/text-buffer/text-buffer-tests.ts +++ b/text-buffer/text-buffer-tests.ts @@ -6,7 +6,7 @@ var pointA = new Point(1, 2); pointA.row; pointA.column; -var pointB = Point.fromObject({row: 2, col: 3}); +var pointB = Point.fromObject({row: 2, column: 3}); var pointC = Point.min(pointA, pointB); declare var TRange: TextBuffer.IRangeStatic;