Fix header files (files groups with no compilerFragments) getting compilerFragments from RC language file groups. (#4655)

* Fix header files getting compileFragments from RC.

* Add a unit test case.

* Fix linter error.

Author: sean-mcmanus

src/cpptools.ts

@@ -598,7 +598,7 @@ export class CppConfigurationProvider implements cpptools.CustomConfigurationPro
                         target.fileGroups?.reverse();
                         const grps = target.fileGroups || [];
                         const includePath = [...new Set(util.flatMap(grps, grp => grp.includePath || []))].map(item => item.path);
-                        const compileCommandFragments = [...util.first(grps, grp => grp.compileCommandFragments || [])];
+                        const compileCommandFragments = [...util.first(grps.filter(grp => grp.language !== 'RC'), grp => grp.compileCommandFragments || [])];
                         const defines = [...new Set(util.flatMap(grps, grp => grp.defines || []))];
                         const sysroot = target.sysroot;
                         this.targets.push({ name: target.name, type: target.type });

test/unit-tests/cpptools.test.ts

@@ -272,7 +272,11 @@ suite('CppTools tests', () => {
         const provider = new CppConfigurationProvider();
         const cache = await CMakeCache.fromPath(getTestResourceFilePath('TestCMakeCache.txt'));
         const sourceFile1 = path.join(here, 'main.cpp');
+        const headerFile1 = path.join(here, 'main.h');
+        const rcFile1 = path.join(here, 'main.rc');
         const uri1 = vscode.Uri.file(sourceFile1);
+        const uri1_h = vscode.Uri.file(headerFile1);
+        const uri1_rc = vscode.Uri.file(rcFile1);
         const codeModel1: codeModel.CodeModelContent = {
             configurations: [{
                 name: "Release",
@@ -289,6 +293,16 @@ suite('CppTools tests', () => {
                                 defines: ['DEFINE1'],
                                 compileCommandFragments: ['-DFRAGMENT1'],
                                 language: 'CXX'
+                            },
+                            {
+                                sources: [headerFile1],
+                                isGenerated: false
+                            },
+                            {
+                                sources: [rcFile1],
+                                isGenerated: false,
+                                compileCommandFragments: ['-DFRAGMENT_RC'],
+                                language: 'RC'
                             }]
                         },
                         {
@@ -347,6 +361,12 @@ suite('CppTools tests', () => {
         expect(configurations[0].configuration.compilerFragments).to.contain('-DFRAGMENT1');
         expect(configurations[0].configuration.compilerArgs).to.be.empty;
 
+        configurations = await provider.provideConfigurations([uri1_h]);
+        expect(configurations[0].configuration.compilerFragments).to.contain('-DFRAGMENT1');
+
+        configurations = await provider.provideConfigurations([uri1_rc]);
+        expect(configurations[0].configuration.compilerFragments).to.contain('-DFRAGMENT_RC');
+
         provider.updateConfigurationData({ cache, codeModelContent: codeModel1, activeTarget: 'target2', activeBuildTypeVariant: 'Release', folder: here });
         configurations = await provider.provideConfigurations([uri1]);
         expect(configurations.length).to.eq(1);