CmdLineParser: filter out files before running de-duplication in fillSettingsFromArgs()

Author: firewave

cli/cmdlineparser.cpp

@@ -206,8 +206,6 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
     assert(!(!pathnamesRef.empty() && !fileSettingsRef.empty()));
 
     if (!fileSettingsRef.empty()) {
-        // TODO: de-duplicate
-
         std::list<FileSettings> fileSettings;
         if (!mSettings.fileFilters.empty()) {
             // filter only for the selected filenames from all project files
@@ -225,6 +223,8 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
             fileSettings = fileSettingsRef;
         }
 
+        // TODO: de-duplicate
+
         mFileSettings.clear();
 
         frontend::applyLang(fileSettings, mSettings, mEnforcedLang);
@@ -265,19 +265,6 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
             return false;
         }
 
-        // de-duplicate files
-        {
-            auto it = filesResolved.begin();
-            while (it != filesResolved.end()) {
-                const std::string& absname = it->abspath();
-                // TODO: log if duplicated files were dropped
-                filesResolved.erase(std::remove_if(std::next(it), filesResolved.end(), [&](const FileWithDetails& entry) {
-                    return entry.abspath() == absname;
-                }), filesResolved.end());
-                ++it;
-            }
-        }
-
         std::list<FileWithDetails> files;
         if (!mSettings.fileFilters.empty()) {
             files = filterFiles(mSettings.fileFilters, filesResolved);
@@ -291,6 +278,19 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
             files = std::move(filesResolved);
         }
 
+        // de-duplicate files
+        {
+            auto it = files.begin();
+            while (it != files.end()) {
+                const std::string& absname = it->abspath();
+                // TODO: log if duplicated files were dropped
+                files.erase(std::remove_if(std::next(it), files.end(), [&](const FileWithDetails& entry) {
+                    return entry.abspath() == absname;
+                }), files.end());
+                ++it;
+            }
+        }
+
         frontend::applyLang(files, mSettings, mEnforcedLang);
 
         // sort the markup last