Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-30 01:56:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Implement glob match for path and extension search in Locate bar #336 (issue SpartanJ/ecode#336).

Browse Source
This commit is contained in:
Martín Lucas Golini
2024-09-24 23:13:53 -03:00
parent 42c4fd5f6c
commit bef41153c1
8 changed files with 116 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/tools/ecode/universallocator.cpp
View File

@@ -226,6 +226,15 @@ UniversalLocator::UniversalLocator( UICodeEditorSplitter* editorSplitter, UIScen
},
nullptr, nullptr, false } );
mLocatorProviders.push_back(
{ "g",
mUISceneNode->i18n( "search_files_with_glob_match", "Search files with glob matching" ),
[this]( auto ) {
showLocateTableGlob();
return true;
},
nullptr, nullptr, false } );
// clang-format off
mLocatorProviders.push_back( { "sb", mUISceneNode->i18n( "switch_build", "Switch Build" ),
[this](auto) {
@@ -330,7 +339,7 @@ void UniversalLocator::toggleLocateBar() {
}
}
void UniversalLocator::updateFilesTable() {
void UniversalLocator::updateFilesTable( bool useGlob ) {
auto text = mLocateInput->getText();
if ( pathHasPosition( text ) ) {
@@ -338,13 +347,18 @@ void UniversalLocator::updateFilesTable() {
text = pathAndPos.first;
}
if ( useGlob && String::startsWith( text, "g " ) )
text = text.substr( 2 );
if ( !mApp->isDirTreeReady() ) {
mLocateTable->setModel(
ProjectDirectoryTree::emptyModel( getLocatorCommands(), mApp->getCurrentProject() ) );
mLocateTable->getSelection().set( mLocateTable->getModel()->index( 0 ) );
} else if ( !mLocateInput->getText().empty() ) {
#if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN || defined( __EMSCRIPTEN_PTHREADS__ )
mApp->getDirTree()->asyncFuzzyMatchTree(
mApp->getDirTree()->asyncMatchTree(
useGlob ? ProjectDirectoryTree::MatchType::Glob
: ProjectDirectoryTree::MatchType::Fuzzy,
text, LOCATEBAR_MAX_RESULTS,
[this, text]( auto res ) {
mUISceneNode->runOnMainThread( [this, res] {
@@ -356,8 +370,11 @@ void UniversalLocator::updateFilesTable() {
},
mApp->getCurrentProject() );
#else
mLocateTable->setModel( mApp->getDirTree()->fuzzyMatchTree( text, LOCATEBAR_MAX_RESULTS,
mApp->getCurrentProject() ) );
mLocateTable->setModel(
useGlob ? mApp->getDirTree()->globMatchTree( text, LOCATEBAR_MAX_RESULTS,
mApp->getCurrentProject() )
: mApp->getDirTree()->fuzzyMatchTree( text, LOCATEBAR_MAX_RESULTS,
mApp->getCurrentProject() ) );
mLocateTable->getSelection().set( mLocateTable->getModel()->index( 0 ) );
mLocateTable->scrollToTop();
#endif
@@ -412,6 +429,14 @@ void UniversalLocator::showLocateTable() {
updateFilesTable();
}
void UniversalLocator::showLocateTableGlob() {
mLocateTable->setVisible( true );
Vector2f pos( mLocateInput->convertToWorldSpace( { 0, 0 } ) );
pos.y -= mLocateTable->getPixelsSize().getHeight();
mLocateTable->setPixelsPosition( pos );
updateFilesTable( true );
}
void UniversalLocator::goToLine() {
showLocateBar();
mLocateInput->setText( "l " );