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

Code completion for netclasses and netnames. 

Fixes https://gitlab.com/kicad/code/kicad/issues/5441
This commit is contained in:
Jeff Young 2020-09-01 18:35:22 +01:00
parent a35698f08a
commit ac73c99842
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pcbnew/dialogs/panel_setup_rules.cpp
View File

@ -49,6 +49,9 @@ PANEL_SETUP_RULES::PANEL_SETUP_RULES( PAGED_DIALOG* aParent, PCB_EDIT_FRAME* aFr
for( size_t i = 0; i < wxSTC_STYLE_MAX; ++i ) for( size_t i = 0; i < wxSTC_STYLE_MAX; ++i )
m_textEditor->StyleSetFont( i, fixedFont ); m_textEditor->StyleSetFont( i, fixedFont );
m_netClassRegex.Compile( "NetClass\\s*[!=]=\\s*$", wxRE_ADVANCED );
m_netNameRegex.Compile( "NetName\\s*[!=]=\\s*$", wxRE_ADVANCED );
m_compileButton->SetBitmap( KiBitmap( drc_xpm ) ); m_compileButton->SetBitmap( KiBitmap( drc_xpm ) );
m_textEditor->Bind( wxEVT_STC_CHARADDED, &PANEL_SETUP_RULES::onScintillaCharAdded, this ); m_textEditor->Bind( wxEVT_STC_CHARADDED, &PANEL_SETUP_RULES::onScintillaCharAdded, this );
@ -94,6 +97,7 @@ void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
std::stack<wxString> sexprs; std::stack<wxString> sexprs;
wxString partial; wxString partial;
wxString last;
int context = NONE; int context = NONE;
int expr_context = NONE; int expr_context = NONE;
@ -122,6 +126,7 @@ void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
} }
else if( c == '\'' ) else if( c == '\'' )
{ {
last = partial;
partial = wxEmptyString; partial = wxEmptyString;
expr_context = STRING; expr_context = STRING;
} }
@ -138,6 +143,7 @@ void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
} }
else if( c == '"' ) else if( c == '"' )
{ {
last = partial;
partial = wxEmptyString; partial = wxEmptyString;
context = STRING; context = STRING;
} }
@ -223,9 +229,9 @@ void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
tokens = "inner outer \"x\""; tokens = "inner outer \"x\"";
} }
} }
else if( context == STRING && expr_context == STRUCT_REF ) else if( context == STRING && !sexprs.empty() && sexprs.top() == "condition" )
{ {
if( !sexprs.empty() && sexprs.top() == "condition" ) if( expr_context == STRUCT_REF )
{ {
PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance(); PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();
std::set<wxString> propNames; std::set<wxString> propNames;
@ -250,6 +256,24 @@ void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
for( const wxString& funcSig : functions.GetSignatures() ) for( const wxString& funcSig : functions.GetSignatures() )
tokens += " " + funcSig; tokens += " " + funcSig;
} }
else if( expr_context == STRING )
{
if( m_netClassRegex.Matches( last ) )
{
BOARD* board = m_frame->GetBoard();
BOARD_DESIGN_SETTINGS& bds = board->GetDesignSettings();
for( const std::pair<const wxString, NETCLASSPTR>& entry : bds.GetNetClasses() )
tokens += " " + entry.first;
}
else if( m_netNameRegex.Matches( last ) )
{
BOARD* board = m_frame->GetBoard();
for( const wxString& netnameCandidate : board->GetNetClassAssignmentCandidates() )
tokens += " " + netnameCandidate;
}
}
} }
if( !tokens.IsEmpty() ) if( !tokens.IsEmpty() )

4
pcbnew/dialogs/panel_setup_rules.h
View File

@ -25,6 +25,7 @@
#ifndef PANEL_SETUP_RULES_H #ifndef PANEL_SETUP_RULES_H
#define PANEL_SETUP_RULES_H #define PANEL_SETUP_RULES_H
#include <wx/regex.h>
#include <panel_setup_rules_base.h> #include <panel_setup_rules_base.h>
class DRC; class DRC;
@ -41,6 +42,9 @@ private:
SCINTILLA_TRICKS* m_scintillaTricks; SCINTILLA_TRICKS* m_scintillaTricks;
wxString m_originalText; wxString m_originalText;
wxRegEx m_netClassRegex;
wxRegEx m_netNameRegex;
public: public:
PANEL_SETUP_RULES( PAGED_DIALOG* aParent, PCB_EDIT_FRAME* aFrame ); PANEL_SETUP_RULES( PAGED_DIALOG* aParent, PCB_EDIT_FRAME* aFrame );
~PANEL_SETUP_RULES( ) override; ~PANEL_SETUP_RULES( ) override;