From ca80c290d129a0099dd628c959f7be60371ae327 Mon Sep 17 00:00:00 2001
From: Hannes Kaeufler <hannes.kaeufler@gmail.com>
Date: Tue, 27 Nov 2018 21:31:08 +0100
Subject: [PATCH 1/5] Extract function for compound conditional

---
 source/runner/templates/githubIssueTemplate.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/runner/templates/githubIssueTemplate.ts b/source/runner/templates/githubIssueTemplate.ts
index cfd6c8fdd..4c36fc1e6 100644
--- a/source/runner/templates/githubIssueTemplate.ts
+++ b/source/runner/templates/githubIssueTemplate.ts
@@ -12,7 +12,7 @@ import { Violation, isInline } from "../../dsl/Violation"
  * @returns {string} HTML
  */
 function table(name: string, emoji: string, violations: Violation[]): string {
-  if (violations.length === 0 || violations.every(violation => !violation.message)) {
+  if (noViolationsOrAllOfThemEmpty(violations)) {
     return ""
   }
   return `
@@ -37,6 +37,10 @@ function table(name: string, emoji: string, violations: Violation[]): string {
 `
 }
 
+function noViolationsOrAllOfThemEmpty(violations: Violation[]) {
+  return violations.length === 0 || violations.every(violation => !violation.message)
+}
+
 function getSummary(label: string, violations: Violation[]): string {
   return violations
     .map(x => v.truncate(x.message, 20))

From c4fec1939df0f482da5ed95266778ccd732ab082 Mon Sep 17 00:00:00 2001
From: Hannes Kaeufler <hannes.kaeufler@gmail.com>
Date: Tue, 27 Nov 2018 22:30:36 +0100
Subject: [PATCH 2/5] Add back space for messages containing markdown.

For github to render markdown in tables there has to be some space
around the message. This will add a <p> and render the markdown.
However, it also leads to some funky vertical spacing due to the nature
of some browser styling for the <p> tag.

This commit looks at the message to determine if it contains markdown,
if yes, then add the space for proper rendering. If not, render the
compacter table to get nice vertical alignment.
---
 .../_githubIssueTemplates.test.ts.snap        | 57 +++++++++++++++++--
 .../_tests/_githubIssueTemplates.test.ts      | 13 ++++-
 .../runner/templates/githubIssueTemplate.ts   | 30 +++++++---
 3 files changed, 85 insertions(+), 15 deletions(-)

diff --git a/source/runner/templates/_tests/__snapshots__/_githubIssueTemplates.test.ts.snap b/source/runner/templates/_tests/__snapshots__/_githubIssueTemplates.test.ts.snap
index 5325a21e6..9748f75eb 100644
--- a/source/runner/templates/_tests/__snapshots__/_githubIssueTemplates.test.ts.snap
+++ b/source/runner/templates/_tests/__snapshots__/_githubIssueTemplates.test.ts.snap
@@ -43,7 +43,10 @@ exports[`generating inline messages Shows correct messages for inline/regular vi
   </thead>
   <tbody><tr>
       <td>:warning:</td>
-      <td>**File.swift#L10** - Test message</td>
+      <td>
+
+  **File.swift#L10** - Test message
+  </td>
     </tr>
   
 <tr>
@@ -61,7 +64,40 @@ exports[`generating inline messages Shows correct messages for inline/regular vi
 "
 `;
 
-exports[`generating messages leaves space between <td>s to allow GitHub to render message content as markdown 1`] = `
+exports[`generating messages avoids adding space inside the <td> for proper vertical alignment if the message does not contain any markdown 1`] = `
+"
+<!--
+  0 failure: 
+  0 warning: 
+  1 messages
+  
+  DangerID: danger-id-example-id;
+-->
+
+
+
+<table>
+  <thead>
+    <tr>
+      <th width=\\"50\\"></th>
+      <th width=\\"100%\\" data-danger-table=\\"true\\">Messages</th>
+    </tr>
+  </thead>
+  <tbody><tr>
+      <td>:book:</td>
+      <td>no markdown here</td>
+    </tr>
+  </tbody>
+</table>
+
+
+<p align=\\"right\\">
+  Generated by :no_entry_sign: <a href=\\"http://github.com/danger/danger-js/\\">dangerJS</a>
+</p>
+"
+`;
+
+exports[`generating messages leaves space between <td>s to allow GitHub to render message content as markdown if the message contains any 1`] = `
 "
 <!--
   1 failure:  **Failure:** Some...
@@ -80,7 +116,10 @@ exports[`generating messages leaves space between <td>s to allow GitHub to rende
   </thead>
   <tbody><tr>
       <td>:no_entry_sign:</td>
-      <td>**Failure:** Something failed!</td>
+      <td>
+
+  **Failure:** Something failed!
+  </td>
     </tr>
   </tbody>
 </table>
@@ -95,7 +134,10 @@ exports[`generating messages leaves space between <td>s to allow GitHub to rende
   </thead>
   <tbody><tr>
       <td>:warning:</td>
-      <td>_Maybe you meant to run \`yarn install\`?_</td>
+      <td>
+
+  _Maybe you meant to run \`yarn install\`?_
+  </td>
     </tr>
   </tbody>
 </table>
@@ -110,11 +152,14 @@ exports[`generating messages leaves space between <td>s to allow GitHub to rende
   </thead>
   <tbody><tr>
       <td>:book:</td>
-      <td>\`\`\`ts
+      <td>
+
+  \`\`\`ts
 function add(a: number, b: number): number {
   return a + b
 }
-\`\`\`</td>
+\`\`\`
+  </td>
     </tr>
   </tbody>
 </table>
diff --git a/source/runner/templates/_tests/_githubIssueTemplates.test.ts b/source/runner/templates/_tests/_githubIssueTemplates.test.ts
index 225781f47..8142c3264 100644
--- a/source/runner/templates/_tests/_githubIssueTemplates.test.ts
+++ b/source/runner/templates/_tests/_githubIssueTemplates.test.ts
@@ -60,7 +60,7 @@ describe("generating messages", () => {
     expect(issues).toContain(expected)
   })
 
-  it("leaves space between <td>s to allow GitHub to render message content as markdown", () => {
+  it("leaves space between <td>s to allow GitHub to render message content as markdown if the message contains any", () => {
     const issues = githubResultsTemplate("example-id", {
       fails: [{ message: "**Failure:** Something failed!" }],
       warnings: [{ message: "_Maybe you meant to run `yarn install`?_" }],
@@ -70,6 +70,17 @@ describe("generating messages", () => {
 
     expect(issues).toMatchSnapshot()
   })
+
+  it("avoids adding space inside the <td> for proper vertical alignment if the message does not contain any markdown", () => {
+    const issues = githubResultsTemplate("example-id", {
+      fails: [],
+      warnings: [],
+      messages: [{ message: "no markdown here" }],
+      markdowns: [],
+    })
+
+    expect(issues).toMatchSnapshot()
+  })
 })
 
 describe("generating inline messages", () => {
diff --git a/source/runner/templates/githubIssueTemplate.ts b/source/runner/templates/githubIssueTemplate.ts
index 4c36fc1e6..39185be6a 100644
--- a/source/runner/templates/githubIssueTemplate.ts
+++ b/source/runner/templates/githubIssueTemplate.ts
@@ -23,18 +23,32 @@ function table(name: string, emoji: string, violations: Violation[]): string {
       <th width="100%" data-danger-table="true">${name}</th>
     </tr>
   </thead>
-  <tbody>${violations
-    .map((v: Violation) => {
-      const message = isInline(v) ? `**${v.file!}#L${v.line!}** - ${v.message}` : v.message
-      return `<tr>
+  <tbody>${violations.map(violation => htmlForValidation(emoji, violation)).join("\n")}</tbody>
+</table>
+`
+}
+
+function htmlForValidation(emoji: string, violation: Violation) {
+  const message = isInline(violation)
+    ? `**${violation.file!}#L${violation.line!}** - ${violation.message}`
+    : violation.message
+
+  if (message.match(/[`*\[]/g)) {
+    return `<tr>
+      <td>:${emoji}:</td>
+      <td>
+
+  ${message}
+  </td>
+    </tr>
+  `
+  }
+
+  return `<tr>
       <td>:${emoji}:</td>
       <td>${message}</td>
     </tr>
   `
-    })
-    .join("\n")}</tbody>
-</table>
-`
 }
 
 function noViolationsOrAllOfThemEmpty(violations: Violation[]) {

From 15ed78cc4acf8218f95617a1a892907a84f67d59 Mon Sep 17 00:00:00 2001
From: Hannes Kaeufler <hannes.kaeufler@gmail.com>
Date: Tue, 27 Nov 2018 22:41:39 +0100
Subject: [PATCH 3/5] Extract method for markdown check

---
 source/runner/templates/githubIssueTemplate.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/runner/templates/githubIssueTemplate.ts b/source/runner/templates/githubIssueTemplate.ts
index 39185be6a..70daa0c38 100644
--- a/source/runner/templates/githubIssueTemplate.ts
+++ b/source/runner/templates/githubIssueTemplate.ts
@@ -33,7 +33,7 @@ function htmlForValidation(emoji: string, violation: Violation) {
     ? `**${violation.file!}#L${violation.line!}** - ${violation.message}`
     : violation.message
 
-  if (message.match(/[`*\[]/g)) {
+  if (containsMarkdown(message)) {
     return `<tr>
       <td>:${emoji}:</td>
       <td>
@@ -51,6 +51,10 @@ function htmlForValidation(emoji: string, violation: Violation) {
   `
 }
 
+function containsMarkdown(message: string): boolean {
+  return message.match(/[`*_~\[]+/g) ? true : false
+}
+
 function noViolationsOrAllOfThemEmpty(violations: Violation[]) {
   return violations.length === 0 || violations.every(violation => !violation.message)
 }

From b6dcc959d3fd541c04248a7fa6164ed5255285b9 Mon Sep 17 00:00:00 2001
From: Hannes Kaeufler <hannes.kaeufler@gmail.com>
Date: Tue, 27 Nov 2018 22:47:20 +0100
Subject: [PATCH 4/5] Remove template duplication

---
 source/runner/templates/githubIssueTemplate.ts | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/source/runner/templates/githubIssueTemplate.ts b/source/runner/templates/githubIssueTemplate.ts
index 70daa0c38..40e389016 100644
--- a/source/runner/templates/githubIssueTemplate.ts
+++ b/source/runner/templates/githubIssueTemplate.ts
@@ -29,19 +29,12 @@ function table(name: string, emoji: string, violations: Violation[]): string {
 }
 
 function htmlForValidation(emoji: string, violation: Violation) {
-  const message = isInline(violation)
+  let message = isInline(violation)
     ? `**${violation.file!}#L${violation.line!}** - ${violation.message}`
     : violation.message
 
   if (containsMarkdown(message)) {
-    return `<tr>
-      <td>:${emoji}:</td>
-      <td>
-
-  ${message}
-  </td>
-    </tr>
-  `
+    message = `\n\n  ${message}\n  `
   }
 
   return `<tr>

From de47c116026971ae1a6109f5d67bdd4f75b4b91f Mon Sep 17 00:00:00 2001
From: Hannes Kaeufler <hannes.kaeufler@gmail.com>
Date: Tue, 27 Nov 2018 22:53:21 +0100
Subject: [PATCH 5/5] Add changelog entry

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb20241d7..e4f6d1048 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@
 - Update comment instead deleting, if it has replies (BitBucket Server) [@langovoi][]
 - Fix BitBucket Server GitDSL [@langovoi][]
 - Add support of paged APIs of BitBucket Server [@langovoi][]
+- Revert removal of implicit `<p>` tag from [danger/danger-js#754](https://github.com/danger/danger-js/pull/754) and add
+  disctinction depending on containing markdown or not - [@hanneskaeufler][]
 
 # 6.1.6