Skip to content

fix: 修复代码块图钉删除代码行后的行号显示问题 #16 #25

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

Merged
08820048 merged 2 commits into from
May 26, 2025
Merged

fix: 修复代码块图钉删除代码行后的行号显示问题 #16 #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b592415
fix: 修复代码块图钉删除代码行后的行号显示问题 #16
08820048 May 26, 2025
dbabb2b
fix: 修复代码块图钉删除代码行后的行号显示问题，增强跨平台兼容性 #16
08820048 May 26, 2025
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
46 changes: 31 additions & 15 deletions src/main/java/cn/ilikexff/codepins/core/PinEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,37 +213,53 @@ public String toString() {
if (!tags.isEmpty()) {
tagsStr = " [" + String.join(", ", tags) + "]";
}
return typeLabel + " " + filePath + " @ Line ? (无效标记)"
return typeLabel + " " + filePath.replace("\\", "/") + " @ Line ? (无效标记)"
+ (note != null && !note.isEmpty() ? " - " + note : "")
+ tagsStr;
}

Document doc = marker.getDocument();
String lineInfo;

if (isBlock) {
// 如果是代码块，显示起始行号到结束行号
int startLine = doc.getLineNumber(marker.getStartOffset()) + 1; // 转为从1开始的行号
int endLine = doc.getLineNumber(marker.getEndOffset()) + 1; // 转为从1开始的行号
try {
if (isBlock) {
// 获取代码块的起始和结束偏移量
int startOffset = marker.getStartOffset();
int endOffset = marker.getEndOffset();

// 检查代码块是否完全被删除
if (startOffset == endOffset) {
// 代码块图钉的代码已被完全删除，显示为无效状态
lineInfo = "Line ?";
} else {
// 如果是代码块，显示起始行号到结束行号
int startLine = doc.getLineNumber(startOffset) + 1; // 转为从1开始的行号
int endLine = doc.getLineNumber(endOffset) + 1; // 转为从1开始的行号

// 如果起始行和结束行相同，则只显示一个行号
if (startLine == endLine) {
lineInfo = "Line " + startLine;
// 如果起始行和结束行相同，则只显示一个行号
if (startLine == endLine) {
lineInfo = "Line " + startLine;
} else {
lineInfo = "Line " + startLine + "-" + endLine;
}
}
} else {
lineInfo = "Line " + startLine + "-" + endLine;
// 如果是单行图钉，只显示当前行号
int line = doc.getLineNumber(marker.getStartOffset()) + 1; // 转为从1开始的行号
lineInfo = "Line " + line;
}
} else {
// 如果是单行图钉，只显示当前行号
int line = doc.getLineNumber(marker.getStartOffset()) + 1; // 转为从1开始的行号
lineInfo = "Line " + line;
} catch (IndexOutOfBoundsException e) {
// 如果行号计算出现越界异常，显示为无效状态
lineInfo = "Line ?";
System.out.println("[CodePins] 行号计算异常: " + e.getMessage());
}

String typeLabel = isBlock ? "[代码块]" : "[单行]";
String tagsStr = "";
if (!tags.isEmpty()) {
tagsStr = " [" + String.join(", ", tags) + "]";
}
return typeLabel + " " + filePath + " @ " + lineInfo
return typeLabel + " " + filePath.replace("\\", "/") + " @ " + lineInfo
+ (note != null && !note.isEmpty() ? " - " + note : "")
+ tagsStr;
} catch (Exception e) {
Expand All @@ -253,7 +269,7 @@ public String toString() {
if (!tags.isEmpty()) {
tagsStr = " [" + String.join(", ", tags) + "]";
}
return typeLabel + " " + filePath + " @ Line ? (异常: " + e.getMessage() + ")" +
return typeLabel + " " + filePath.replace("\\", "/") + " @ Line ? (异常: " + e.getMessage() + ")" +
(note != null && !note.isEmpty() ? " - " + note : "") +
tagsStr;
}
Expand Down