Skip to content

Revise entry sorting: refactor for readability, remove duplicates, sort rest alphabetically #52

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

Open
LinqLover wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revise entry sorting: refactor for readability, remove duplicates, sort rest alphabetically #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions packages/Autocompletion.package/ECModel.class/instance/sortEntries.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
accessing
sortEntries

entries sort: [:aEntry :bEntry | | aPriority bPriority |
aPriority := aEntry matchNarrowString: narrowString.
bPriority := bEntry matchNarrowString: narrowString.
aPriority = bPriority
ifTrue: [aEntry <= bEntry]
ifFalse: [aPriority >= bPriority]]
| seen |
entries sort:
[:entry | entry matchNarrowString: narrowString] descending
Copy link
Copy Markdown
Owner

@LeonMatthes LeonMatthes Jan 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, cool, no idea #descending worked on BlockClosure 👍

, [:aEntry :bEntry | aEntry <= bEntry ifTrue: [-1] ifFalse: [0]]
Copy link
Copy Markdown
Owner

@LeonMatthes LeonMatthes Jan 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does the , operator on BlockClosure come from???
Is that new? It doesn't work on my system.

Or am I reading the syntax incorrectly?

Copy link
Copy Markdown
Owner

@LeonMatthes LeonMatthes Jan 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, okay, descending returns a PropertySortFunction that can be comma-chained...
That's wild 😅, but okay.

, [:aEntry :bEntry | (aEntry contents compare: bEntry contents caseSensitive: ECPreferences caseSensitive) - 2].

"remove any duplicates"
seen := Set new.
Copy link
Copy Markdown
Owner

@LeonMatthes LeonMatthes Jan 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't mind removing duplicates, as discussed in #39 , duplicates are just a side-effect of adding all selectors in the untyped model.
There's no real point in displaying them.

How is performance though? First sorting, then converting into a Set sounds a bit expensive 🤔
Especially in the untyped model that contains all selectors.

entries removeAllSuchThat: [:entry |
(seen ifAbsentAdd: entry contents) not].
2 changes: 1 addition & 1 deletion packages/Autocompletion.package/ECModel.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"resetSelectors" : "ul 9/26/2010 19:23",
"selectorsAsSymbols" : "LM 3/20/2019 15:23",
"setClass:" : "bar 1/6/2005 08:54",
"sortEntries" : "LM 4/9/2019 16:37",
"sortEntries" : "ct 12/21/2023 20:27",
"theClass" : "bar 3/1/2006 15:48",
"title" : "bar 12/6/2004 14:44",
"toggleExpand" : "bar 12/5/2004 23:17" } }