microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-23 07:07:09 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

add newline if we directly precede the declaration

Browse Source
This commit is contained in:
Arthur Ozga
2015-07-24 16:25:32 -07:00
parent 80db03efaa
commit 98d2bcbf88
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/services/services.ts
View File

@@ -6786,19 +6786,19 @@ namespace ts {
log("getDocCommentScaffoldingAtPosition: getCurrentSourceFile: " + (new Date().getTime() - start));
// Check if in a context where we don't want to perform any insertion
if (isInString(sourceFile, position) || isInComment(sourceFile, position)) {
if (isInString(sourceFile, position) || isInComment(sourceFile, position) || hasDocComment(sourceFile, position)) {
return nullResult;
}
let nodeAtPos = getTokenAtPosition(sourceFile, position);
if (!nodeAtPos || nodeAtPos.getStart() < position) {
let nodeStart = nodeAtPos.getStart()
if (!nodeAtPos || nodeStart < position) {
return nullResult;
}
let containingFunction = <FunctionDeclaration>getAncestor(nodeAtPos, SyntaxKind.FunctionDeclaration);
if (hasDocComment(sourceFile, position) || !containingFunction || containingFunction.getStart() < position) {
if (!containingFunction || containingFunction.getStart() < position) {
return nullResult;
}
@@ -6815,7 +6815,8 @@ namespace ts {
/* opening comment */ "/**\n" +
/* first line for function info */ indentationStr + " * \n" +
/* paramters */ docParams.reduce((prev, cur) => prev + cur, "") +
/* closing comment */ indentationStr + " */";
/* closing comment */ indentationStr + " */" +
/* newline if at decl start */ (nodeStart === position ? "\n" + indentationStr : "");
let cursorOffset = /* "/**\n" */ 4 + indentationStr.length + /* " * " */ 3;