Skip to content

Commit 9b9abf8

Browse files
DanielRosenwasserDanielRosenwasser
committed
Lint 'outliningElementsCollector.ts'.
1 parent 72bb1d3 commit 9b9abf8

2 files changed

Lines changed: 28 additions & 24 deletions

File tree

‎Jakefile.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -921,11 +921,14 @@ function lintFileAsync(options, path, cb) {
921921
});
922922
}
923923

924+
var servicesLintTargets = ["services.ts", "outliningElementsCollector.ts"].map(function (s) {
925+
return path.join(servicesDirectory, s);
926+
});
924927
var lintTargets = compilerSources
925928
.concat(harnessCoreSources)
926929
.concat(serverCoreSources)
927930
.concat(scriptSources)
928-
.concat([path.join(servicesDirectory, "services.ts")]);
931+
.concat(servicesLintTargets);
929932

930933
desc("Runs tslint on the compiler sources");
931934
task("lint", ["build-rules"], function() {

‎src/services/outliningElementsCollector.ts‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/* @internal */
22
namespace ts {
3-
export module OutliningElementsCollector {
3+
export namespace OutliningElementsCollector {
44
export function collectElements(sourceFile: SourceFile): OutliningSpan[] {
5-
let elements: OutliningSpan[] = [];
6-
let collapseText = "...";
5+
const elements: OutliningSpan[] = [];
6+
const collapseText = "...";
77

88
function addOutliningSpan(hintSpanNode: Node, startElement: Node, endElement: Node, autoCollapse: boolean) {
99
if (hintSpanNode && startElement && endElement) {
10-
let span: OutliningSpan = {
10+
const span: OutliningSpan = {
1111
textSpan: createTextSpanFromBounds(startElement.pos, endElement.end),
1212
hintSpan: createTextSpanFromBounds(hintSpanNode.getStart(), hintSpanNode.end),
1313
bannerText: collapseText,
@@ -19,7 +19,7 @@ namespace ts {
1919

2020
function addOutliningSpanComments(commentSpan: CommentRange, autoCollapse: boolean) {
2121
if (commentSpan) {
22-
let span: OutliningSpan = {
22+
const span: OutliningSpan = {
2323
textSpan: createTextSpanFromBounds(commentSpan.pos, commentSpan.end),
2424
hintSpan: createTextSpanFromBounds(commentSpan.pos, commentSpan.end),
2525
bannerText: collapseText,
@@ -30,15 +30,15 @@ namespace ts {
3030
}
3131

3232
function addOutliningForLeadingCommentsForNode(n: Node) {
33-
let comments = ts.getLeadingCommentRangesOfNode(n, sourceFile);
33+
const comments = ts.getLeadingCommentRangesOfNode(n, sourceFile);
3434

3535
if (comments) {
3636
let firstSingleLineCommentStart = -1;
3737
let lastSingleLineCommentEnd = -1;
3838
let isFirstSingleLineComment = true;
3939
let singleLineCommentCount = 0;
4040

41-
for (let currentComment of comments) {
41+
for (const currentComment of comments) {
4242

4343
// For single line comments, combine consecutive ones (2 or more) into
4444
// a single span from the start of the first till the end of the last
@@ -64,14 +64,15 @@ namespace ts {
6464
}
6565
}
6666

67-
function combineAndAddMultipleSingleLineComments(count: number, start: number, end: number) {
67+
function combineAndAddMultipleSingleLineComments(count: number, start: number, end: number) {
68+
6869
// Only outline spans of two or more consecutive single line comments
6970
if (count > 1) {
70-
let multipleSingleLineComments = {
71+
const multipleSingleLineComments = {
7172
pos: start,
7273
end: end,
7374
kind: SyntaxKind.SingleLineCommentTrivia
74-
}
75+
};
7576

7677
addOutliningSpanComments(multipleSingleLineComments, /*autoCollapse*/ false);
7778
}
@@ -82,7 +83,7 @@ namespace ts {
8283
}
8384

8485
let depth = 0;
85-
let maxDepth = 20;
86+
const maxDepth = 20;
8687
function walk(n: Node): void {
8788
if (depth > maxDepth) {
8889
return;
@@ -95,9 +96,9 @@ namespace ts {
9596
switch (n.kind) {
9697
case SyntaxKind.Block:
9798
if (!isFunctionBlock(n)) {
98-
let parent = n.parent;
99-
let openBrace = findChildOfKind(n, SyntaxKind.OpenBraceToken, sourceFile);
100-
let closeBrace = findChildOfKind(n, SyntaxKind.CloseBraceToken, sourceFile);
99+
const parent = n.parent;
100+
const openBrace = findChildOfKind(n, SyntaxKind.OpenBraceToken, sourceFile);
101+
const closeBrace = findChildOfKind(n, SyntaxKind.CloseBraceToken, sourceFile);
101102

102103
// Check if the block is standalone, or 'attached' to some parent statement.
103104
// If the latter, we want to collaps the block, but consider its hint span
@@ -117,13 +118,13 @@ namespace ts {
117118

118119
if (parent.kind === SyntaxKind.TryStatement) {
119120
// Could be the try-block, or the finally-block.
120-
let tryStatement = <TryStatement>parent;
121+
const tryStatement = <TryStatement>parent;
121122
if (tryStatement.tryBlock === n) {
122123
addOutliningSpan(parent, openBrace, closeBrace, autoCollapse(n));
123124
break;
124125
}
125126
else if (tryStatement.finallyBlock === n) {
126-
let finallyKeyword = findChildOfKind(tryStatement, SyntaxKind.FinallyKeyword, sourceFile);
127+
const finallyKeyword = findChildOfKind(tryStatement, SyntaxKind.FinallyKeyword, sourceFile);
127128
if (finallyKeyword) {
128129
addOutliningSpan(finallyKeyword, openBrace, closeBrace, autoCollapse(n));
129130
break;
@@ -135,7 +136,7 @@ namespace ts {
135136

136137
// Block was a standalone block. In this case we want to only collapse
137138
// the span of the block, independent of any parent span.
138-
let span = createTextSpanFromBounds(n.getStart(), n.end);
139+
const span = createTextSpanFromBounds(n.getStart(), n.end);
139140
elements.push({
140141
textSpan: span,
141142
hintSpan: span,
@@ -147,8 +148,8 @@ namespace ts {
147148
// Fallthrough.
148149

149150
case SyntaxKind.ModuleBlock: {
150-
let openBrace = findChildOfKind(n, SyntaxKind.OpenBraceToken, sourceFile);
151-
let closeBrace = findChildOfKind(n, SyntaxKind.CloseBraceToken, sourceFile);
151+
const openBrace = findChildOfKind(n, SyntaxKind.OpenBraceToken, sourceFile);
152+
const closeBrace = findChildOfKind(n, SyntaxKind.CloseBraceToken, sourceFile);
152153
addOutliningSpan(n.parent, openBrace, closeBrace, autoCollapse(n));
153154
break;
154155
}
@@ -157,14 +158,14 @@ namespace ts {
157158
case SyntaxKind.EnumDeclaration:
158159
case SyntaxKind.ObjectLiteralExpression:
159160
case SyntaxKind.CaseBlock: {
160-
let openBrace = findChildOfKind(n, SyntaxKind.OpenBraceToken, sourceFile);
161-
let closeBrace = findChildOfKind(n, SyntaxKind.CloseBraceToken, sourceFile);
161+
const openBrace = findChildOfKind(n, SyntaxKind.OpenBraceToken, sourceFile);
162+
const closeBrace = findChildOfKind(n, SyntaxKind.CloseBraceToken, sourceFile);
162163
addOutliningSpan(n, openBrace, closeBrace, autoCollapse(n));
163164
break;
164165
}
165166
case SyntaxKind.ArrayLiteralExpression:
166-
let openBracket = findChildOfKind(n, SyntaxKind.OpenBracketToken, sourceFile);
167-
let closeBracket = findChildOfKind(n, SyntaxKind.CloseBracketToken, sourceFile);
167+
const openBracket = findChildOfKind(n, SyntaxKind.OpenBracketToken, sourceFile);
168+
const closeBracket = findChildOfKind(n, SyntaxKind.CloseBracketToken, sourceFile);
168169
addOutliningSpan(n, openBracket, closeBracket, autoCollapse(n));
169170
break;
170171
}

0 commit comments

Comments
 (0)