From 90bc37071355b52ceb0cfdf9bea3e131caf3901c Mon Sep 17 00:00:00 2001
From: Kester <kestertan040@gmail.com>
Date: Mon, 22 Apr 2024 16:49:19 -0400
Subject: [PATCH 01/14] Highlighting multi-line comments

---
 app/views/submissions/view.html.erb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/app/views/submissions/view.html.erb b/app/views/submissions/view.html.erb
index eab17fa35..976bdf499 100755
--- a/app/views/submissions/view.html.erb
+++ b/app/views/submissions/view.html.erb
@@ -52,6 +52,23 @@
       var headerPositionStr = null;
     <% end %>
     hljs.initHighlightingOnLoad();
+    document.addEventListener('DOMContentLoaded', (event) => {
+        let combinedCode = '';
+        document.querySelectorAll('pre code').forEach((block) => {
+            combinedCode += block.textContent + '\n';
+        });
+
+        let highlightedCode = hljs.highlightAuto(combinedCode).value;
+        let commentSpans = highlightedCode.match(/<span class="hljs-comment">([^<]*)<\/span>/g);
+        let commentContents = commentSpans.map(span => span.replace(/<[^>]+>/g, ''));
+        let splitContent = commentContents.flatMap(str => str.split('\n'));
+
+        document.querySelectorAll('pre code').forEach((block, index) => {
+            if (block.textContent !== null && block.textContent !== "" && splitContent.includes(block.textContent.replace(/\n/g, ''))) {
+                block.innerHTML = `<code class='hljs-comment'>${block.textContent}</code>`;
+            }
+        });
+    });
     PDFJS.workerSrc = "<%= asset_url 'pdf.worker.js' %>";
   </script>
   <%= render partial: "golden-layout" %>

From a5461f25b945a5c455c68bace16a1458a860aea2 Mon Sep 17 00:00:00 2001
From: Kester <kestertan040@gmail.com>
Date: Mon, 22 Apr 2024 17:11:10 -0400
Subject: [PATCH 02/14] Stray multi line comments

---
 app/views/submissions/view.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/submissions/view.html.erb b/app/views/submissions/view.html.erb
index 976bdf499..201e044c9 100755
--- a/app/views/submissions/view.html.erb
+++ b/app/views/submissions/view.html.erb
@@ -60,7 +60,7 @@
 
         let highlightedCode = hljs.highlightAuto(combinedCode).value;
         let commentSpans = highlightedCode.match(/<span class="hljs-comment">([^<]*)<\/span>/g);
-        let commentContents = commentSpans.map(span => span.replace(/<[^>]+>/g, ''));
+        let commentContents = commentSpans.map(span => span.replace(/<[^>]+>/g, '').replace(/</g, '&lt;').replace(/>/g, '&gt;'));
         let splitContent = commentContents.flatMap(str => str.split('\n'));
 
         document.querySelectorAll('pre code').forEach((block, index) => {

From 35d99dbd40fd390a60796ebbe39b7381a72f3b85 Mon Sep 17 00:00:00 2001
From: Kester <kestertan040@gmail.com>
Date: Mon, 22 Apr 2024 17:18:48 -0400
Subject: [PATCH 03/14] Script stray comments fix

---
 app/views/submissions/view.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/submissions/view.html.erb b/app/views/submissions/view.html.erb
index 201e044c9..cac29936e 100755
--- a/app/views/submissions/view.html.erb
+++ b/app/views/submissions/view.html.erb
@@ -60,7 +60,7 @@
 
         let highlightedCode = hljs.highlightAuto(combinedCode).value;
         let commentSpans = highlightedCode.match(/<span class="hljs-comment">([^<]*)<\/span>/g);
-        let commentContents = commentSpans.map(span => span.replace(/<[^>]+>/g, '').replace(/</g, '&lt;').replace(/>/g, '&gt;'));
+        let commentContents = commentSpans.map(span => span.replace(/<[^>]+>/g, '').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/<!--|--!?>/g, ""));
         let splitContent = commentContents.flatMap(str => str.split('\n'));
 
         document.querySelectorAll('pre code').forEach((block, index) => {

From 2eb9da868fc3849c3be52fd390a04024b25470ea Mon Sep 17 00:00:00 2001
From: Kester <kestertan040@gmail.com>
Date: Mon, 22 Apr 2024 17:28:41 -0400
Subject: [PATCH 04/14] Use innerHtml and textContent to get data instead of
 stripping

---
 app/views/submissions/view.html.erb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/submissions/view.html.erb b/app/views/submissions/view.html.erb
index cac29936e..f518fbaeb 100755
--- a/app/views/submissions/view.html.erb
+++ b/app/views/submissions/view.html.erb
@@ -60,7 +60,11 @@
 
         let highlightedCode = hljs.highlightAuto(combinedCode).value;
         let commentSpans = highlightedCode.match(/<span class="hljs-comment">([^<]*)<\/span>/g);
-        let commentContents = commentSpans.map(span => span.replace(/<[^>]+>/g, '').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/<!--|--!?>/g, ""));
+        let commentContents = commentSpans.map(span => {
+            let tempDiv = document.createElement('div');
+            tempDiv.innerHTML = span;
+            return tempDiv.textContent || tempDiv.innerText || '';
+        });
         let splitContent = commentContents.flatMap(str => str.split('\n'));
 
         document.querySelectorAll('pre code').forEach((block, index) => {

From 6dc7c51a7a199580dcd78617c982817094be94c7 Mon Sep 17 00:00:00 2001
From: Kester <kestertan040@gmail.com>
Date: Mon, 22 Apr 2024 17:35:16 -0400
Subject: [PATCH 05/14] Fix HTMl warning

---
 app/views/submissions/view.html.erb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/views/submissions/view.html.erb b/app/views/submissions/view.html.erb
index f518fbaeb..5f9aab447 100755
--- a/app/views/submissions/view.html.erb
+++ b/app/views/submissions/view.html.erb
@@ -69,7 +69,12 @@
 
         document.querySelectorAll('pre code').forEach((block, index) => {
             if (block.textContent !== null && block.textContent !== "" && splitContent.includes(block.textContent.replace(/\n/g, ''))) {
-                block.innerHTML = `<code class='hljs-comment'>${block.textContent}</code>`;
+                let escapedText = document.createTextNode(block.textContent);
+                let codeElement = document.createElement('span');
+                codeElement.className = 'hljs-comment';
+                codeElement.appendChild(escapedText);
+                block.innerHTML = '';
+                block.appendChild(codeElement);
             }
         });
     });

From 93babc2d46f6a90fc2e7542515af48b308b84403 Mon Sep 17 00:00:00 2001
From: Kester <kestertan040@gmail.com>
Date: Thu, 25 Apr 2024 01:07:05 -0400
Subject: [PATCH 06/14] Removed highlighting within comments

---
 app/assets/stylesheets/annotations.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/annotations.scss b/app/assets/stylesheets/annotations.scss
index d8dc4ce9b..9a9afee65 100755
--- a/app/assets/stylesheets/annotations.scss
+++ b/app/assets/stylesheets/annotations.scss
@@ -937,5 +937,9 @@ span > .material-icons {
   font-size: 14px !important;
   box-shadow: 0.5px 0.5px 0.5px 0.5px grey !important;
   border-color: white !important;
-} 
+}
+
+.hljs-comment span {
+  color: #008000 !important;
+}
 

From 689dc4faec80fd3119d7881ff9e41d2f6052c5ce Mon Sep 17 00:00:00 2001
From: Kester <kestertan040@gmail.com>
Date: Fri, 26 Apr 2024 21:01:49 -0400
Subject: [PATCH 07/14] highlighting for multiple files and nested span

---
 app/assets/stylesheets/annotations.scss |   3 +
 app/views/submissions/view.html.erb     | 111 +++++++++++++-----------
 2 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/app/assets/stylesheets/annotations.scss b/app/assets/stylesheets/annotations.scss
index 9a9afee65..bd811a2cf 100755
--- a/app/assets/stylesheets/annotations.scss
+++ b/app/assets/stylesheets/annotations.scss
@@ -943,3 +943,6 @@ span > .material-icons {
   color: #008000 !important;
 }
 
+.code-line div {
+  background: none !important;
+}
diff --git a/app/views/submissions/view.html.erb b/app/views/submissions/view.html.erb
index 5f9aab447..a2fb1e44d 100755
--- a/app/views/submissions/view.html.erb
+++ b/app/views/submissions/view.html.erb
@@ -23,62 +23,71 @@
   <div style="display: none"><%= render(partial: 'grades') %></div>
   <div style="display: none"><%= render(partial: 'annotation_pane') %></div>
   <script type="text/javascript">
-    <% if @cud.instructor || @cud.course_assistant then %>
+      <% if @cud.instructor || @cud.course_assistant then %>
       var isInstructor = true;
-    <% else %>
+      <% else %>
       var isInstructor = false;
-    <% end %>
+      <% end %>
 
-    const editableUrl = "<%= url_for([:quickSetScore, @course, @assessment]) %>"
+      const editableUrl = "<%= url_for([:quickSetScore, @course, @assessment]) %>"
 
-    var currentHeaderPos = <%= params[:header_position] || 0 %>;
-    var annotations = <%= raw @annotations.to_json %>;
-    var annotationsByPositionByLine = {};
-    var fileNameStr = "<%= @filename %>";
-    var cudEmailStr = "<%= @cud.email %>";
+      var currentHeaderPos = <%= params[:header_position] || 0 %>;
+      var annotations = <%= raw @annotations.to_json %>;
+      var annotationsByPositionByLine = {};
+      var fileNameStr = "<%= @filename %>";
+      var cudEmailStr = "<%= @cud.email %>";
 
-    // a json list of problems for this assessment
-    var problems = <%= raw @problems.to_json %>;
+      // a json list of problems for this assessment
+      var problems = <%= raw @problems.to_json %>;
 
-    // a json list of scores for this assessment
-    var scores = <%= raw @scores.to_json %>;
-    var basePath = "<%= course_assessment_submission_annotations_path(@course, @assessment, @submission) %>";
+      // a json list of scores for this assessment
+      var scores = <%= raw @scores.to_json %>;
+      var basePath = "<%= course_assessment_submission_annotations_path(@course, @assessment, @submission) %>";
 
-    var localCache = {};
+      var localCache = {};
 
-    <% if params[:header_position] %>
+      <% if params[:header_position] %>
       var headerPositionStr = "<%= params[:header_position] %>";
-    <% else %>
+      <% else %>
       var headerPositionStr = null;
-    <% end %>
-    hljs.initHighlightingOnLoad();
-    document.addEventListener('DOMContentLoaded', (event) => {
-        let combinedCode = '';
-        document.querySelectorAll('pre code').forEach((block) => {
-            combinedCode += block.textContent + '\n';
-        });
-
-        let highlightedCode = hljs.highlightAuto(combinedCode).value;
-        let commentSpans = highlightedCode.match(/<span class="hljs-comment">([^<]*)<\/span>/g);
-        let commentContents = commentSpans.map(span => {
-            let tempDiv = document.createElement('div');
-            tempDiv.innerHTML = span;
-            return tempDiv.textContent || tempDiv.innerText || '';
-        });
-        let splitContent = commentContents.flatMap(str => str.split('\n'));
-
-        document.querySelectorAll('pre code').forEach((block, index) => {
-            if (block.textContent !== null && block.textContent !== "" && splitContent.includes(block.textContent.replace(/\n/g, ''))) {
-                let escapedText = document.createTextNode(block.textContent);
-                let codeElement = document.createElement('span');
-                codeElement.className = 'hljs-comment';
-                codeElement.appendChild(escapedText);
-                block.innerHTML = '';
-                block.appendChild(codeElement);
-            }
-        });
-    });
-    PDFJS.workerSrc = "<%= asset_url 'pdf.worker.js' %>";
+      <% end %>
+      hljs.initHighlightingOnLoad();
+      function highlightComments () {
+          let combinedCode = '';
+          document.querySelectorAll('pre code').forEach((block) => {
+              combinedCode += block.textContent + '\n';
+          });
+          let highlightedCode = hljs.highlightAuto(combinedCode).value;
+          let htmlObject = document.createElement('div');
+          htmlObject.innerHTML = highlightedCode;
+          let content = htmlObject.getElementsByClassName('hljs-comment');
+          let splitContent = [];
+          for (let con of content) {
+              let innerSpans = con.innerText.split("\n").filter(line => line.trim() !== "");
+              innerSpans.forEach((span) => {
+                  splitContent.push(span);
+              });
+          }
+
+          document.querySelectorAll('pre code').forEach((block) => {
+              if (block.textContent !== null && block.textContent !== "" && splitContent.includes(block.textContent.replace(/\n/g, ''))) {
+                  let escapedText = document.createTextNode(block.textContent);
+                  let codeElement = document.createElement('span');
+                  codeElement.className = 'hljs-comment';
+                  codeElement.appendChild(escapedText);
+                  block.innerHTML = '';
+                  block.appendChild(codeElement);
+              }
+          });
+      }
+      window.addEventListener('DOMContentLoaded', () => {
+          highlightComments();
+      });
+      window.navigation.addEventListener("navigate", () => {
+          highlightComments();
+      })
+
+      PDFJS.workerSrc = "<%= asset_url 'pdf.worker.js' %>";
   </script>
   <%= render partial: "golden-layout" %>
 <% end %>
@@ -96,12 +105,12 @@
       <% end %>
     </div>
     <div class="col s8 center-align valign-wrapper submission-controls">
-        <span title="student # / total students">[<%= @curSubmissionIndex + 1 %>/<%= @latestSubmissions.length %>] <%= @submission.course_user_datum.email %>,</span>
-        <%= render "version_dropdown" %>
-        <%= render "version_links" %>
+      <span title="student # / total students">[<%= @curSubmissionIndex + 1 %>/<%= @latestSubmissions.length %>] <%= @submission.course_user_datum.email %>,</span>
+      <%= render "version_dropdown" %>
+      <%= render "version_links" %>
       <a href="<%= download_file_url(@submission) %>" class="btn small" title="Download">Download</a>
       <button class="btn small" onclick="resetLayout()">Reset Layout</button>
-        <%= render "release_grades" %>
+      <%= render "release_grades" %>
     </div>
 
     <div class="col s2 center-align">
@@ -130,4 +139,4 @@
 
 <!-- restart the container -->
 <div>
-<div>
+  <div>

From 0ced379fbf469abbb7e92b25e990a282505fa369 Mon Sep 17 00:00:00 2001
From: Kester <kestertan040@gmail.com>
Date: Fri, 26 Apr 2024 21:12:14 -0400
Subject: [PATCH 08/14] added comments and fixed indentation

---
 app/assets/stylesheets/_variables.scss  |   1 +
 app/assets/stylesheets/annotations.scss |   2 +-
 app/views/submissions/view.html.erb     | 136 ++++++++++++------------
 3 files changed, 72 insertions(+), 67 deletions(-)

diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss
index 70c691ebb..7cea9205f 100644
--- a/app/assets/stylesheets/_variables.scss
+++ b/app/assets/stylesheets/_variables.scss
@@ -14,3 +14,4 @@ $autolab-white: #fff;
 $autolab-selected-gray: #f5f5f5;
 $autolab-border-gray: #f4f1f1;
 $autolab-gray-text: #676464;
+$autolab-highlight-comments: #008000;
\ No newline at end of file
diff --git a/app/assets/stylesheets/annotations.scss b/app/assets/stylesheets/annotations.scss
index bd811a2cf..8cd47478c 100755
--- a/app/assets/stylesheets/annotations.scss
+++ b/app/assets/stylesheets/annotations.scss
@@ -940,7 +940,7 @@ span > .material-icons {
 }
 
 .hljs-comment span {
-  color: #008000 !important;
+  color: var($autolab-highlight-comments) !important;
 }
 
 .code-line div {
diff --git a/app/views/submissions/view.html.erb b/app/views/submissions/view.html.erb
index a2fb1e44d..28143ba5e 100755
--- a/app/views/submissions/view.html.erb
+++ b/app/views/submissions/view.html.erb
@@ -23,71 +23,75 @@
   <div style="display: none"><%= render(partial: 'grades') %></div>
   <div style="display: none"><%= render(partial: 'annotation_pane') %></div>
   <script type="text/javascript">
-      <% if @cud.instructor || @cud.course_assistant then %>
-      var isInstructor = true;
-      <% else %>
-      var isInstructor = false;
-      <% end %>
-
-      const editableUrl = "<%= url_for([:quickSetScore, @course, @assessment]) %>"
-
-      var currentHeaderPos = <%= params[:header_position] || 0 %>;
-      var annotations = <%= raw @annotations.to_json %>;
-      var annotationsByPositionByLine = {};
-      var fileNameStr = "<%= @filename %>";
-      var cudEmailStr = "<%= @cud.email %>";
-
-      // a json list of problems for this assessment
-      var problems = <%= raw @problems.to_json %>;
-
-      // a json list of scores for this assessment
-      var scores = <%= raw @scores.to_json %>;
-      var basePath = "<%= course_assessment_submission_annotations_path(@course, @assessment, @submission) %>";
-
-      var localCache = {};
-
-      <% if params[:header_position] %>
-      var headerPositionStr = "<%= params[:header_position] %>";
-      <% else %>
-      var headerPositionStr = null;
-      <% end %>
-      hljs.initHighlightingOnLoad();
-      function highlightComments () {
-          let combinedCode = '';
-          document.querySelectorAll('pre code').forEach((block) => {
-              combinedCode += block.textContent + '\n';
-          });
-          let highlightedCode = hljs.highlightAuto(combinedCode).value;
-          let htmlObject = document.createElement('div');
-          htmlObject.innerHTML = highlightedCode;
-          let content = htmlObject.getElementsByClassName('hljs-comment');
-          let splitContent = [];
-          for (let con of content) {
-              let innerSpans = con.innerText.split("\n").filter(line => line.trim() !== "");
-              innerSpans.forEach((span) => {
-                  splitContent.push(span);
-              });
-          }
-
-          document.querySelectorAll('pre code').forEach((block) => {
-              if (block.textContent !== null && block.textContent !== "" && splitContent.includes(block.textContent.replace(/\n/g, ''))) {
-                  let escapedText = document.createTextNode(block.textContent);
-                  let codeElement = document.createElement('span');
-                  codeElement.className = 'hljs-comment';
-                  codeElement.appendChild(escapedText);
-                  block.innerHTML = '';
-                  block.appendChild(codeElement);
-              }
-          });
-      }
-      window.addEventListener('DOMContentLoaded', () => {
-          highlightComments();
-      });
-      window.navigation.addEventListener("navigate", () => {
-          highlightComments();
-      })
-
-      PDFJS.workerSrc = "<%= asset_url 'pdf.worker.js' %>";
+    <% if @cud.instructor || @cud.course_assistant then %>
+    var isInstructor = true;
+    <% else %>
+    var isInstructor = false;
+    <% end %>
+
+    const editableUrl = "<%= url_for([:quickSetScore, @course, @assessment]) %>"
+
+    var currentHeaderPos = <%= params[:header_position] || 0 %>;
+    var annotations = <%= raw @annotations.to_json %>;
+    var annotationsByPositionByLine = {};
+    var fileNameStr = "<%= @filename %>";
+    var cudEmailStr = "<%= @cud.email %>";
+
+    // a json list of problems for this assessment
+    var problems = <%= raw @problems.to_json %>;
+
+    // a json list of scores for this assessment
+    var scores = <%= raw @scores.to_json %>;
+    var basePath = "<%= course_assessment_submission_annotations_path(@course, @assessment, @submission) %>";
+
+    var localCache = {};
+
+    <% if params[:header_position] %>
+    var headerPositionStr = "<%= params[:header_position] %>";
+    <% else %>
+    var headerPositionStr = null;
+    <% end %>
+    hljs.initHighlightingOnLoad();
+    hljs.initHighlightingOnLoad();
+    function highlightComments () {
+        // Highlights all code as a cohesive block
+        let combinedCode = '';
+        document.querySelectorAll('pre code').forEach((block) => {
+            combinedCode += block.textContent + '\n';
+        });
+        let highlightedCode = hljs.highlightAuto(combinedCode).value;
+        let htmlObject = document.createElement('div');
+        htmlObject.innerHTML = highlightedCode;
+        // Get all spans that are highlighted as comments
+        let content = htmlObject.getElementsByClassName('hljs-comment');
+        let splitContent = [];
+        // Split each span into multiple lines
+        for (let con of content) {
+            let innerSpans = con.innerText.split("\n").filter(line => line.trim() !== "");
+            innerSpans.forEach((span) => {
+                splitContent.push(span);
+            });
+        }
+        // If a line of code has content that is highlighted as a comment above,
+        // we wrap the content with the hljs-comment class to highlight it
+        document.querySelectorAll('pre code').forEach((block) => {
+            if (block.textContent !== null && block.textContent !== "" && splitContent.includes(block.textContent.replace(/\n/g, ''))) {
+                let escapedText = document.createTextNode(block.textContent);
+                let codeElement = document.createElement('span');
+                codeElement.className = 'hljs-comment';
+                codeElement.appendChild(escapedText);
+                block.innerHTML = '';
+                block.appendChild(codeElement);
+            }
+        });
+    }
+    window.addEventListener('DOMContentLoaded', () => {
+        highlightComments();
+    });
+    window.navigation.addEventListener("navigate", () => {
+        highlightComments();
+    });
+    PDFJS.workerSrc = "<%= asset_url 'pdf.worker.js' %>";
   </script>
   <%= render partial: "golden-layout" %>
 <% end %>
@@ -139,4 +143,4 @@
 
 <!-- restart the container -->
 <div>
-  <div>
+<div>
\ No newline at end of file

From aa313e48191ce4dcfebeb937a318db931d4b2c0e Mon Sep 17 00:00:00 2001
From: Kester <kestertan040@gmail.com>
Date: Fri, 26 Apr 2024 21:15:55 -0400
Subject: [PATCH 09/14] newline

---
 app/views/submissions/view.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/submissions/view.html.erb b/app/views/submissions/view.html.erb
index 28143ba5e..13c5af28c 100755
--- a/app/views/submissions/view.html.erb
+++ b/app/views/submissions/view.html.erb
@@ -143,4 +143,4 @@
 
 <!-- restart the container -->
 <div>
-<div>
\ No newline at end of file
+<div>

From 507e904e1c16da3e2c2ad624100ceb21d2998a14 Mon Sep 17 00:00:00 2001
From: Kester <kestertan040@gmail.com>
Date: Fri, 26 Apr 2024 21:20:54 -0400
Subject: [PATCH 10/14] fixes indentation

---
 app/views/submissions/view.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/submissions/view.html.erb b/app/views/submissions/view.html.erb
index 13c5af28c..367996bcd 100755
--- a/app/views/submissions/view.html.erb
+++ b/app/views/submissions/view.html.erb
@@ -24,9 +24,9 @@
   <div style="display: none"><%= render(partial: 'annotation_pane') %></div>
   <script type="text/javascript">
     <% if @cud.instructor || @cud.course_assistant then %>
-    var isInstructor = true;
+        var isInstructor = true;
     <% else %>
-    var isInstructor = false;
+        var isInstructor = false;
     <% end %>
 
     const editableUrl = "<%= url_for([:quickSetScore, @course, @assessment]) %>"
@@ -47,9 +47,9 @@
     var localCache = {};
 
     <% if params[:header_position] %>
-    var headerPositionStr = "<%= params[:header_position] %>";
+        var headerPositionStr = "<%= params[:header_position] %>";
     <% else %>
-    var headerPositionStr = null;
+        var headerPositionStr = null;
     <% end %>
     hljs.initHighlightingOnLoad();
     hljs.initHighlightingOnLoad();

From 4c3cbb662ea2a97df527a539a4d6a13ce71bac8a Mon Sep 17 00:00:00 2001
From: Kester <kestertan040@gmail.com>
Date: Fri, 26 Apr 2024 21:34:18 -0400
Subject: [PATCH 11/14] indentation

---
 app/views/submissions/view.html.erb | 70 ++++++++++++++---------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/app/views/submissions/view.html.erb b/app/views/submissions/view.html.erb
index 367996bcd..c43c79c7e 100755
--- a/app/views/submissions/view.html.erb
+++ b/app/views/submissions/view.html.erb
@@ -24,9 +24,9 @@
   <div style="display: none"><%= render(partial: 'annotation_pane') %></div>
   <script type="text/javascript">
     <% if @cud.instructor || @cud.course_assistant then %>
-        var isInstructor = true;
+      var isInstructor = true;
     <% else %>
-        var isInstructor = false;
+      var isInstructor = false;
     <% end %>
 
     const editableUrl = "<%= url_for([:quickSetScore, @course, @assessment]) %>"
@@ -47,43 +47,43 @@
     var localCache = {};
 
     <% if params[:header_position] %>
-        var headerPositionStr = "<%= params[:header_position] %>";
+      var headerPositionStr = "<%= params[:header_position] %>";
     <% else %>
-        var headerPositionStr = null;
+      var headerPositionStr = null;
     <% end %>
     hljs.initHighlightingOnLoad();
-    hljs.initHighlightingOnLoad();
     function highlightComments () {
-        // Highlights all code as a cohesive block
-        let combinedCode = '';
-        document.querySelectorAll('pre code').forEach((block) => {
-            combinedCode += block.textContent + '\n';
-        });
-        let highlightedCode = hljs.highlightAuto(combinedCode).value;
-        let htmlObject = document.createElement('div');
-        htmlObject.innerHTML = highlightedCode;
-        // Get all spans that are highlighted as comments
-        let content = htmlObject.getElementsByClassName('hljs-comment');
-        let splitContent = [];
-        // Split each span into multiple lines
-        for (let con of content) {
-            let innerSpans = con.innerText.split("\n").filter(line => line.trim() !== "");
-            innerSpans.forEach((span) => {
-                splitContent.push(span);
-            });
-        }
-        // If a line of code has content that is highlighted as a comment above,
-        // we wrap the content with the hljs-comment class to highlight it
-        document.querySelectorAll('pre code').forEach((block) => {
-            if (block.textContent !== null && block.textContent !== "" && splitContent.includes(block.textContent.replace(/\n/g, ''))) {
-                let escapedText = document.createTextNode(block.textContent);
-                let codeElement = document.createElement('span');
-                codeElement.className = 'hljs-comment';
-                codeElement.appendChild(escapedText);
-                block.innerHTML = '';
-                block.appendChild(codeElement);
-            }
-        });
+      // Highlights all code as a cohesive block
+      let combinedCode = '';
+      document.querySelectorAll('pre code').forEach((block) => {
+          combinedCode += block.textContent + '\n';
+      });
+      let highlightedCode = hljs.highlightAuto(combinedCode).value;
+      console.log(combinedCode);
+      let htmlObject = document.createElement('div');
+      htmlObject.innerHTML = highlightedCode;
+      // Get all spans that are highlighted as comments
+      let content = htmlObject.getElementsByClassName('hljs-comment');
+      let splitContent = [];
+      // Split each span into multiple lines
+      for (let con of content) {
+          let innerSpans = con.innerText.split("\n").filter(line => line.trim() !== "");
+          innerSpans.forEach((span) => {
+              splitContent.push(span);
+          });
+      }
+      // If a line of code has content that is highlighted as a comment above,
+      // we wrap the content with the hljs-comment class to highlight it
+      document.querySelectorAll('pre code').forEach((block) => {
+          if (block.textContent !== null && block.textContent !== "" && splitContent.includes(block.textContent.replace(/\n/g, ''))) {
+              let escapedText = document.createTextNode(block.textContent);
+              let codeElement = document.createElement('span');
+              codeElement.className = 'hljs-comment';
+              codeElement.appendChild(escapedText);
+              block.innerHTML = '';
+              block.appendChild(codeElement);
+          }
+      });
     }
     window.addEventListener('DOMContentLoaded', () => {
         highlightComments();

From 0fd46847145fdcca3de398ccb8417979d03bbd4e Mon Sep 17 00:00:00 2001
From: Kester <kestertan040@gmail.com>
Date: Wed, 15 May 2024 14:39:15 +0800
Subject: [PATCH 12/14] Fixed keyword comment highlighting

---
 app/views/submissions/view.html.erb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/views/submissions/view.html.erb b/app/views/submissions/view.html.erb
index c43c79c7e..7080f2d7b 100755
--- a/app/views/submissions/view.html.erb
+++ b/app/views/submissions/view.html.erb
@@ -59,7 +59,6 @@
           combinedCode += block.textContent + '\n';
       });
       let highlightedCode = hljs.highlightAuto(combinedCode).value;
-      console.log(combinedCode);
       let htmlObject = document.createElement('div');
       htmlObject.innerHTML = highlightedCode;
       // Get all spans that are highlighted as comments
@@ -69,7 +68,18 @@
       for (let con of content) {
           let innerSpans = con.innerText.split("\n").filter(line => line.trim() !== "");
           innerSpans.forEach((span) => {
-              splitContent.push(span);
+              // Check if span starts with #include, if so we highlight it seperately and check if its a comment
+              // If it is not a comment, do not add it into the comments array
+              if (span.startsWith("#include")) {
+                  let highlightedKeyWord = hljs.highlightAuto(span).value;
+                  let htmlTestDiv = document.createElement('div');
+                  htmlTestDiv.innerHTML = highlightedKeyWord;
+                  if (htmlTestDiv.getElementsByClassName('hljs-comment').length >= 1) {
+                      splitContent.push(span);
+                  }
+              } else {
+                  splitContent.push(span);
+              }
           });
       }
       // If a line of code has content that is highlighted as a comment above,

From 54ea9c9c270aa7ad70c7a2efd53dcb4cf5d928a7 Mon Sep 17 00:00:00 2001
From: Kester <kestertan040@gmail.com>
Date: Mon, 3 Jun 2024 22:17:26 +0800
Subject: [PATCH 13/14] newline

---
 app/assets/stylesheets/_variables.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss
index 7cea9205f..be7e1c944 100644
--- a/app/assets/stylesheets/_variables.scss
+++ b/app/assets/stylesheets/_variables.scss
@@ -14,4 +14,4 @@ $autolab-white: #fff;
 $autolab-selected-gray: #f5f5f5;
 $autolab-border-gray: #f4f1f1;
 $autolab-gray-text: #676464;
-$autolab-highlight-comments: #008000;
\ No newline at end of file
+$autolab-highlight-comments: #008000;

From 1eeae38748a0f42f551411a44c59ed64ea8a8dcb Mon Sep 17 00:00:00 2001
From: Kester <kestertan040@gmail.com>
Date: Mon, 3 Jun 2024 23:59:32 +0800
Subject: [PATCH 14/14] highlights multi line strings and # is excluded

---
 app/views/submissions/view.html.erb | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/views/submissions/view.html.erb b/app/views/submissions/view.html.erb
index 7080f2d7b..ab6619b6e 100755
--- a/app/views/submissions/view.html.erb
+++ b/app/views/submissions/view.html.erb
@@ -61,17 +61,21 @@
       let highlightedCode = hljs.highlightAuto(combinedCode).value;
       let htmlObject = document.createElement('div');
       htmlObject.innerHTML = highlightedCode;
-      // Get all spans that are highlighted as comments
-      let content = htmlObject.getElementsByClassName('hljs-comment');
+      // Get all spans that are highlighted as comments or strings
+      let comments = htmlObject.getElementsByClassName('hljs-comment');
+      let strings = htmlObject.getElementsByClassName('hljs-string');
+      let content = [...comments, ...strings];
       let splitContent = [];
       // Split each span into multiple lines
       for (let con of content) {
           let innerSpans = con.innerText.split("\n").filter(line => line.trim() !== "");
           innerSpans.forEach((span) => {
-              // Check if span starts with #include, if so we highlight it seperately and check if its a comment
+              // Check if span starts with # and language is cpp or c
+              // if so we highlight it seperately and check if its a comment
               // If it is not a comment, do not add it into the comments array
-              if (span.startsWith("#include")) {
-                  let highlightedKeyWord = hljs.highlightAuto(span).value;
+              let highlightedSpan = hljs.highlightAuto(span);
+              if (span.startsWith("#") && (highlightedSpan.language === 'cpp' || highlightedSpan.language === 'c')) {
+                  let highlightedKeyWord = highlightedSpan.value;
                   let htmlTestDiv = document.createElement('div');
                   htmlTestDiv.innerHTML = highlightedKeyWord;
                   if (htmlTestDiv.getElementsByClassName('hljs-comment').length >= 1) {