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

code cleanup: inline functions

Browse Source
This commit is contained in:
Vladimir Matveev
2014-11-06 18:00:15 -08:00
parent 91065ec92c
commit 7e595f4701
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/services/format.ts
View File

@@ -120,11 +120,8 @@ module ts.formatting {
return find(sourceFile);
function find(n: Node): Node {
if (!n) {
return undefined;
}
var candidate = forEachChild(n, c => startEndContainsRange(c.getStart(sourceFile), c.end, range) && c);
return find(candidate) || n;
return (candidate && find(candidate)) || n;
}
}
@@ -207,13 +204,8 @@ module ts.formatting {
return edits;
function getIndentationDelta(node: Node, lineAdded: boolean): number {
if (node.parent && SmartIndenter.shouldIndentChildNode(node.parent, node)) {
return lineAdded ? options.IndentSize : - options.IndentSize;
}
return 0;
}
// local functions
function getDynamicIndentation(node: Node, nodeStartLine: number, indentation: number, commentIndentation: number, delta: number): DynamicIndentation {
return {
getEffectiveCommentIndentation: (line) => {
@@ -240,10 +232,15 @@ module ts.formatting {
getCommentIndentation: () => commentIndentation,
getDelta: () => delta,
recomputeIndentation: (lineAdded) => {
var delta = getIndentationDelta(node, lineAdded);
if (delta) {
indentation += delta;
commentIndentation += delta;
if (node.parent && SmartIndenter.shouldIndentChildNode(node.parent, node)) {
if (lineAdded) {
indentation += options.IndentSize;
commentIndentation += options.IndentSize;
}
else {
indentation -= options.IndentSize;
commentIndentation -= options.IndentSize;
}
}
},
increaseCommentIndentation: (delta) => {