From 7cb7a68b0e15c6e15ea2c432730926d0e48c55c3 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Wed, 20 Apr 2022 16:26:05 +0100 Subject: [PATCH] Make sure Type regex doesn't match before Pad_Type or Pin_Type. Fixes https://gitlab.com/kicad/code/kicad/issues/11423 --- pcbnew/dialogs/panel_setup_rules.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pcbnew/dialogs/panel_setup_rules.cpp b/pcbnew/dialogs/panel_setup_rules.cpp index dbcd2d5552..28f5f5ce38 100644 --- a/pcbnew/dialogs/panel_setup_rules.cpp +++ b/pcbnew/dialogs/panel_setup_rules.cpp @@ -55,12 +55,12 @@ PANEL_SETUP_RULES::PANEL_SETUP_RULES( PAGED_DIALOG* aParent, PCB_EDIT_FRAME* aFr m_textEditor->AutoCompSetSeparator( '|' ); - m_netClassRegex.Compile( "NetClass\\s*[!=]=\\s*$", wxRE_ADVANCED ); - m_netNameRegex.Compile( "NetName\\s*[!=]=\\s*$", wxRE_ADVANCED ); - m_typeRegex.Compile( "Type\\s*[!=]=\\s*$", wxRE_ADVANCED ); - m_padTypeRegex.Compile( "Pad_Type\\s*[!=]=\\s*$", wxRE_ADVANCED ); - m_pinTypeRegex.Compile( "Pin_Type\\s*[!=]=\\s*$", wxRE_ADVANCED ); - m_fabPropRegex.Compile( "Fabrication_Property\\s*[!=]=\\s*$", wxRE_ADVANCED ); + m_netClassRegex.Compile( "^NetClass\\s*[!=]=\\s*$", wxRE_ADVANCED ); + m_netNameRegex.Compile( "^NetName\\s*[!=]=\\s*$", wxRE_ADVANCED ); + m_typeRegex.Compile( "^Type\\s*[!=]=\\s*$", wxRE_ADVANCED ); + m_padTypeRegex.Compile( "^Pad_Type\\s*[!=]=\\s*$", wxRE_ADVANCED ); + m_pinTypeRegex.Compile( "^Pin_Type\\s*[!=]=\\s*$", wxRE_ADVANCED ); + m_fabPropRegex.Compile( "^Fabrication_Property\\s*[!=]=\\s*$", wxRE_ADVANCED ); m_compileButton->SetBitmap( KiBitmap( BITMAPS::drc ) );