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

Fix name capture logic

Browse Source
This commit is contained in:
uniqueiniquity 2017-08-09 09:00:46 -07:00
parent f91c23b25f
commit 0b3ec247bc
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/services/outliningElementsCollector.ts
View File

@ -8,8 +8,8 @@ namespace ts.OutliningElementsCollector {
let depth = 0;
const regions: RegionRange[] = [];
const regionText = "#region";
const regionStart = new RegExp("// #region( .+| *)", "g");
const regionEnd = new RegExp("// #endregion *");
const regionStart = new RegExp("//\\s*#region(\\s+.*)?$", "gm");
const regionEnd = new RegExp("//\\s*#endregion(\\s|$)", "gm");
walk(sourceFile);
gatherRegions();
@ -165,12 +165,23 @@ namespace ts.OutliningElementsCollector {
const result = comment.match(regionStart);
if (result && result.length > 0) {
const name = result[0].substring(10).trim();
if (name) {
return name;
const sections = result[0].split(" ").filter(function (s) { return s !== ""; });
if (sections[0] === "//") {
if (sections.length > 2) {
return result[0].substring(result[0].indexOf(sections[2]));
}
else {
return regionText;
}
}
else {
return regionText;
if (sections.length > 1) {
return result[0].substring(result[0].indexOf(sections[1]));
}
else {
return regionText;
}
}
}
return "";