TokenList: apply enforced language early

danmar · Jan 6, 2024 · c09158d · c09158d
1 parent df584c4
commit c09158d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -50,6 +50,9 @@ TokenList::TokenList(const Settings* settings) :
     mSettings(settings)
 {
     mTokensFrontBack.list = this;
+    if (mSettings && (mSettings->enforcedLang != Settings::Language::None)) {
+        mLang = mSettings->enforcedLang;
+    }
 }
 
 TokenList::~TokenList()
@@ -80,9 +83,8 @@ void TokenList::deallocateTokens()
 
 void TokenList::determineCppC()
 {
-    if (mSettings && (mSettings->enforcedLang != Settings::Language::None)) {
-        mLang = mSettings->enforcedLang;
-    } else {
+    // only try to determine it if it wasn't enforced
+    if (mLang == Settings::Language::None) {
         if (Path::isC(getSourceFilePath()))
             mLang = Settings::Language::C;
         else if (Path::isCPP(getSourceFilePath()))