From 57fd9b5bdb398d3fb6ebc2bf867b6c935ee08025 Mon Sep 17 00:00:00 2001
From: ewt45 <79033456+ewt45@users.noreply.github.com>
Date: Mon, 30 Mar 2026 03:07:04 +0800
Subject: [PATCH] fix(gui): add file end line feed for exported code (PR #2836)

chore: add file end line feed for export code
---
 .../java/jadx/gui/ui/popupmenu/JClassPopupMenu.java    | 10 ++--------
 .../java/jadx/gui/ui/popupmenu/JResourcePopupMenu.java |  9 ++-------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/popupmenu/JClassPopupMenu.java b/jadx-gui/src/main/java/jadx/gui/ui/popupmenu/JClassPopupMenu.java
index dec79ee09..b9bdc250c 100644
--- a/jadx-gui/src/main/java/jadx/gui/ui/popupmenu/JClassPopupMenu.java
+++ b/jadx-gui/src/main/java/jadx/gui/ui/popupmenu/JClassPopupMenu.java
@@ -1,8 +1,5 @@
 package jadx.gui.ui.popupmenu;
 
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
@@ -16,6 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import jadx.api.DecompilationMode;
+import jadx.core.dex.visitors.SaveCode;
 import jadx.gui.treemodel.JClass;
 import jadx.gui.treemodel.JNode;
 import jadx.gui.ui.MainWindow;
@@ -85,11 +83,7 @@ public class JClassPopupMenu extends JPopupMenu {
 	}
 
 	public static void saveJClass(JClass jClass, Path savePath, JClassExportType exportType) {
-		try (Writer writer = Files.newBufferedWriter(savePath, StandardCharsets.UTF_8)) {
-			writer.write(getCode(jClass, exportType));
-		} catch (Exception e) {
-			throw new RuntimeException("Error saving project", e);
-		}
+		SaveCode.save(getCode(jClass, exportType), savePath.toFile());
 	}
 
 	private static String getCode(JClass jClass, JClassExportType exportType) {
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/popupmenu/JResourcePopupMenu.java b/jadx-gui/src/main/java/jadx/gui/ui/popupmenu/JResourcePopupMenu.java
index cb672ee2c..b36b6a313 100644
--- a/jadx-gui/src/main/java/jadx/gui/ui/popupmenu/JResourcePopupMenu.java
+++ b/jadx-gui/src/main/java/jadx/gui/ui/popupmenu/JResourcePopupMenu.java
@@ -1,8 +1,6 @@
 package jadx.gui.ui.popupmenu;
 
 import java.io.IOException;
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collections;
@@ -16,6 +14,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import jadx.api.plugins.utils.CommonFileUtils;
+import jadx.core.dex.visitors.SaveCode;
 import jadx.gui.treemodel.JResource;
 import jadx.gui.ui.MainWindow;
 import jadx.gui.ui.filedialog.FileDialogWrapper;
@@ -147,11 +146,7 @@ public class JResourcePopupMenu extends JPopupMenu {
 	}
 
 	private static void exportString(JResource resource, Path savePath) {
-		try (Writer writer = Files.newBufferedWriter(savePath, StandardCharsets.UTF_8)) {
-			writer.write(resource.getCodeInfo().getCodeStr());
-		} catch (Exception e) {
-			throw new RuntimeException("Error saving file " + resource.getName(), e);
-		}
+		SaveCode.save(resource.getCodeInfo().getCodeStr(), savePath.toFile());
 	}
 
 }