[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdevelop/5.2] plugins/custom-definesandincludes/compilerprovider: Ignore unrecognized files in Comp
From: Aaron Puchert <null () kde ! org>
Date: 2017-11-07 14:22:10
Message-ID: E1eC4lW-0002pd-2g () code ! kde ! org
[Download RAW message or body]
Git commit 8cbb71444fd5324b258f0b3d402477adb3db11f9 by Aaron Puchert.
Committed on 07/11/2017 at 14:04.
Pushed by aaronpuchert into branch '5.2'.
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/8cbb71444fd5324b258f0b3d402477adb3db11f9
diff --git a/plugins/custom-definesandincludes/compilerprovider/compilerprovider.cpp \
b/plugins/custom-definesandincludes/compilerprovider/compilerprovider.cpp index \
fe6f1032ec..f9d8d750a9 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 == Utils::C ? \
config.parserArguments.cArguments : config.parserArguments.cppArguments); }
@@ -149,6 +153,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 == Utils::C ? \
config.parserArguments.cArguments : config.parserArguments.cppArguments); }
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic