Merge pull request #32392 from allevato/windows-comment-newlines

CodaFi · web-flow · commit 2b9fd78b91e0 · 2020-06-16T21:20:36.000-07:00
Fix Windows CR-LF detection in libMarkup.
diff --git a/lib/Markup/LineList.cpp b/lib/Markup/LineList.cpp
@@ -78,7 +78,7 @@ static unsigned measureASCIIArt(StringRef S, unsigned NumLeadingSpaces) {
 
   if (S.startswith(" * "))
     return NumLeadingSpaces + 3;
-  if (S.startswith(" *\n") || S.startswith(" *\n\r"))
+  if (S.startswith(" *\n") || S.startswith(" *\r\n"))
     return NumLeadingSpaces + 2;
   return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ static unsigned measureASCIIArt(StringRef S, unsigned NumLeadingSpaces) {`
`78`	`78`
`79`	`79`	`if (S.startswith(" * "))`
`80`	`80`	`return NumLeadingSpaces + 3;`
`81`		`- if (S.startswith(" \n") \|\| S.startswith(" \n\r"))`
	`81`	`+ if (S.startswith(" \n") \|\| S.startswith(" \r\n"))`
`82`	`82`	`return NumLeadingSpaces + 2;`
`83`	`83`	`return 0;`
`84`	`84`	`}`