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

Use enum for parser state instead of 2 booleans

Browse Source 
Plus cleanup some lint
This commit is contained in:
Nathan Shively-Sanders
2016-09-01 10:05:56 -07:00
parent 2b9624672d
commit 275a4bd4f3
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/compiler/parser.ts
View File

@@ -6151,6 +6151,12 @@ namespace ts {
return comment;
}
const enum TagState {
BeginningOfLine,
SawAsterisk,
SavingComments
}
export function parseJSDocCommentWorker(start: number, length: number): JSDoc {
const content = sourceText;
start = start || 0;
@@ -6359,8 +6365,7 @@ namespace ts {
function parseTagComments(indent: number) {
const comments: string[] = [];
let savingComments = false;
let seenAsterisk = true;
let state = TagState.SawAsterisk;
let done = false;
let margin: number | undefined;
let text: string;
@@ -6375,9 +6380,8 @@ namespace ts {
text = scanner.getTokenText();
switch (token()) {
case SyntaxKind.NewLineTrivia:
if (seenAsterisk) {
savingComments = false;
seenAsterisk = false;
if (state >= TagState.SawAsterisk) {
state = TagState.BeginningOfLine;
comments.push(text);
}
indent = 0;
@@ -6386,7 +6390,7 @@ namespace ts {
done = true;
break;
case SyntaxKind.WhitespaceTrivia:
if (savingComments && seenAsterisk) {
if (state === TagState.SavingComments) {
pushComment(text);
}
else {
@@ -6398,18 +6402,16 @@ namespace ts {
}
break;
case SyntaxKind.AsteriskToken:
if (!seenAsterisk) {
if (state === TagState.BeginningOfLine) {
// leading asterisks start recording on the *next* (non-whitespace) token
savingComments = false;
state = TagState.SawAsterisk;
indent += text.length;
break;
}
// FALLTHROUGH to gather comments
// FALLTHROUGH otherwise to record the * as a comment
default:
if (seenAsterisk) {
savingComments = true; // leading identifiers start recording as well
pushComment(text);
}
seenAsterisk = true;
state = TagState.SavingComments; // leading identifiers start recording as well
pushComment(text);
break;
}
if (!done) {

2
src/compiler/utilities.ts
View File

@@ -1380,7 +1380,7 @@ namespace ts {
function getJSDocTags(node: Node, checkParentVariableStatement: boolean): JSDocTag[] {
return getJSDocs(node, checkParentVariableStatement, docs => {
let result: JSDocTag[] = [];
const result: JSDocTag[] = [];
for (const doc of docs) {
if (doc.tags) {
result.push(...doc.tags);