microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-03-06 02:00:01 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Combine and simplify regex

Browse Source
This commit is contained in:
uniqueiniquity 2017-09-15 15:33:34 -07:00
parent 7781245f1e
commit 3dfeb2d0f4
2 changed files with 24 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/services/outliningElementsCollector.ts
View File

@ -3,8 +3,7 @@ namespace ts.OutliningElementsCollector {
const collapseText = "...";
const maxDepth = 20;
const defaultLabel = "#region";
const regionStart = new RegExp("^//\\s*#region(\\s+.*)?$");
const regionEnd = new RegExp("^//\\s*#endregion(\\s|$)");
const regionMatch = new RegExp("^\\s*//\\s*(#region|#endregion)(?:\\s+(.*))?$");
interface RegionRange extends TextRange {
name?: string;
@ -111,55 +110,31 @@ namespace ts.OutliningElementsCollector {
return isFunctionBlock(node) && node.parent.kind !== SyntaxKind.ArrowFunction;
}
function getRegionName(start: number, end: number) {
if (!isInComment(sourceFile, start)) {
const comment = sourceFile.text.substring(start, end).trim();
const result = comment.match(regionStart);
if (result && result.length > 0) {
const label = result.pop();
if (label) {
return label.trim();
}
else {
return defaultLabel;
}
}
}
return "";
}
function isRegionEnd(start: number, end: number) {
if (!isInComment(sourceFile, start)) {
const comment = sourceFile.text.substring(start, end).trim();
return !!comment.match(regionEnd);
}
return false;
}
function gatherRegions(): void {
const lineStarts = sourceFile.getLineStarts();
for (let i = 0; i < lineStarts.length; i++) {
const currentLineStart = lineStarts[i];
const lineEnd = lineStarts[i + 1] - 1 || sourceFile.getEnd();
const comment = sourceFile.text.substring(currentLineStart, lineEnd);
const result = comment.match(regionMatch);
const name = getRegionName(currentLineStart, lineEnd);
if (name) {
const start = sourceFile.getFullText().indexOf("//", currentLineStart);
const region: RegionRange = {
pos: start,
end: lineEnd,
name,
};
regions.push(region);
}
else if (isRegionEnd(currentLineStart, lineEnd)) {
const region = regions.pop();
if (region) {
region.end = lineEnd;
addOutliningSpanRegions(region);
if (result && !isInComment(sourceFile, currentLineStart)) {
if (result[1] === "#region") {
const start = sourceFile.getFullText().indexOf("//", currentLineStart);
const region: RegionRange = {
pos: start,
end: lineEnd,
name: result[2] || defaultLabel,
};
regions.push(region);
}
else {
const region = regions.pop();
if (region) {
region.end = lineEnd;
addOutliningSpanRegions(region);
}
}
}
}

5
tests/cases/fourslash/getOutliningSpansForRegions.ts
View File

@ -5,6 +5,11 @@
////
////// #endregion|]
////
////// region without label with trailing spaces
////[|// #region
////
////// #endregion|]
////
////// region with label
////[|// #region label1
////