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

cleanup

Browse source
This commit is contained in:
Arthur Ozga 2017-08-14 16:43:20 -07:00
parent de92e98770
commit b2188ad66c
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/services/formatting/formatting.ts
View file

@ -1164,10 +1164,15 @@ namespace ts.formatting {
const { column, character } = SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(commentLineStart, commentStart, sourceFile, options); const { column, character } = SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(commentLineStart, commentStart, sourceFile, options);
return column + /*length after whitespace ends*/ range.pos - (commentLineStart + character); return column + /*length after whitespace ends*/ range.pos - (commentLineStart + character);
} }
return undefined; return -1;
} }
export function getRangeOfEnclosingComment(sourceFile: SourceFile, position: number, onlyMultiLine: boolean): CommentRange | undefined { export function getRangeOfEnclosingComment(
sourceFile: SourceFile,
position: number,
onlyMultiLine: boolean,
tokenAtPosition = getTokenAtPosition(sourceFile, position, /*includeJsDocComment*/ false),
predicate?: (c: CommentRange) => boolean): CommentRange | undefined {
// Considering a fixed position, // Considering a fixed position,
// - trailing comments are those following and on the same line as the position. // - trailing comments are those following and on the same line as the position.
// - leading comments are those in the range [position, start of next non-trivia token) // - leading comments are those in the range [position, start of next non-trivia token)
@ -1178,16 +1183,28 @@ namespace ts.formatting {
// tokens contain all comments in a sourcefile disjointly. // tokens contain all comments in a sourcefile disjointly.
const precedingToken = findPrecedingToken(position, sourceFile); const precedingToken = findPrecedingToken(position, sourceFile);
const trailingRangesOfPreviousToken = precedingToken && getTrailingCommentRanges(sourceFile.text, precedingToken.end); const trailingRangesOfPreviousToken = precedingToken && getTrailingCommentRanges(sourceFile.text, precedingToken.end);
const leadingCommentRangesOfNextToken = getLeadingCommentRangesOfNode(getTokenAtPosition(sourceFile, position, /*includeJsDocComment*/ false), sourceFile); const leadingCommentRangesOfNextToken = getLeadingCommentRangesOfNode(tokenAtPosition, sourceFile);
const commentRanges = trailingRangesOfPreviousToken && leadingCommentRangesOfNextToken ? const commentRanges = trailingRangesOfPreviousToken && leadingCommentRangesOfNextToken ?
trailingRangesOfPreviousToken.concat(leadingCommentRangesOfNextToken) : trailingRangesOfPreviousToken.concat(leadingCommentRangesOfNextToken) :
trailingRangesOfPreviousToken || leadingCommentRangesOfNextToken; trailingRangesOfPreviousToken || leadingCommentRangesOfNextToken;
if (commentRanges) { if (commentRanges) {
for (const range of commentRanges) { for (const range of commentRanges) {
// We need to extend the range when in an unclosed multi-line comment. // The end marker of a single-line comment does not include the newline character.
if (range.pos < position && position < range.end || // With caret at `^`, in the following case, we are inside a comment (^ denotes the cursor position):
position === range.end && (range.kind === SyntaxKind.SingleLineCommentTrivia || position === sourceFile.getFullWidth())) { //
return onlyMultiLine && range.kind !== SyntaxKind.MultiLineCommentTrivia ? undefined : range; // // asdf ^\n
//
// But for closed multi-line comments, we don't want to be inside the comment in the following case:
//
// /* asdf */^
//
// However, unterminated multi-line comments *do* contain their end.
//
// Internally, we represent the end of the comment at the newline and closing '/', respectively.
//
if ((range.pos < position && position < range.end ||
position === range.end && (range.kind === SyntaxKind.SingleLineCommentTrivia || position === sourceFile.getFullWidth()))) {
return (range.kind === SyntaxKind.MultiLineCommentTrivia || !onlyMultiLine) && (!predicate || predicate(range)) ? range : undefined;
} }
} }
} }