Skip to content

Commit cbea33b

Browse files
committed
1. 切换为Eclipse的代码格式化工具
1 parent 121018c commit cbea33b

File tree

2 files changed

+20
-9
lines changed

2 files changed

+20
-9
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@
207207

208208
<!-- 代码格式化依赖-->
209209
<dependency>
210-
<groupId>com.google.googlejavaformat</groupId>
211-
<artifactId>google-java-format</artifactId>
212-
<version>1.17.0</version> <!-- 请使用最新版本 -->
210+
<groupId>org.eclipse.jdt</groupId>
211+
<artifactId>org.eclipse.jdt.core</artifactId>
212+
<version>3.32.0</version> <!-- 最新版本 -->
213213
</dependency>
214214

215215
</dependencies>

src/main/java/com/tml/otowbackend/util/CodeFormatterUtil.java

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package com.tml.otowbackend.util;
22

3-
import com.google.googlejavaformat.java.Formatter;
4-
import com.google.googlejavaformat.java.FormatterException;
53
import lombok.extern.slf4j.Slf4j;
4+
import org.eclipse.jdt.core.ToolFactory;
5+
import org.eclipse.jdt.core.formatter.CodeFormatter;
6+
import org.eclipse.jface.text.Document;
7+
import org.eclipse.text.edits.TextEdit;
68

79
import java.util.ArrayList;
810
import java.util.Arrays;
@@ -23,13 +25,22 @@ public class CodeFormatterUtil {
2325
* @return 格式化后的 Java 代码
2426
*/
2527
public static String formatCode(String code) {
26-
Formatter formatter = new Formatter();
27-
try {
28-
return formatter.formatSource(code);
29-
} catch (FormatterException e) {
28+
CodeFormatter formatter = ToolFactory.createCodeFormatter(null); // 使用默认配置
29+
TextEdit edit = formatter.format(CodeFormatter.K_COMPILATION_UNIT, code, 0, code.length(), 0, null);
30+
31+
if (edit == null) {
3032
log.error("代码格式化失败");
3133
return code;
3234
}
35+
36+
Document document = new Document(code);
37+
try {
38+
edit.apply(document);
39+
} catch (Exception e) {
40+
log.error("代码格式化失败", e);
41+
return code;
42+
}
43+
return document.get();
3344
}
3445

3546
/**

0 commit comments

Comments
 (0)