Merge pull request #332 from shaurabh-tiwari-git/apexFullFileDiff

@ W-18480465 - Apex full file diff

Author: snehaljha-sf

src/styles/reportGenerator.css

@@ -256,28 +256,30 @@ html {
   background-color: #fff;
   margin: auto;
   padding: 20px;
+  padding-top: 20px;
   width: 60%;
-  height: 60%;
+  max-height: 80%;
   box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
   border-radius: 4px;
   text-align: left;
   position: relative;
+  overflow-y: auto;
+  overflow-x: auto;
 }
 
 .closeButton {
   color: #222121;
-  height: 30px;
-  width: 30px;
+  height: 40px;
+  width: 40px;
   position: absolute;
-  background-color: #fff;
-  top: -35px;
-  right: 0;
-  font-size: 25px;
+  top: 0px;
+  right: 0px;
+  font-size: 30px;
   cursor: pointer;
   display: flex;
   align-items: center;
   justify-content: center;
-  border-radius: 3px;
+  z-index: 1050;
 }
 
 .modalHeader {

src/utils/lwcparser/fileutils/FileDiffUtil.ts

@@ -62,57 +62,79 @@ export class FileDiffUtil {
   }
 
   public getFileDiff(filename: string, originalFileContent: string, modifiedFileContent: string): DiffPair[] {
-    const patch: string = createPatch('', originalFileContent, modifiedFileContent);
     try {
-      // Split the patch into lines
+      const originalLines = originalFileContent.split('\n');
+      const modifiedLines = modifiedFileContent.split('\n');
+      const patch: string = createPatch('', originalFileContent, modifiedFileContent);
       const patchLines = patch.split('\n');
 
-      // Initialize variables to track line numbers
-      let oldLineNumber = 1;
-      let newLineNumber = 1;
-      let firstPlusAlreadySkipped = false;
-      let firstMinusAlreadySkipped = false;
-      const diff: DiffPair[] = [];
-      // Initialize result as HTML string
+      let origIdx = 0;
+      let modIdx = 0;
+      const result: DiffPair[] = [];
 
-      patchLines.forEach((line) => {
-        // Parse the hunk header (e.g., @@ -2,3 +2,3 @@)
-        const hunkHeader = /^@@ -(\d+),\d+ \+(\d+),\d+ @@/;
+      // Skip the first line of the patch (the file header)
+      let i = 0;
+      while (i < patchLines.length) {
+        const line = patchLines[i];
+        const hunkHeader = /^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@/;
         const match = hunkHeader.exec(line);
 
         if (match) {
-          oldLineNumber = parseInt(match[1], 10);
-          newLineNumber = parseInt(match[2], 10);
-        } else if (line.startsWith('-')) {
-          // Skip the first line difference
-          if (oldLineNumber === 1 && !firstMinusAlreadySkipped) {
-            firstMinusAlreadySkipped = true;
-            // Skip the first line difference
-            oldLineNumber++;
-            return;
+          // Move to the start of the hunk
+          const origStart = parseInt(match[1], 10) - 1;
+          const modStart = parseInt(match[3], 10) - 1;
+
+          // Emit unchanged lines before the hunk
+          while (origIdx < origStart && modIdx < modStart) {
+            result.push({ old: originalLines[origIdx], new: modifiedLines[modIdx] });
+            origIdx++;
+            modIdx++;
           }
-          diff.push({ old: line.slice(1), new: null });
-          oldLineNumber++;
-        } else if (line.startsWith('+')) {
-          // Skip the first line difference
-          if (newLineNumber === 1 && !firstPlusAlreadySkipped) {
-            firstPlusAlreadySkipped = true;
-            newLineNumber++;
-            return;
+
+          i++;
+          // Now process the hunk lines
+          while (i < patchLines.length && !patchLines[i].startsWith('@@')) {
+            const hunkLine = patchLines[i];
+            if (hunkLine.startsWith('-')) {
+              result.push({ old: originalLines[origIdx], new: null });
+              origIdx++;
+            } else if (hunkLine.startsWith('+')) {
+              result.push({ old: null, new: modifiedLines[modIdx] });
+              modIdx++;
+            } else if (hunkLine.startsWith(' ')) {
+              result.push({ old: originalLines[origIdx], new: modifiedLines[modIdx] });
+              origIdx++;
+              modIdx++;
+            }
+            i++;
           }
-          diff.push({ old: null, new: line.slice(1) });
-          newLineNumber++;
-        } else if (line.startsWith(' ')) {
-          diff.push({ old: line.slice(1), new: line.slice(1) });
-          // Unchanged line, skip it
-          oldLineNumber++;
-          newLineNumber++;
+        } else {
+          i++;
         }
-      });
-      // Return the diff array
-      return diff;
+      }
+
+      // Emit any remaining unchanged lines at the end
+      while (origIdx < originalLines.length && modIdx < modifiedLines.length) {
+        result.push({ old: originalLines[origIdx], new: modifiedLines[modIdx] });
+        origIdx++;
+        modIdx++;
+      }
+      // If there are trailing additions or deletions
+      while (origIdx < originalLines.length) {
+        result.push({ old: originalLines[origIdx], new: null });
+        origIdx++;
+      }
+      while (modIdx < modifiedLines.length) {
+        result.push({ old: null, new: modifiedLines[modIdx] });
+        modIdx++;
+      }
+
+      // Only return if there are any changes
+      const hasChanges = result.some((diff) => diff.old !== diff.new);
+      return hasChanges ? result : [];
     } catch (error) {
       Logger.error(`Error in FileDiffUtil: ${String(error)}`);
+      return [];
     }
   }