Merge pull request microsoft#22842 from uniqueiniquity/outliningLineEnding

uniqueiniquity · web-flow · commit 383751866e6e · 2018-03-23T16:02:33.000-07:00
Make region outlining more sensitive to CRLF
diff --git a/src/services/outliningElementsCollector.ts b/src/services/outliningElementsCollector.ts
@@ -33,7 +33,7 @@ namespace ts.OutliningElementsCollector {
             const currentLineStart = lineStarts[i];
             const lineEnd = i + 1 === lineStarts.length ? sourceFile.getEnd() : lineStarts[i + 1] - 1;
             const lineText = sourceFile.text.substring(currentLineStart, lineEnd);
-            const result = lineText.match(/^\s*\/\/\s*#(end)?region(?:\s+(.*))?$/);
+            const result = lineText.match(/^\s*\/\/\s*#(end)?region(?:\s+(.*))?(?:\r)?$/);
             if (!result || isInComment(sourceFile, currentLineStart)) {
                 continue;
             }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ namespace ts.OutliningElementsCollector {`
`33`	`33`	`const currentLineStart = lineStarts[i];`
`34`	`34`	`const lineEnd = i + 1 === lineStarts.length ? sourceFile.getEnd() : lineStarts[i + 1] - 1;`
`35`	`35`	`const lineText = sourceFile.text.substring(currentLineStart, lineEnd);`
`36`		`- const result = lineText.match(/^\s\/\/\s#(end)?region(?:\s+(.*))?$/);`
	`36`	`+ const result = lineText.match(/^\s\/\/\s#(end)?region(?:\s+(.*))?(?:\r)?$/);`
`37`	`37`	`if (!result \|\| isInComment(sourceFile, currentLineStart)) {`
`38`	`38`	`continue;`
`39`	`39`	`}`