Fix again documentation-style-review-enhanced.yml

Author: pwizla

.github/workflows/documentation-style-review-enhanced.yml

@@ -211,44 +211,103 @@ jobs:
                 console.log(`💬 Posting ${results.inlineComments.length} inline comments...`);
                 
                 try {
-                  // Get the PR files and their diff hunks for proper positioning
-                  const prFiles = await github.rest.pulls.listFiles({
+                  // Get the PR info first for commit SHA
+                  const prInfo = await github.rest.pulls.get({
                     owner: context.repo.owner,
                     repo: context.repo.repo,
                     pull_number: parseInt(prNumber)
                   });
                   
-                  // Get the latest commit SHA for the PR
-                  const prData = await github.rest.pulls.get({
+                  const commitSha = prInfo.data.head.sha;
+                  console.log(`📍 Using commit SHA: ${commitSha}`);
+                  
+                  // Get the PR diff separately
+                  const prDiff = await github.rest.pulls.get({
                     owner: context.repo.owner,
                     repo: context.repo.repo,
-                    pull_number: parseInt(prNumber)
+                    pull_number: parseInt(prNumber),
+                    mediaType: {
+                      format: 'diff'
+                    }
                   });
                   
-                  const commitSha = prData.data.head.sha;
+                  const diffContent = prDiff.data; // This is the raw diff content
+                  console.log(`📄 Diff content length: ${diffContent.length} chars`);
+                  
+                  // Helper function to calculate diff position from raw diff content
+                  const calculateDiffPositionFromRawDiff = function(diffContent, targetPath, targetLine) {
+                    const lines = diffContent.split('\n');
+                    let currentFile = null;
+                    let position = 0;
+                    let currentNewLine = 0;
+                    let inTargetFile = false;
+                    let inHunk = false;
+                    
+                    for (const line of lines) {
+                      if (line.startsWith('diff --git')) {
+                        // Check if this is our target file
+                        inTargetFile = line.includes(targetPath);
+                        position = 0;
+                        currentNewLine = 0;
+                        inHunk = false;
+                        continue;
+                      }
+                      
+                      if (!inTargetFile) continue;
+                      
+                      // Skip file headers (---, +++)
+                      if (line.startsWith('---') || line.startsWith('+++')) {
+                        continue;
+                      }
+                      
+                      if (line.startsWith('@@')) {
+                        // Parse hunk header: @@ -oldStart,oldCount +newStart,newCount @@
+                        const match = line.match(/@@ -\d+(?:,\d+)? \+(\d+)(?:,\d+)? @@/);
+                        if (match) {
+                          currentNewLine = parseInt(match[1]) - 1; // Start one before the first line
+                          inHunk = true;
+                          position = 0; // Reset position counter for this hunk
+                        }
+                        continue;
+                      }
+                      
+                      if (!inHunk) continue;
+                      
+                      // Increment position for every line in the hunk
+                      position++;
+                      
+                      if (line.startsWith('+')) {
+                        // This is an added line
+                        currentNewLine++;
+                        if (currentNewLine === targetLine) {
+                          return position;
+                        }
+                      } else if (line.startsWith(' ')) {
+                        // This is a context line (unchanged)
+                        currentNewLine++;
+                      }
+                      // Lines starting with '-' don't increment currentNewLine (they're deleted)
+                    }
+                    
+                    return -1; // Line not found in diff
+                  };
                   
                   // Process inline comments to ensure they have valid positions
                   const validInlineComments = [];
                   
                   for (const comment of results.inlineComments) {
-                    // Find the corresponding file in the PR
-                    const prFile = prFiles.data.find(file => file.filename === comment.path);
+                    // Calculate the position in the diff for this line using the raw diff
+                    const position = calculateDiffPositionFromRawDiff(diffContent, comment.path, comment.line);
                     
-                    if (prFile && prFile.patch) {
-                      // Calculate the position in the diff for this line
-                      const position = this.calculateDiffPosition(prFile.patch, comment.line);
-                      
-                      if (position > 0) {
-                        validInlineComments.push({
-                          path: comment.path,
-                          position: position, // Use position instead of line for diff-based comments
-                          body: comment.body
-                        });
-                      } else {
-                        console.log(`⚠️ Could not find valid diff position for ${comment.path}:${comment.line}`);
-                      }
+                    if (position > 0) {
+                      validInlineComments.push({
+                        path: comment.path,
+                        position: position,
+                        body: comment.body
+                      });
+                      console.log(`✅ Valid position found for ${comment.path}:${comment.line} -> position ${position}`);
                     } else {
-                      console.log(`⚠️ File ${comment.path} not found in PR files or has no patch`);
+                      console.log(`⚠️ Could not find valid diff position for ${comment.path}:${comment.line}`);
                     }
                   }
                   
@@ -274,7 +333,7 @@ jobs:
                   if (results.hasMoreIssues) {
                     const truncationComment = `## 💙 More suggestions available!\n\n` +
                       `I found ${results.remainingIssues} additional item${results.remainingIssues > 1 ? 's' : ''} to review. ` +
-                      `Once you address the current suggestions, I'll be happy to review again and share the remaining feedback!\n\n` +
+                      `Once you address the current suggestions, I'll review again and share the remaining feedback!\n\n` +
                       `This approach helps keep the review manageable and focused. Thanks for your patience! 😊`;
                     
                     await github.rest.issues.createComment({
@@ -287,6 +346,7 @@ jobs:
                   
                 } catch (error) {
                   console.error('Failed to post inline comments:', error.message);
+                  console.error('Error details:', error);
                   
                   // Fallback: post inline comments as a single comment
                   let fallbackComment = '## 📝 Detailed Suggestions\n\n*Unable to post inline comments, here are the specific suggestions:*\n\n';
@@ -306,51 +366,6 @@ jobs:
                 }
               }
               
-              // Helper function to calculate diff position according to GitHub API
-              this.calculateDiffPosition = function(patch, targetLine) {
-                const lines = patch.split('\n');
-                let position = 0;
-                let currentNewLine = 0;
-                let inHunk = false;
-                
-                for (const line of lines) {
-                  // Skip file headers (---, +++)
-                  if (line.startsWith('---') || line.startsWith('+++')) {
-                    continue;
-                  }
-                  
-                  if (line.startsWith('@@')) {
-                    // Parse hunk header: @@ -oldStart,oldCount +newStart,newCount @@
-                    const match = line.match(/@@ -\d+(?:,\d+)? \+(\d+)(?:,\d+)? @@/);
-                    if (match) {
-                      currentNewLine = parseInt(match[1]) - 1; // Start one before the first line
-                      inHunk = true;
-                      position = 0; // Reset position counter for this hunk
-                    }
-                    continue;
-                  }
-                  
-                  if (!inHunk) continue;
-                  
-                  // Increment position for every line in the hunk
-                  position++;
-                  
-                  if (line.startsWith('+')) {
-                    // This is an added line
-                    currentNewLine++;
-                    if (currentNewLine === targetLine) {
-                      return position;
-                    }
-                  } else if (line.startsWith(' ')) {
-                    // This is a context line (unchanged)
-                    currentNewLine++;
-                  }
-                  // Lines starting with '-' don't increment currentNewLine (they're deleted)
-                }
-                
-                return -1; // Line not found in diff
-              };
-              
               // Set appropriate exit code
               if (results.issues.errors.length > 0) {
                 core.setFailed(`Found ${results.issues.errors.length} critical errors that must be fixed before merging.`);