From 5c70d41f1136f0e05ebd321ccfa90a6b1a8f84b9 Mon Sep 17 00:00:00 2001
From: Samuel Huang <samhuang91@gmail.com>
Date: Sat, 6 Apr 2024 22:20:10 -0700
Subject: [PATCH] Update styling of SourceFilePage

---
 .editorconfig                                            | 2 ++
 .../jacoco/report/internal/html/page/SourceFilePage.java | 9 +++++----
 .../jacoco/report/internal/html/resources/Styles.java    | 3 ---
 .../org/jacoco/report/internal/html/resources/report.css | 7 +++++--
 4 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..0937781512
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,2 @@
+[*.java]
+indent_style = tab
diff --git a/org.jacoco.report/src/org/jacoco/report/internal/html/page/SourceFilePage.java b/org.jacoco.report/src/org/jacoco/report/internal/html/page/SourceFilePage.java
index 2745f5a6ca..09b6d482d6 100644
--- a/org.jacoco.report/src/org/jacoco/report/internal/html/page/SourceFilePage.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/page/SourceFilePage.java
@@ -60,8 +60,8 @@ public SourceFilePage(final ISourceNode sourceFileNode,
 
 	@Override
 	protected void content(final HTMLElement body) throws IOException {
-		final SourceHighlighter hl = new SourceHighlighter(context.getLocale());
-		hl.render(body, getNode(), sourceReader);
+		final SourceHighlighter highlighter = new SourceHighlighter(context.getLocale());
+		highlighter.render(body, getNode(), sourceReader);
 		sourceReader.close();
 	}
 
@@ -76,8 +76,9 @@ protected void head(final HTMLElement head) throws IOException {
 
 	@Override
 	protected String getOnload() {
-		return format("window['PR_TAB_WIDTH']=%d;prettyPrint()",
-				Integer.valueOf(tabWidth));
+		String setTabWidth = format("window['PR_TAB_WIDTH']=%d", tabWidth);
+		String invokePrettyPrint = "prettyPrint()";
+		return setTabWidth + ";" + invokePrettyPrint;
 	}
 
 	@Override
diff --git a/org.jacoco.report/src/org/jacoco/report/internal/html/resources/Styles.java b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/Styles.java
index 78e179b88e..80d97d6520 100644
--- a/org.jacoco.report/src/org/jacoco/report/internal/html/resources/Styles.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/Styles.java
@@ -77,9 +77,6 @@ public final class Styles {
 	/** Block of source code */
 	public static final String SOURCE = "source";
 
-	/** Line number before each source line */
-	public static final String NR = "nr";
-
 	/** Part of source code where instructions are not covered */
 	public static final String NOT_COVERED = "nc";
 
diff --git a/org.jacoco.report/src/org/jacoco/report/internal/html/resources/report.css b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/report.css
index dd936bca54..72a7dcb186 100644
--- a/org.jacoco.report/src/org/jacoco/report/internal/html/resources/report.css
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/report.css
@@ -80,6 +80,9 @@ h1 {
 pre.source {
   border:#d6d3ce 1px solid;
   font-family:monospace;
+  background-color: #f3f3f3;
+  border-radius: 20px;
+  padding: 10px;
 }
 
 pre.source ol {
@@ -88,8 +91,8 @@ pre.source ol {
 }
 
 pre.source li {
-  border-left: 1px solid #D6D3CE;
-  color: #A0A0A0;
+  border-left: 0px;
+  color: black;
   padding-left: 0px;
 }