microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-17 01:49:57 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fixes some comment emit and other changes

Browse Source
This commit is contained in:
Ron Buckton
2016-04-01 17:45:18 -07:00
parent 794e0cef8c
commit 15780a9a4c
24 changed files with 418 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/compiler/sourcemap.ts
View File

@@ -6,8 +6,10 @@ namespace ts {
getSourceMapData(): SourceMapData;
setSourceFile(sourceFile: SourceFile): void;
emitPos(pos: number): void;
emitStart(range: TextRange, shouldEmit?: (range: TextRange) => boolean, shouldEmitNested?: (range: TextRange) => boolean): void;
emitEnd(range: TextRange, shouldEmit?: (range: TextRange) => boolean, shouldEmitNested?: (range: TextRange) => boolean): void;
emitStart(node: Node, shouldIgnoreNodeCallback?: (node: Node) => boolean, shouldIgnoreChildrenCallback?: (node: Node) => boolean): void;
emitStart(range: TextRange): void;
emitEnd(node: Node, shouldIgnoreNodeCallback?: (node: Node) => boolean, shouldIgnoreChildrenCallback?: (node: Node) => boolean): void;
emitEnd(range: TextRange): void;
/*@deprecated*/ changeEmitSourcePos(): void;
/*@deprecated*/ stopOverridingSpan(): void;
getText(): string;
@@ -33,8 +35,8 @@ namespace ts {
nullSourceMapWriter = {
getSourceMapData(): SourceMapData { return undefined; },
setSourceFile(sourceFile: SourceFile): void { },
emitStart(range: TextRange): void { },
emitEnd(range: TextRange, shouldEmit?: Function, shouldEmitNested?: Function): void { },
emitStart(range: TextRange | Node, shouldIgnoreNodeCallback?: (node: Node) => boolean, shouldIgnoreChildrenCallback?: (node: Node) => boolean): void { },
emitEnd(range: TextRange | Node, shouldIgnoreNodeCallback?: (node: Node) => boolean, shouldIgnoreChildrenCallback?: (node: Node) => boolean): void { },
emitPos(pos: number): void { },
changeEmitSourcePos(): void { },
stopOverridingSpan(): void { },
@@ -320,22 +322,26 @@ namespace ts {
return range.pos !== -1 ? skipTrivia(currentSourceFile.text, rangeHasDecorators ? (range as Node).decorators.end : range.pos) : -1;
}
function emitStart(range: TextRange, shouldEmit?: (range: TextRange) => boolean, shouldEmitNested?: (range: TextRange) => boolean) {
if (!shouldEmit || shouldEmit(range)) {
function emitStart(node: Node, shouldIgnoreNodeCallback?: (node: Node) => boolean, shouldIgnoreChildrenCallback?: (node: Node) => boolean): void;
function emitStart(range: TextRange): void;
function emitStart(range: TextRange | Node, shouldIgnoreNodeCallback?: (node: Node) => boolean, shouldIgnoreChildrenCallback?: (node: Node) => boolean) {
if (!(shouldIgnoreNodeCallback && shouldIgnoreNodeCallback(<Node>range))) {
emitPos(getStartPos(range));
}
if (shouldEmitNested && !shouldEmitNested(range)) {
if (shouldIgnoreChildrenCallback && shouldIgnoreChildrenCallback(<Node>range)) {
disable();
}
}
function emitEnd(range: TextRange, shouldEmit?: (range: TextRange) => boolean, shouldEmitNested?: (range: TextRange) => boolean) {
if (shouldEmitNested && !shouldEmitNested(range)) {
function emitEnd(node: Node, shouldIgnoreNodeCallback?: (node: Node) => boolean, shouldIgnoreChildrenCallback?: (node: Node) => boolean): void;
function emitEnd(range: TextRange): void;
function emitEnd(range: TextRange, shouldIgnoreNodeCallback?: (node: Node) => boolean, shouldIgnoreChildrenCallback?: (node: Node) => boolean) {
if (shouldIgnoreChildrenCallback && shouldIgnoreChildrenCallback(<Node>range)) {
enable();
}
if (!shouldEmit || shouldEmit(range)) {
if (!(shouldIgnoreNodeCallback && shouldIgnoreNodeCallback(<Node>range))) {
emitPos(range.end);
}