[clang-format] Ignore preprocessor directives during header groups analysis

[EugeneZelenko]

Sometimes compiler warnings must be disabled in third-party code, but related preprocessor directives are considered by Clang-Format as header group boundary what makes Clang-Format unable to find main header (included after third-party headers).

Code snippet:

#include <Python.h>
#ifdef __GNUC__
#   pragma GCC diagnostic push
#   pragma GCC diagnostic ignored "-Wpedantic"
#   pragma GCC diagnostic ignored "-Wshadow"
#   pragma GCC diagnostic ignored "-Wsuggest-override"
#endif
#define BOOST_NO_AUTO_PTR
#include <boost/python/import.hpp>
#include <boost/python/object.hpp>
#ifdef __GNUC__
#   pragma GCC diagnostic pop
#endif
# include "application_header1.h"
...
# include "application_headerN.h"

I tried 19.1.1 and main (49d48c3)

[llvmbot]

@llvm/issue-subscribers-clang-format

Author: None (EugeneZelenko)

Sometimes compiler warnings must be disabled in third-party code, but related preprocessor directives are considered by Clang-Format as header group boundary what makes Clang-Format unable to find main header (included after third-party headers).

Code snippet:

#include <Python.h>
#ifdef __GNUC__
#   pragma GCC diagnostic push
#   pragma GCC diagnostic ignored "-Wpedantic"
#   pragma GCC diagnostic ignored "-Wshadow"
#   pragma GCC diagnostic ignored "-Wsuggest-override"
#endif
#define BOOST_NO_AUTO_PTR
#include <boost/python/import.hpp>
#include <boost/python/object.hpp>
#ifdef __GNUC__
#   pragma GCC diagnostic pop
#endif
# include "application_header1.h"
...
# include "application_headerN.h"

I tried 19.1.1 and main (49d48c3)

[owenca]

Please provide the config, output, and expected output.

[EugeneZelenko]

A little bit modified test case test.cpp:

#include <Python.h>
#ifdef __GNUC__
#   pragma GCC diagnostic push
#   pragma GCC diagnostic ignored "-Wpedantic"
#   pragma GCC diagnostic ignored "-Wshadow"
#   pragma GCC diagnostic ignored "-Wsuggest-override"
#endif
#define BOOST_NO_AUTO_PTR
#include <boost/python/import.hpp>
#include <boost/python/object.hpp>
#ifdef __GNUC__
#   pragma GCC diagnostic pop
#endif
#include "a.h"
#include "test.h"
#include "z.h"

Output:

#include <Python.h>
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wsuggest-override"
#endif
#define BOOST_NO_AUTO_PTR
#include <boost/python/import.hpp>
#include <boost/python/object.hpp>
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#include "a.h"
#include "test.h"
#include "z.h"

Expected output:

#include "test.h"
#include "a.h"
#include "z.h"
#include <Python.h>
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wsuggest-override"
#endif
#define BOOST_NO_AUTO_PTR
#include <boost/python/import.hpp>
#include <boost/python/object.hpp>
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif

Configuration:

BasedOnStyle: LLVM