From c4e9616d27b42b62cf18b0593c9719920d294950 Mon Sep 17 00:00:00 2001
From: Marcus Tillmanns <marcus.tillmanns@qt.io>
Date: Tue, 10 Jan 2023 16:05:29 +0100
Subject: [PATCH] Core: Support Env variables for "f" locator

Fixes: QTCREATORBUG-242
Change-Id: Iebcb88be482a3f8f7500629032ee63180997dd0d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/coreplugin/locator/filesystemfilter.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/plugins/coreplugin/locator/filesystemfilter.cpp b/src/plugins/coreplugin/locator/filesystemfilter.cpp
index 1b6e1c1e250..647753539e4 100644
--- a/src/plugins/coreplugin/locator/filesystemfilter.cpp
+++ b/src/plugins/coreplugin/locator/filesystemfilter.cpp
@@ -14,6 +14,7 @@
 #include <coreplugin/vcsmanager.h>
 
 #include <utils/checkablemessagebox.h>
+#include <utils/environment.h>
 #include <utils/filepath.h>
 #include <utils/layoutbuilder.h>
 #include <utils/link.h>
@@ -72,7 +73,11 @@ QList<LocatorFilterEntry> FileSystemFilter::matchesFor(QFutureInterface<LocatorF
                                                        const QString &entry)
 {
     QList<LocatorFilterEntry> entries[int(MatchLevel::Count)];
-    const QFileInfo entryInfo(entry);
+
+    Environment env = Environment::systemEnvironment();
+    const QString expandedEntry = env.expandVariables(entry);
+
+    const QFileInfo entryInfo(expandedEntry);
     const QString entryFileName = entryInfo.fileName();
     QString directory = entryInfo.path();
     if (entryInfo.isRelative()) {
@@ -139,10 +144,10 @@ QList<LocatorFilterEntry> FileSystemFilter::matchesFor(QFutureInterface<LocatorF
 
     // "create and open" functionality
     const QString fullFilePath = dirInfo.filePath(entryFileName);
-    const bool containsWildcard = entry.contains('?') || entry.contains('*');
+    const bool containsWildcard = expandedEntry.contains('?') || expandedEntry.contains('*');
     if (!containsWildcard && !QFileInfo::exists(fullFilePath) && dirInfo.exists()) {
         LocatorFilterEntry createAndOpen(this,
-                                         tr("Create and Open \"%1\"").arg(entry),
+                                         tr("Create and Open \"%1\"").arg(expandedEntry),
                                          fullFilePath);
         createAndOpen.filePath = FilePath::fromString(fullFilePath);
         createAndOpen.extraInfo = FilePath::fromString(dirInfo.absolutePath()).shortNativePath();