dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-25 23:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Adopt safe_abs_path

Browse source
This commit is contained in:
Paul Gauthier 2023-07-07 17:19:32 -07:00
parent 2c32fe5eb8
commit 1c1411b506
3 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
aider/coders/single_wholefile_func_coder.py
View file

@ -1,5 +1,3 @@
import os
from aider import diffs from aider import diffs
from ..dump import dump # noqa: F401 from ..dump import dump # noqa: F401
@ -88,7 +86,7 @@ class SingleWholeFileFunctionCoder(Coder):
lines = content.splitlines(keepends=True) lines = content.splitlines(keepends=True)
# ending an existing block # ending an existing block
full_path = os.path.abspath(os.path.join(self.root, fname)) full_path = self.abs_root_path(fname)
content = self.io.read_text(full_path) content = self.io.read_text(full_path)
if content is None: if content is None:

4
aider/coders/wholefile_func_coder.py
View file

@ -1,5 +1,3 @@
import os
from aider import diffs from aider import diffs
from ..dump import dump # noqa: F401 from ..dump import dump # noqa: F401
@ -99,7 +97,7 @@ class WholeFileFunctionCoder(Coder):
lines = content.splitlines(keepends=True) lines = content.splitlines(keepends=True)
# ending an existing block # ending an existing block
full_path = os.path.abspath(os.path.join(self.root, fname)) full_path = self.abs_root_path(fname)
content = self.io.read_text(full_path) content = self.io.read_text(full_path)
if content is None: if content is None:

3
aider/commands.py
View file

@ -1,5 +1,4 @@
import json import json
import os
import shlex import shlex
import subprocess import subprocess
import sys import sys
@ -350,7 +349,7 @@ class Commands:
other_files = [] other_files = []
chat_files = [] chat_files = []
for file in files: for file in files:
abs_file_path = os.path.abspath(os.path.join(self.coder.root, file)) abs_file_path = self.coder.abs_root_path(file)
if abs_file_path in self.coder.abs_fnames: if abs_file_path in self.coder.abs_fnames:
chat_files.append(file) chat_files.append(file)
else: else: