JCNC/JNotepad
JCNC/JNotepad
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
许轲 2023-09-28 02:51:40 +08:00
parent 03f663deba
commit 47da48ba20
1 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/main/java/org/jcnc/jnotepad/ui/module/LineNumberTextArea.java
View File

@ -103,7 +103,7 @@ public class LineNumberTextArea extends CodeArea {
this.getVisibleParagraphs().addModificationObserver this.getVisibleParagraphs().addModificationObserver
( (
new JavaKeywordsDemo.VisibleParagraphStyler<>(this, this::computeHighlighting) new LineNumberTextArea.VisibleParagraphStyler<>(this, this::computeHighlighting)
); );
// 自动缩进：在按下回车键时插入上一行的缩进 // 自动缩进：在按下回车键时插入上一行的缩进
@ -132,16 +132,7 @@ public class LineNumberTextArea extends CodeArea {
StyleSpansBuilder<Collection<String>> spansBuilder StyleSpansBuilder<Collection<String>> spansBuilder
= new StyleSpansBuilder<>(); = new StyleSpansBuilder<>();
while (matcher.find()) { while (matcher.find()) {
String styleClass = String styleClass = getStyleClass(matcher);
matcher.group("KEYWORD") != null ? "keyword" :
matcher.group("PAREN") != null ? "paren" :
matcher.group("BRACE") != null ? "brace" :
matcher.group("BRACKET") != null ? "bracket" :
matcher.group("SEMICOLON") != null ? "semicolon" :
matcher.group("STRING") != null ? "string" :
matcher.group("COMMENT") != null ? "comment" :
null; /* 永远不会发生 */
assert styleClass != null;
spansBuilder.add(Collections.emptyList(), matcher.start() - lastKwEnd); spansBuilder.add(Collections.emptyList(), matcher.start() - lastKwEnd);
spansBuilder.add(Collections.singleton(styleClass), matcher.end() - matcher.start()); spansBuilder.add(Collections.singleton(styleClass), matcher.end() - matcher.start());
lastKwEnd = matcher.end(); lastKwEnd = matcher.end();
@ -150,34 +141,50 @@ public class LineNumberTextArea extends CodeArea {
return spansBuilder.create(); return spansBuilder.create();
} }
private static String getStyleClass(Matcher matcher) {
String styleClass =
matcher.group("KEYWORD") != null ? "keyword" :
matcher.group("PAREN") != null ? "paren" :
matcher.group("BRACE") != null ? "brace" :
matcher.group("BRACKET") != null ? "bracket" :
matcher.group("SEMICOLON") != null ? "semicolon" :
matcher.group("STRING") != null ? "string" :
matcher.group("COMMENT") != null ? "comment" :
null; /* 永远不会发生 */
assert styleClass != null;
return styleClass;
}
static class VisibleParagraphStyler<PS, SEG, S> implements Consumer<ListModification<? extends Paragraph<PS, SEG, S>>> { static class VisibleParagraphStyler<PS, SEG, S> implements Consumer<ListModification<? extends Paragraph<PS, SEG, S>>> {
private final GenericStyledArea<PS, SEG, S> area; private final GenericStyledArea<PS, SEG, S> area;
private final Function<String, StyleSpans<S>> computeStyles; private final Function<String,StyleSpans<S>> computeStyles;
private int prevParagraph, prevTextLength; private int prevParagraph, prevTextLength;
public VisibleParagraphStyler(GenericStyledArea<PS, SEG, S> area, Function<String, StyleSpans<S>> computeStyles) { public VisibleParagraphStyler( GenericStyledArea<PS, SEG, S> area, Function<String,StyleSpans<S>> computeStyles )
{
this.computeStyles = computeStyles; this.computeStyles = computeStyles;
this.area = area; this.area = area;
} }
@Override @Override
public void accept(ListModification<? extends Paragraph<PS, SEG, S>> lm) { public void accept( ListModification<? extends Paragraph<PS, SEG, S>> lm )
if (lm.getAddedSize() > 0) { {
Platform.runLater(() -> if ( lm.getAddedSize() > 0 ) Platform.runLater( () ->
{ {
int paragraph = Math.min(area.firstVisibleParToAllParIndex() + lm.getFrom(), area.getParagraphs().size() - 1); int paragraph = Math.min( area.firstVisibleParToAllParIndex() + lm.getFrom(), area.getParagraphs().size()-1 );
String text = area.getText(paragraph, 0, paragraph, area.getParagraphLength(paragraph)); String text = area.getText( paragraph, 0, paragraph, area.getParagraphLength( paragraph ) );
if (paragraph != prevParagraph || text.length() != prevTextLength) { if ( paragraph != prevParagraph || text.length() != prevTextLength )
if (paragraph < area.getParagraphs().size() - 1) { {
int startPos = area.getAbsolutePosition(paragraph, 0); if ( paragraph < area.getParagraphs().size()-1 )
area.setStyleSpans(startPos, computeStyles.apply(text)); {
} int startPos = area.getAbsolutePosition( paragraph, 0 );
prevTextLength = text.length(); area.setStyleSpans( startPos, computeStyles.apply( text ) );
prevParagraph = paragraph;
} }
}); prevTextLength = text.length();
} prevParagraph = paragraph;
}
});
} }
} }