cleanup

aozgaa · aozgaa · commit 6029b5cce80f · 2017-08-16T18:12:28.000-07:00
diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts
@@ -44,7 +44,6 @@ namespace ts.formatting {
                     return findFirstNonWhitespaceColumn(getStartPositionOfLine(commentStartLine, sourceFile), position, sourceFile, options);
                 }
 
-                // get first character of previous line -- if it is '*', move back one more character (or stay at 0)
                 const startPostionOfLine = getStartPositionOfLine(previousLine, sourceFile);
                 const { column, character } = findFirstNonWhitespaceCharacterAndColumn(startPostionOfLine, position, sourceFile, options);
 
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -772,7 +772,7 @@ namespace ts {
                 }
             }
 
-            Debug.assert(startNode !== undefined || n.kind === SyntaxKind.SourceFile || isJSDocCommentContainingNode(n) || n.kind === SyntaxKind.JsxSelfClosingElement);
+            Debug.assert(startNode !== undefined || n.kind === SyntaxKind.SourceFile || isJSDocCommentContainingNode(n));
 
             // Here we know that none of child token nodes embrace the position,
             // the only known case is when position is at the end of the file.
@@ -866,7 +866,6 @@ namespace ts {
         return isJsxText(node) && node.containsOnlyWhiteSpaces;
     }
 
-
     export function isInTemplateString(sourceFile: SourceFile, position: number) {
         const token = getTokenAtPosition(sourceFile, position, /*includeJsDocComment*/ false);
         return isTemplateLiteralKind(token.kind) && position > token.getStart(sourceFile);

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ namespace ts.formatting {`
`44`	`44`	`return findFirstNonWhitespaceColumn(getStartPositionOfLine(commentStartLine, sourceFile), position, sourceFile, options);`
`45`	`45`	`}`
`46`	`46`
`47`		`- // get first character of previous line -- if it is '*', move back one more character (or stay at 0)`
`48`	`47`	`const startPostionOfLine = getStartPositionOfLine(previousLine, sourceFile);`
`49`	`48`	`const { column, character } = findFirstNonWhitespaceCharacterAndColumn(startPostionOfLine, position, sourceFile, options);`
`50`	`49`
Original file line number	Diff line number	Diff line change
`@@ -772,7 +772,7 @@ namespace ts {`
`772`	`772`	`}`
`773`	`773`	`}`
`774`	`774`
`775`		`- Debug.assert(startNode !== undefined \|\| n.kind === SyntaxKind.SourceFile \|\| isJSDocCommentContainingNode(n) \|\| n.kind === SyntaxKind.JsxSelfClosingElement);`
	`775`	`+ Debug.assert(startNode !== undefined \|\| n.kind === SyntaxKind.SourceFile \|\| isJSDocCommentContainingNode(n));`
`776`	`776`
`777`	`777`	`// Here we know that none of child token nodes embrace the position,`
`778`	`778`	`// the only known case is when position is at the end of the file.`
`@@ -866,7 +866,6 @@ namespace ts {`
`866`	`866`	`return isJsxText(node) && node.containsOnlyWhiteSpaces;`
`867`	`867`	`}`
`868`	`868`
`869`		`-`
`870`	`869`	`export function isInTemplateString(sourceFile: SourceFile, position: number) {`
`871`	`870`	`const token = getTokenAtPosition(sourceFile, position, /includeJsDocComment/ false);`
`872`	`871`	`return isTemplateLiteralKind(token.kind) && position > token.getStart(sourceFile);`