[docgen] don't consider lines with only WS for common indent detection (

#2131) fixes #2130
ponylang · Aug 4, 2017 · 9bbcaeb · 9bbcaeb
1 parent dbd777a
commit 9bbcaeb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/libponyc/ast/lexer.c b/src/libponyc/ast/lexer.c
@@ -542,6 +542,7 @@ static void normalise_string(lexer_t* lexer)
   size_t ws = lexer->buflen;
   size_t ws_this_line = 0;
   bool in_leading_ws = true;
+  bool has_non_ws = false;
 
   for(size_t i = 0; i < lexer->buflen; i++)
   {
@@ -555,7 +556,10 @@ static void normalise_string(lexer_t* lexer)
       }
       else
       {
-        if(ws_this_line < ws)
+        if(!isspace(c))
+          has_non_ws = true;
+
+        if(has_non_ws && (ws_this_line < ws))
           ws = ws_this_line;
 
         in_leading_ws = false;
@@ -565,6 +569,7 @@ static void normalise_string(lexer_t* lexer)
     if(c == '\n')
     {
       ws_this_line = 0;
+      has_non_ws = false;
       in_leading_ws = true;
     }
   }

diff --git a/test/libponyc/lexer.cc b/test/libponyc/lexer.cc
@@ -539,6 +539,15 @@ TEST_F(LexerTest, TripleStringWithLeadingEmptyLine)
   DO(test(src));
 }
 
+TEST_F(LexerTest, TripleStringWithLeadingEmptyLineAndIndentedFirstLine)
+{
+  const char* src = "\"\"\"\n  Foo\n\n  bar\"\"\"";
+
+  expect(1, 1, TK_STRING, "Foo\n\nbar");
+  expect(4, 9, TK_EOF, "EOF");
+  DO(test(src));
+}
+
 
 TEST_F(LexerTest, TripleStringWithNonLeadingEmptyLine)
 {