[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdevelop] plugins/custom-definesandincludes/compilerprovider: Ignore unrecognized files in Compiler
From:       Aaron Puchert <null () kde ! org>
Date:       2017-11-07 12:31:54
Message-ID: E1eC32o-0007G0-Ro () code ! kde ! org
[Download RAW message or body]

Git commit 2462a638732dd974d0594cd073eda7665a03d541 by Aaron Puchert.
Committed on 07/11/2017 at 12:31.
Pushed by aaronpuchert into branch 'master'.

Ignore unrecognized files in CompilerProvider

Summary:
Sometimes the compiler provider is called on files that we don't
compile. Instead of complaining, we just return an empty set of includes
or defines.

Reviewers: #kdevelop, mwolff

Reviewed By: #kdevelop, mwolff

Subscribers: mwolff, kdevelop-devel

Differential Revision: https://phabricator.kde.org/D8653

M  +8    -0    plugins/custom-definesandincludes/compilerprovider/compilerprovider.cpp


https://commits.kde.org/kdevelop/2462a638732dd974d0594cd073eda7665a03d541

diff --git a/plugins/custom-definesandincludes/compilerprovider/compilerprovider.cpp \
b/plugins/custom-definesandincludes/compilerprovider/compilerprovider.cpp index \
                ca48ddcc1d..be2c780677 100644
--- a/plugins/custom-definesandincludes/compilerprovider/compilerprovider.cpp
+++ b/plugins/custom-definesandincludes/compilerprovider/compilerprovider.cpp
@@ -138,6 +138,10 @@ QHash<QString, QString> CompilerProvider::defines( \
ProjectBaseItem* item ) const  if (item) {
         languageType = Utils::languageType(item->path(), \
config.parserArguments.parseAmbiguousAsCPP);  }
+    // If called on files that we can't compile, return an empty set of defines.
+    if (languageType == Utils::Other) {
+        return {};
+    }
 
     return config.compiler->defines(languageType,
         languageType == Utils::C ? config.parserArguments.cArguments : \
config.parserArguments.cppArguments); @@ -150,6 +154,10 @@ Path::List \
CompilerProvider::includes( ProjectBaseItem* item ) const  if (item) {
         languageType = Utils::languageType(item->path(), \
config.parserArguments.parseAmbiguousAsCPP);  }
+    // If called on files that we can't compile, return an empty set of includes.
+    if (languageType == Utils::Other) {
+        return {};
+    }
 
     return config.compiler->includes(languageType,
         languageType == Utils::C ? config.parserArguments.cArguments : \
config.parserArguments.cppArguments);


[prev in list] [next in list] [prev in thread] [next in thread]