MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[vcs/llm] Remove redundant lines from diff sent to LLM

Browse Source 
GitOrigin-RevId: 898df71f801b8f11a22b3123b6e21486b426839c
This commit is contained in:
Ilia.Shulgin
2024-11-26 16:55:57 +00:00
committed by intellij-monorepo-bot
parent 7404f51dfc
commit f1d078e660
1 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/UnifiedDiffWriter.java
+44 -26
View File
@@ -9,6 +9,7 @@ import com.intellij.openapi.vcs.changes.patch.GitPatchWriter;
import com.intellij.project.ProjectKt;
import com.intellij.util.LineSeparator;
import com.intellij.util.ObjectUtils;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -102,33 +103,38 @@ public final class UnifiedDiffWriter {
: StringUtil.notNullize(patch.getLineSeparator(), headerLineSeparator);
writeFileHeading(writer, basePath, patch, headerLineSeparator, additionalMap);
for (PatchHunk hunk : patch.getHunks()) {
writeHunkStart(writer, hunk.getStartLineBefore(), hunk.getEndLineBefore(), hunk.getStartLineAfter(), hunk.getEndLineAfter(),
headerLineSeparator);
for (PatchLine line : hunk.getLines()) {
char prefixChar = switch (line.getType()) {
case ADD -> '+';
case REMOVE -> '-';
case CONTEXT -> ' ';
};
String text = line.getText();
text = StringUtil.trimEnd(text, "\n");
writeLine(writer, text, prefixChar);
if (line.isSuppressNewLine()) {
// do not use fileContentLineSeparator here, as this line has no own separator
writer.write(headerLineSeparator + NO_NEWLINE_SIGNATURE + headerLineSeparator);
}
else {
writer.write(fileContentLineSeparator);
}
}
}
writeHunk(writer, patch, headerLineSeparator, fileContentLineSeparator);
}
for (FilePatch patch : noContentPatches) {
GitPatchWriter.writeGitHeader(writer, basePath, patch, headerLineSeparator);
}
}
@ApiStatus.Internal
public static void writeHunk(@NotNull Writer writer, TextFilePatch patch, String headerLineSeparator, String fileContentLineSeparator) throws IOException {
for (PatchHunk hunk : patch.getHunks()) {
writeHunkStart(writer, hunk.getStartLineBefore(), hunk.getEndLineBefore(), hunk.getStartLineAfter(), hunk.getEndLineAfter(),
headerLineSeparator);
for (PatchLine line : hunk.getLines()) {
char prefixChar = switch (line.getType()) {
case ADD -> '+';
case REMOVE -> '-';
case CONTEXT -> ' ';
};
String text = line.getText();
text = StringUtil.trimEnd(text, "\n");
writeLine(writer, text, prefixChar);
if (line.isSuppressNewLine()) {
// do not use fileContentLineSeparator here, as this line has no own separator
writer.write(headerLineSeparator + NO_NEWLINE_SIGNATURE + headerLineSeparator);
}
else {
writer.write(fileContentLineSeparator);
}
}
}
}
private static String getPathRelatedToProjectDir(@Nullable Project project, @Nullable Path patchBasePath, @NotNull String filePath) {
if (project == null || patchBasePath == null) return filePath;
String newBaseDir = project.getBasePath();
@@ -147,10 +153,22 @@ public final class UnifiedDiffWriter {
writeAdditionalInfo(writer, lineSeparator, additionalMap);
writer.write(HEADER_SEPARATOR + lineSeparator);
GitPatchWriter.writeGitHeader(writer, basePath, patch, lineSeparator);
writeRevisionHeading(writer, "---", getRevisionHeadingPath(patch, true),
patch.getBeforeVersionId(), lineSeparator);
writeRevisionHeading(writer, "+++", getRevisionHeadingPath(patch, false),
patch.getAfterVersionId(), lineSeparator);
writeBeforePath(writer, patch, lineSeparator, true);
writeAfterPath(writer, patch, lineSeparator, true);
}
@ApiStatus.Internal
public static void writeAfterPath(@NotNull Writer writer, @NotNull FilePatch patch, @NotNull String lineSeparator, boolean writeVersion)
throws IOException {
String versionId = writeVersion ? patch.getAfterVersionId() : "";
writeRevisionHeading(writer, "+++", getRevisionHeadingPath(patch, false), versionId, lineSeparator);
}
@ApiStatus.Internal
public static void writeBeforePath(@NotNull Writer writer, @NotNull FilePatch patch, @NotNull String lineSeparator, boolean writeVersion)
throws IOException {
String versionId = writeVersion ? patch.getBeforeVersionId() : "";
writeRevisionHeading(writer, "---", getRevisionHeadingPath(patch, true), versionId, lineSeparator);
}
private static void writeAdditionalInfo(@NotNull Writer writer,
@@ -189,8 +207,8 @@ public final class UnifiedDiffWriter {
throws IOException {
writer.write(prefix + " ");
writer.write(revisionPath);
writer.write("\t");
if (!StringUtil.isEmptyOrSpaces(revisionName)) {
writer.write("\t");
writer.write(revisionName);
}
writer.write(lineSeparator);