expand the editor window to better display edit error for model

opendevin/runtime/plugins/agent_skills/agentskills.py

@@ -392,6 +392,7 @@ def _edit_file_impl(
     src_abs_path = os.path.abspath(file_name)
     first_error_line = None
     try:
+        n_added_lines = None
         # Create a temporary file
         with tempfile.NamedTemporaryFile('w', delete=False) as temp_file:
             temp_file_path = temp_file.name
@@ -401,35 +402,34 @@ def _edit_file_impl(
                 lines = original_file.readlines()
 
             if is_append:
+                content_lines = content.splitlines(keepends=True)
+                n_added_lines = len(content_lines)
                 if lines and not (len(lines) == 1 and lines[0].strip() == ''):
+                    # file is not empty
                     if not lines[-1].endswith('\n'):
                         lines[-1] += '\n'
-                    content_lines = content.splitlines(keepends=True)
                     new_lines = lines + content_lines
                     content = ''.join(new_lines)
+                else:
+                    # file is empty
+                    content = ''.join(content_lines)
+
             elif is_insert:
+                inserted_lines = [
+                    content + '\n' if not content.endswith('\n') else content
+                ]
                 if len(lines) == 0:
-                    new_lines = [
-                        content + '\n' if not content.endswith('\n') else content
-                    ]
+                    new_lines = inserted_lines
                 elif start is not None:
                     if len(lines) == 1 and lines[0].strip() == '':
                         # if the file with only 1 line and that line is empty
                         lines = []
 
                     if len(lines) == 0:
-                        new_lines = [
-                            content + '\n' if not content.endswith('\n') else content
-                        ]
+                        new_lines = inserted_lines
                     else:
                         new_lines = (
-                            lines[: start - 1]
-                            + [
-                                content + '\n'
-                                if not content.endswith('\n')
-                                else content
-                            ]
-                            + lines[start - 1 :]
+                            lines[: start - 1] + inserted_lines + lines[start - 1 :]
                         )
                 else:
                     assert start is None
@@ -438,8 +438,10 @@ def _edit_file_impl(
                         f'Invalid line number: {start}. Line numbers must be between 1 and {len(lines)} (inclusive).\n'
                         f'{ERROR_MSG_SUFFIX}'
                     ) + '\n'
+                    return ret_str
 
                 content = ''.join(new_lines)
+                n_added_lines = len(inserted_lines)
             else:
                 # Handle cases where start or end are None
                 if start is None:
@@ -468,6 +470,7 @@ def _edit_file_impl(
                 if not content.endswith('\n'):
                     content += '\n'
                 content_lines = content.splitlines(True)
+                n_added_lines = len(content_lines)
                 new_lines = lines[: start - 1] + content_lines + lines[end:]
                 content = ''.join(new_lines)
 
@@ -493,22 +496,37 @@ def _edit_file_impl(
             lint_error, first_error_line = _lint_file(file_name)
             if lint_error is not None:
                 if first_error_line is not None:
-                    CURRENT_LINE = int(first_error_line)
+                    show_line = int(first_error_line)
+                elif is_append:
+                    # original end-of-file
+                    show_line = len(lines)
+                # insert OR edit WILL provide meaningful line numbers
+                elif start is not None and end is not None:
+                    show_line = int((start + end) / 2)
+                else:
+                    raise ValueError('Invalid state. This should never happen.')
+
                 ret_str += LINTER_ERROR_MSG
                 ret_str += lint_error + '\n'
 
+                editor_lines = n_added_lines + 20
+
                 ret_str += '[This is how your edit would have looked if applied]\n'
                 ret_str += '-------------------------------------------------\n'
                 ret_str += (
-                    _print_window(file_name, CURRENT_LINE, 10, return_str=True) + '\n'
+                    _print_window(file_name, show_line, editor_lines, return_str=True)
+                    + '\n'
                 )
                 ret_str += '-------------------------------------------------\n\n'
 
                 ret_str += '[This is the original code before your edit]\n'
                 ret_str += '-------------------------------------------------\n'
                 ret_str += (
                     _print_window(
-                        original_file_backup_path, CURRENT_LINE, 10, return_str=True
+                        original_file_backup_path,
+                        show_line,
+                        editor_lines,
+                        return_str=True,
                     )
                     + '\n'
                 )

tests/unit/test_agent_skill.py

@@ -457,7 +457,10 @@ def check(any_int):
             + 'E999 IndentationError: unexpected indent\n'
             '[This is how your edit would have looked if applied]\n'
             '-------------------------------------------------\n'
-            '(3 more lines above)\n'
+            '(this is the beginning of the file)\n'
+            '1|def any_int(a, b, c):\n'
+            '2|    return isinstance(a, int) and isinstance(b, int) and isinstance(c, int)\n'
+            '3|\n'
             '4|def test_any_int():\n'
             '5|    assert any_int(1, 2, 3) == True\n'
             '6|    assert any_int(1.5, 2, 3) == False\n'
@@ -469,12 +472,22 @@ def check(any_int):
             '12|    assert any_int(0, 0, 0) == True\n'
             '13|    assert any_int(-1, -2, -3) == True\n'
             '14|    assert any_int(1, -2, 3) == True\n'
-            '(19 more lines below)\n'
+            '15|    assert any_int(1.5, -2, 3) == False\n'
+            '16|    assert any_int(1, -2.5, 3) == False\n'
+            '17|\n'
+            '18|def check(any_int):\n'
+            '19|    # Check some simple cases\n'
+            '20|    assert any_int(2, 3, 1)==True, "This prints if this assert fails 1 (good for debugging!)"\n'
+            '21|    assert any_int(2.5, 2, 3)==False, "This prints if this assert fails 2 (good for debugging!)"\n'
+            '(12 more lines below)\n'
             '-------------------------------------------------\n'
             '\n'
             '[This is the original code before your edit]\n'
             '-------------------------------------------------\n'
-            '(3 more lines above)\n'
+            '(this is the beginning of the file)\n'
+            '1|def any_int(a, b, c):\n'
+            '2|    return isinstance(a, int) and isinstance(b, int) and isinstance(c, int)\n'
+            '3|\n'
             '4|def test_any_int():\n'
             '5|    assert any_int(1, 2, 3) == True\n'
             '6|    assert any_int(1.5, 2, 3) == False\n'
@@ -486,7 +499,14 @@ def check(any_int):
             '12|    assert any_int(0, 0, 0) == True\n'
             '13|    assert any_int(-1, -2, -3) == True\n'
             '14|    assert any_int(1, -2, 3) == True\n'
-            '(19 more lines below)\n'
+            '15|    assert any_int(1.5, -2, 3) == False\n'
+            '16|    assert any_int(1, -2.5, 3) == False\n'
+            '17|\n'
+            '18|def check(any_int):\n'
+            '19|    # Check some simple cases\n'
+            '20|    assert any_int(2, 3, 1)==True, "This prints if this assert fails 1 (good for debugging!)"\n'
+            '21|    assert any_int(2.5, 2, 3)==False, "This prints if this assert fails 2 (good for debugging!)"\n'
+            '(12 more lines below)\n'
             '-------------------------------------------------\n'
             'Your changes have NOT been applied. Please fix your edit command and try again.\n'
             'You either need to 1) Specify the correct start/end line arguments or 2) Correct your edit code.\n'
@@ -1408,17 +1428,17 @@ def test_lint_file_fail_undefined_name_long(tmp_path, monkeypatch, capsys):
         f'ERRORS:\n{error_message}\n'
         '[This is how your edit would have looked if applied]\n'
         '-------------------------------------------------\n'
-        '(494 more lines above)\n'
-        + _numbered_test_lines(error_line - 5, error_line - 1)
+        '(489 more lines above)\n'
+        + _numbered_test_lines(error_line - 10, error_line - 1)
         + '500|undefined_name()\n'
-        + _numbered_test_lines(error_line + 1, error_line + 5)
-        + '(496 more lines below)\n'
+        + _numbered_test_lines(error_line + 1, error_line + 10)
+        + '(491 more lines below)\n'
         + '-------------------------------------------------\n\n'
         '[This is the original code before your edit]\n'
         '-------------------------------------------------\n'
-        '(494 more lines above)\n'
-        + _numbered_test_lines(error_line - 5, error_line + 5)
-        + '(495 more lines below)\n'
+        '(489 more lines above)\n'
+        + _numbered_test_lines(error_line - 10, error_line + 10)
+        + '(490 more lines below)\n'
         + '-------------------------------------------------\n'
         'Your changes have NOT been applied. Please fix your edit command and try again.\n'
         'You either need to 1) Specify the correct start/end line arguments or 2) Correct your edit code.\n'