Detect C++ language from all C++ file extensions

tests/samples/codefiles/c_and_cxx/non_empty.cxx

@@ -0,0 +1,8 @@
+#include <stdio.h>
+#include <openssl/rand.h>
+
+main()
+{
+    printf("Hello World\n");
+    return 0;
+}

tests/test_languages.py

@@ -69,6 +69,12 @@ class LanguagesTestCase(utils.TestCase):
             entity='c_and_cpp/cpp.h',
         )
 
+    def test_cpp_language_detected_for_header_with_c_and_cxx_files_in_folder(self):
+        self.shared(
+            expected_language='C++',
+            entity='c_and_cxx/cpp.h',
+        )
+
     def test_c_not_detected_for_non_header_with_c_files_in_folder(self):
         self.shared(
             expected_language='Python',

wakatime/stats.py

@@ -25,6 +25,7 @@ from .packages.pygments.lexers import (
     _fn_matches,
     basename,
     ClassNotFound,
+    CppLexer,
     find_lexer_class,
     get_lexer_by_name,
 )
@@ -181,8 +182,12 @@ def get_language_from_extension(file_name):
             return 'Objective-C++'
 
         available_extensions = extensions_in_same_folder(file_name)
-        if '.cpp' in available_extensions:
+
-            return 'C++'
+        for ext in CppLexer.filenames:
+            ext = ext.lstrip('*')
+            if ext in available_extensions:
+                return 'C++'
+
         if '.c' in available_extensions:
             return 'C'