portacode 0.3.19.dev1__tar.gz → 0.3.19.dev2__tar.gz

{portacode-0.3.19.dev1 → portacode-0.3.19.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portacode
-Version: 0.3.19.dev1
+Version: 0.3.19.dev2
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian

{portacode-0.3.19.dev1 → portacode-0.3.19.dev2}/portacode/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.19.dev1'
-__version_tuple__ = version_tuple = (0, 3, 19, 'dev1')
+__version__ = version = '0.3.19.dev2'
+__version_tuple__ = version_tuple = (0, 3, 19, 'dev2')

{portacode-0.3.19.dev1 → portacode-0.3.19.dev2}/portacode/connection/handlers/project_state_handlers.py

@@ -401,7 +401,7 @@ class GitManager:
             return None
     
     def _generate_html_diff(self, original_content: str, modified_content: str, file_path: str) -> Optional[str]:
-        """Generate HTML diff with syntax highlighting using Pygments and diff-match-patch."""
+        """Generate unified HTML diff with syntax highlighting using Pygments and diff-match-patch."""
         if not DIFF_MATCH_PATCH_AVAILABLE or not PYGMENTS_AVAILABLE:
             logger.debug("Required libraries not available for HTML diff generation")
             return None
@@ -415,24 +415,12 @@ class GitManager:
             # Get Pygments lexer for syntax highlighting
             lexer = self._get_pygments_lexer(file_path)
             
-            # Create HTML formatter with custom CSS classes
-            formatter = HtmlFormatter(
-                style='monokai',
-                noclasses=False,
-                cssclass='highlight',
-                linenos=True,
-                lineanchors='line',
-                anchorlinenos=True,
-                hl_lines=[]
-            )
-            
-            # Split content into lines for line-by-line processing
-            original_lines = original_content.splitlines(keepends=True)
-            modified_lines = modified_content.splitlines(keepends=True)
+            # Convert diffs to line-based unified diff
+            unified_diff_lines = self._create_unified_diff_lines(diffs, original_content, modified_content)
             
-            # Build HTML diff content
+            # Build HTML
             html_parts = []
-            html_parts.append('<div class="pygments-diff-container">')
+            html_parts.append('<div class="unified-diff-container">')
             
             # Add stats header
             char_additions = sum(len(text) for op, text in diffs if op == 1)
@@ -446,31 +434,45 @@ class GitManager:
                 </div>
             ''')
             
-            # Add side-by-side diff
-            html_parts.append('<div class="diff-sides">')
+            # Generate unified diff view
+            html_parts.append('<div class="diff-content">')
+            html_parts.append('<table class="diff-table">')
             
-            # Left side (original)
-            html_parts.append('<div class="diff-side original">')
-            html_parts.append('<h4>Original</h4>')
-            if lexer and original_content.strip():
-                highlighted = highlight(original_content, lexer, formatter)
-                html_parts.append(highlighted)
-            else:
-                html_parts.append(f'<pre class="highlight"><code>{self._escape_html(original_content)}</code></pre>')
-            html_parts.append('</div>')
+            for line_info in unified_diff_lines:
+                line_type = line_info['type']  # 'context', 'delete', 'add', 'header'
+                old_line_num = line_info.get('old_line_num', '')
+                new_line_num = line_info.get('new_line_num', '')
+                content = line_info['content']
+                
+                # Apply syntax highlighting to the content
+                if lexer and content.strip() and line_type != 'header':
+                    try:
+                        # Remove the +/- prefix for highlighting, then add it back
+                        clean_content = content[1:] if content and content[0] in '+-' else content
+                        highlighted = highlight(clean_content, lexer, HtmlFormatter(nowrap=True, noclasses=False))
+                        # Add the prefix back
+                        if content and content[0] in '+-':
+                            highlighted = content[0] + highlighted[len(clean_content):]
+                        content = highlighted
+                    except Exception:
+                        content = self._escape_html(content)
+                else:
+                    content = self._escape_html(content)
+                
+                # CSS classes for different line types
+                row_class = f'diff-line diff-{line_type}'
+                
+                html_parts.append(f'''
+                    <tr class="{row_class}">
+                        <td class="line-num old-line-num">{old_line_num}</td>
+                        <td class="line-num new-line-num">{new_line_num}</td>
+                        <td class="line-content">{content}</td>
+                    </tr>
+                ''')
             
-            # Right side (modified)
-            html_parts.append('<div class="diff-side modified">')
-            html_parts.append('<h4>Modified</h4>')
-            if lexer and modified_content.strip():
-                highlighted = highlight(modified_content, lexer, formatter)
-                html_parts.append(highlighted)
-            else:
-                html_parts.append(f'<pre class="highlight"><code>{self._escape_html(modified_content)}</code></pre>')
+            html_parts.append('</table>')
+            html_parts.append('</div>')
             html_parts.append('</div>')
-            
-            html_parts.append('</div>')  # Close diff-sides
-            html_parts.append('</div>')  # Close container
             
             return ''.join(html_parts)
             
@@ -478,6 +480,54 @@ class GitManager:
             logger.error("Error generating HTML diff: %s", e)
             return None
     
+    def _create_unified_diff_lines(self, diffs, original_content: str, modified_content: str):
+        """Create unified diff lines from diff-match-patch output."""
+        lines = []
+        
+        # Split content into lines
+        original_lines = original_content.splitlines()
+        modified_lines = modified_content.splitlines()
+        
+        old_line_num = 1
+        new_line_num = 1
+        
+        # Process each diff operation
+        for op, text in diffs:
+            text_lines = text.splitlines()
+            
+            if op == 0:  # EQUAL - context lines
+                for line in text_lines:
+                    lines.append({
+                        'type': 'context',
+                        'old_line_num': old_line_num,
+                        'new_line_num': new_line_num,
+                        'content': ' ' + line
+                    })
+                    old_line_num += 1
+                    new_line_num += 1
+                    
+            elif op == -1:  # DELETE
+                for line in text_lines:
+                    lines.append({
+                        'type': 'delete',
+                        'old_line_num': old_line_num,
+                        'new_line_num': '',
+                        'content': '-' + line
+                    })
+                    old_line_num += 1
+                    
+            elif op == 1:  # INSERT
+                for line in text_lines:
+                    lines.append({
+                        'type': 'add',
+                        'old_line_num': '',
+                        'new_line_num': new_line_num,
+                        'content': '+' + line
+                    })
+                    new_line_num += 1
+        
+        return lines
+    
     def _escape_html(self, text: str) -> str:
         """Escape HTML special characters."""
         return (text.replace('&', '&amp;')

{portacode-0.3.19.dev1 → portacode-0.3.19.dev2}/portacode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portacode
-Version: 0.3.19.dev1
+Version: 0.3.19.dev2
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian