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

Exclude region delimiters in multiline comments

Browse Source
This commit is contained in:
uniqueiniquity 2017-08-21 11:19:21 -07:00
parent 4971e3152c
commit 562d988614
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/services/outliningElementsCollector.ts
View File

@ -107,26 +107,28 @@ namespace ts.OutliningElementsCollector {
}
function isRegionStart(start: number, end: number) {
const comment = sourceFile.text.substring(start, end);
const result = comment.match(regionStart);
if (!ts.formatting.getRangeOfEnclosingComment(sourceFile, start, /*onlyMultiLine*/ true)) {
const comment = sourceFile.text.substring(start, end);
const result = comment.match(regionStart);
if (result && result.length > 0) {
const sections = result[0].split(" ").filter(function (s) { return s !== ""; });
if (result && result.length > 0) {
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]));
if (sections[0] === "//") {
if (sections.length > 2) {
return result[0].substring(result[0].indexOf(sections[2]));
}
else {
return regionText;
}
}
else {
return regionText;
}
}
else {
if (sections.length > 1) {
return result[0].substring(result[0].indexOf(sections[1]));
}
else {
return regionText;
if (sections.length > 1) {
return result[0].substring(result[0].indexOf(sections[1]));
}
else {
return regionText;
}
}
}
}
@ -134,8 +136,11 @@ namespace ts.OutliningElementsCollector {
}
function isRegionEnd(start: number, end: number) {
const comment = sourceFile.text.substring(start, end);
return comment.match(regionEnd);
if (!ts.formatting.getRangeOfEnclosingComment(sourceFile, start, /*onlyMultiLine*/ true)) {
const comment = sourceFile.text.substring(start, end);
return comment.match(regionEnd);
}
return undefined;
}
function gatherRegions(): void {