Skip to content
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

Jump to bottom

--bugfix=Fix SymbolPairMatch#matchBestPair return incorrect result #611

Merged
merged 2 commits into from
Aug 26, 2024
Merged

--bugfix=Fix SymbolPairMatch#matchBestPair return incorrect result #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22e181a
--bugfix=Fix SymbolPairMatch#matchBestPair return incorrect result
StarkZhidian Aug 25, 2024
5606cdb
Merge branch 'Rosemoe:main' into main
StarkZhidian Aug 25, 2024
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
6 changes: 2 additions & 4 deletions editor/src/main/java/io/github/rosemoe/sora/widget/CodeEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1888,7 +1888,7 @@ public void commitText(CharSequence text, boolean applyAutoIndent) {
}

pair = languageSymbolPairs.matchBestPair(
this.text, cursor.left(),
this, cursor.left(),
inputText, firstCharFromText
);
}
Expand All @@ -1897,9 +1897,7 @@ public void commitText(CharSequence text, boolean applyAutoIndent) {
var editorText = this.text;
var quoteHandler = editorLanguage.getQuickQuoteHandler();

if (pair != null && pair != SymbolPairMatch.SymbolPair.EMPTY_SYMBOL_PAIR
&& (pair.shouldReplace(this))
) {
if (pair != null && pair != SymbolPairMatch.SymbolPair.EMPTY_SYMBOL_PAIR) {

// QuickQuoteHandler can easily implement the feature of AutoSurround
// and is at a higher level (customizable),
Expand Down
6 changes: 5 additions & 1 deletion editor/src/main/java/io/github/rosemoe/sora/widget/SymbolPairMatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ public final List<SymbolPair> matchBestPairList(char editChar) {
}

@Nullable
public final SymbolPair matchBestPair(Content content, CharPosition cursorPosition, char[] inputCharArray, char firstChar) {
public final SymbolPair matchBestPair(CodeEditor editor, CharPosition cursorPosition, char[] inputCharArray, char firstChar) {
final Content content = editor.getText();
// do not apply single character pairs for text with length > 1
var singleCharPair = inputCharArray == null ? matchBestPairBySingleChar(firstChar) : null;

Expand All @@ -140,6 +141,9 @@ public final SymbolPair matchBestPair(Content content, CharPosition cursorPositi

SymbolPair matchPair = null;
for (var pair : matchList) {
if (!pair.shouldReplace(editor)) {
continue;
}
var openCharArray = pair.open.toCharArray();

// if flag is not 1, no match
Expand Down