haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix typo in regex. 

Had to get rid of the regex as Search actually changes the user's
selection, which is not what we want.  (It wasn't earlier because
the search would always fail due to the typo.)

It's much faster now that we're not scanning from the beginning every
time.
This commit is contained in:
Jeff Young 2020-08-11 21:14:57 +01:00
parent bc9723340a
commit d97e519036
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pcbnew/dialogs/panel_setup_rules.cpp
View File

@ -64,13 +64,24 @@ PANEL_SETUP_RULES::~PANEL_SETUP_RULES( )
void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent ) void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
{ {
constexpr int flags = wxSTC_FIND_REGEXP| wxSTC_FIND_POSIX;
m_Parent->SetModified(); m_Parent->SetModified();
m_textEditor->SearchAnchor(); m_textEditor->SearchAnchor();
int i = std::max( 0, m_textEditor->SearchPrev( flags, "\( *rule " ) ); wxString rules = m_textEditor->GetText();
int currentPos = m_textEditor->GetCurrentPos(); int currentPos = m_textEditor->GetCurrentPos();
int startPos = 0;
for( int line = m_textEditor->LineFromPosition( currentPos ); line > 0; line-- )
{
int lineStart = m_textEditor->PositionFromLine( line );
wxString beginning = m_textEditor->GetTextRange( lineStart, lineStart + 10 );
if( beginning.StartsWith( "(rule " ) )
{
startPos = lineStart;
break;
}
}
enum enum
{ {
@ -86,7 +97,7 @@ void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
int context = NONE; int context = NONE;
int expr_context = NONE; int expr_context = NONE;
for( ; i < currentPos; ++i ) for( int i = startPos; i < currentPos; ++i )
{ {
wxChar c = m_textEditor->GetCharAt( i ); wxChar c = m_textEditor->GetCharAt( i );