maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

outlinging comments v0.2

Browse source
This commit is contained in:
Ahmad Farid 2015-04-02 16:23:22 -07:00
parent 27f349ca7d
commit 64fbf94940
2 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/types.ts
View file

@ -969,7 +969,7 @@ module ts {
kind: SyntaxKind;
}
//* Source files are declarations when they are external modules.
// Source files are declarations when they are external modules.
export interface SourceFile extends Declaration {
statements: NodeArray<ModuleElement>;
endOfFileToken: Node;

45
src/services/outliningElementsCollector.ts
View file

@ -32,9 +32,8 @@ module ts {
}
function addOutliningForLeadingCommentsForNode(n: Node) {
let comments = ts.getLeadingCommentRangesOfNode(n, sourceFile);
// if we found comments
let comments = ts.getLeadingCommentRangesOfNode(n, sourceFile);
if (comments) {
let firstSingleLineCommentStart = -1;
let lastSingleLineCommentEnd = -1;
@ -44,25 +43,42 @@ module ts {
for (let i = 0; i < comments.length; i++) {
let currentComment = comments[i];
if (currentComment.kind == SyntaxKind.SingleLineCommentTrivia) {
// For single line comments, combine consecutive ones (2 or more) into
// a single span from the start of the first till the end of the last
if (currentComment.kind === SyntaxKind.SingleLineCommentTrivia) {
if (isFirstSingleLineComment) {
firstSingleLineCommentStart = currentComment.pos;
}
isFirstSingleLineComment = false;
lastSingleLineCommentEnd = currentComment.end;
singleLineCommentCount++;
}
if (currentComment.kind == SyntaxKind.MultiLineCommentTrivia)
{
// add the block
}
else {
combineAndAddMultipleSingleLineComments(singleLineCommentCount, firstSingleLineCommentStart, lastSingleLineCommentEnd);
addOutliningSpanComments(currentComment, false);
// see if we have multiple single line ones
singleLineCommentCount = 0;
lastSingleLineCommentEnd = -1;
isFirstSingleLineComment = true;
}
}
combineAndAddMultipleSingleLineComments(singleLineCommentCount, firstSingleLineCommentStart, lastSingleLineCommentEnd);
}
}
function combineAndAddMultipleSingleLineComments(count: number, start: number, end: number) {
// Only outline spans of two or more consecutive single line comments
if (count > 1) {
let multipleSingleLineComments = {
pos: start,
end: end,
kind: SyntaxKind.SingleLineCommentTrivia
}
addOutliningSpanComments(multipleSingleLineComments, false);
}
}
@ -153,9 +169,6 @@ module ts {
let closeBracket = findChildOfKind(n, SyntaxKind.CloseBracketToken, sourceFile);
addOutliningSpan(n, openBracket, closeBracket, autoCollapse(n));
break;
case SyntaxKind.Constructor:
// addOutliningForLeadingCommentsForNode(n);
break;
}
depth++;
forEachChild(n, walk);