Consistently handle env/prj variables

User-defined variables cannot be used for internally-reserved variables

Fixes https://gitlab.com/kicad/code/kicad/issues/11232

(cherry picked from commit c23679d9bd)

common/drawing_sheet/ds_painter.cpp

@@ -160,9 +160,8 @@ wxString DS_DRAW_ITEM_LIST::BuildFullText( const wxString& aTextbase )
                 }
                 else if( m_titleBlock )
                 {
-                    m_titleBlock->TextVarResolver( token, m_project );
                     // no need for tokenUpdated; TextVarResolver() did a full resolve
-                    return true;
+                    return m_titleBlock->TextVarResolver( token, m_project );
                 }
 
                 if( tokenUpdated )

common/title_block.cpp

@@ -94,14 +94,9 @@ bool TITLE_BLOCK::TextVarResolver( wxString* aToken, const PROJECT* aProject ) c
 
     if( aToken->IsSameAs( wxT( "ISSUE_DATE" ) ) )
     {
-        wxString ret = GetDate();
+        *aToken = GetDate();
-
-        if( !ret.empty() )
-        {
-            *aToken = ret;
         tokenUpdated = true;
     }
-    }
     else if( aToken->IsSameAs( wxT( "CURRENT_DATE" ) ) )
     {
         // We can choose different formats. Should probably be kept in sync with ISSUE_DATE
@@ -116,34 +111,19 @@ bool TITLE_BLOCK::TextVarResolver( wxString* aToken, const PROJECT* aProject ) c
     }
     else if( aToken->IsSameAs( wxT( "REVISION" ) ) )
     {
-        wxString ret = GetRevision();
+        *aToken = GetRevision();
-
-        if( !ret.empty() )
-        {
-            *aToken = ret;
         tokenUpdated = true;
     }
-    }
     else if( aToken->IsSameAs( wxT( "TITLE" ) ) )
     {
-        wxString ret = GetTitle();
+        *aToken = GetTitle();
-
-        if( !ret.empty() )
-        {
-            *aToken = ret;
         tokenUpdated = true;
     }
-    }
     else if( aToken->IsSameAs( wxT( "COMPANY" ) ) )
     {
-        wxString ret = GetCompany();
+        *aToken = GetCompany();
-
-        if( !ret.empty() )
-        {
-            *aToken = ret;
         tokenUpdated = true;
     }
-    }
     else if( aToken->Left( aToken->Len() - 1 ).IsSameAs( wxT( "COMMENT" ) ) )
     {
         wxChar c = aToken->Last();
@@ -159,15 +139,10 @@ bool TITLE_BLOCK::TextVarResolver( wxString* aToken, const PROJECT* aProject ) c
         case '7':
         case '8':
         case '9':
-            wxString ret = GetComment( c - '1' );
+            *aToken = GetComment( c - '1' );
-
-            if( !ret.empty() )
-            {
-                *aToken = ret;
             tokenUpdated = true;
         }
     }
-    }
 
     if( tokenUpdated )
     {

eeschema/dialogs/dialog_plot_schematic.cpp

@@ -1246,7 +1246,15 @@ wxString DIALOG_PLOT_SCHEMATIC::getOutputPath()
                    wxStandardPaths::Get().GetDocumentsDir() );
 
     // Build the absolute path of current output directory to preselect it in the file browser.
-    wxString path = ExpandEnvVarSubstitutions( m_outputDirectoryName->GetValue(), &Prj() );
+    std::function<bool( wxString* )> textResolver =
+    [&]( wxString* token ) -> bool
+    {
+        return m_parent->Schematic().ResolveTextVar( token, 0 );
+    };
+
+    wxString path = m_outputDirectoryName->GetValue();
+    path = ExpandTextVars( path, &textResolver, nullptr, &Prj() );
+    path = ExpandEnvVarSubstitutions( path, &Prj() );
 
     fn.SetPath( path );
 

pcbnew/dialogs/dialog_plot.cpp

@@ -806,7 +806,7 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
 
     wxString path = m_plotOpts.GetOutputDirectory();
     path = ExpandTextVars( path, &textResolver, nullptr, board->GetProject() );
-    path = ExpandEnvVarSubstitutions( path, nullptr );
+    path = ExpandEnvVarSubstitutions( path, board->GetProject() );
 
     wxFileName outputDir = wxFileName::DirName( path );
     wxString   boardFilename = m_parent->GetBoard()->GetFileName();