TokenList: apply enforced language early

firewave · firewave · commit c09158d8b56f · 2024-01-06T21:20:37.000+01:00
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()))

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,9 @@ TokenList::TokenList(const Settings* settings) :`
`50`	`50`	`mSettings(settings)`
`51`	`51`	`{`
`52`	`52`	`mTokensFrontBack.list = this;`
	`53`	`+ if (mSettings && (mSettings->enforcedLang != Settings::Language::None)) {`
	`54`	`+ mLang = mSettings->enforcedLang;`
	`55`	`+ }`
`53`	`56`	`}`
`54`	`57`
`55`	`58`	`TokenList::~TokenList()`
`@@ -80,9 +83,8 @@ void TokenList::deallocateTokens()`
`80`	`83`
`81`	`84`	`void TokenList::determineCppC()`
`82`	`85`	`{`
`83`		`- if (mSettings && (mSettings->enforcedLang != Settings::Language::None)) {`
`84`		`- mLang = mSettings->enforcedLang;`
`85`		`- } else {`
	`86`	`+ // only try to determine it if it wasn't enforced`
	`87`	`+ if (mLang == Settings::Language::None) {`
`86`	`88`	`if (Path::isC(getSourceFilePath()))`
`87`	`89`	`mLang = Settings::Language::C;`
`88`	`90`	`else if (Path::isCPP(getSourceFilePath()))`