Skip to content

Normalize \r\n to \n for file content in LocalFilesystem.edit() #1945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
markyuclaw wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Normalize \r\n to \n for file content in LocalFilesystem.edit() #1945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb5b632
bump to 2.0.0-RC3
chickenlj Jun 11, 2026
a6c91b2
Normalize \r\n to \n for file content in LocalFilesystem.edit()
markyuclaw Jun 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agentscope-dependencies-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</developers>

<properties>
<revision>2.0.0-SNAPSHOT</revision>
<revision>2.0.0-RC3</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version>
Expand Down
2 changes: 1 addition & 1 deletion agentscope-distribution/agentscope-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
</developers>

<properties>
<revision>2.0.0-SNAPSHOT</revision>
<revision>2.0.0-RC3</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version>
Expand Down
3 changes: 2 additions & 1 deletion ...e-harness/src/main/java/io/agentscope/harness/agent/filesystem/local/LocalFilesystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,8 @@ public EditResult edit(
ReentrantLock lock = fileLocks.computeIfAbsent(lockKey, k -> new ReentrantLock());
lock.lock();
try {
String content = Files.readString(resolved, StandardCharsets.UTF_8);
String content = Files.readString(resolved, StandardCharsets.UTF_8)
.replace("\r\n", "\n").replace("\r", "\n");
String normalizedOld = oldString.replace("\r\n", "\n").replace("\r", "\n");
String normalizedNew = newString.replace("\r\n", "\n").replace("\r", "\n");

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<name>AgentScope Java - Parent</name>

<properties>
<revision>2.0.0-SNAPSHOT</revision>
<revision>2.0.0-RC3</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version>
Expand Down
Loading