From 349c6153de3c88f45b730be0d8ba9e2b14ab4d2a Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Tue, 31 Mar 2020 22:48:56 +0300 Subject: [PATCH] [build] Disable clang-format for generated code (#16358) The code should be human readable but it is more important if the code in the generator itself is easier to understand. Nobody wants to play clang-format golf with these generators. --- src/mbgl/style/layers/background_layer.cpp | 4 ++++ src/mbgl/style/layers/circle_layer.cpp | 4 ++++ src/mbgl/style/layers/fill_extrusion_layer.cpp | 4 ++++ src/mbgl/style/layers/fill_layer.cpp | 4 ++++ src/mbgl/style/layers/heatmap_layer.cpp | 4 ++++ src/mbgl/style/layers/hillshade_layer.cpp | 4 ++++ src/mbgl/style/layers/layer.cpp.ejs | 4 ++++ src/mbgl/style/layers/line_layer.cpp | 4 ++++ src/mbgl/style/layers/raster_layer.cpp | 4 ++++ src/mbgl/style/layers/symbol_layer.cpp | 4 ++++ 10 files changed, 40 insertions(+) diff --git a/src/mbgl/style/layers/background_layer.cpp b/src/mbgl/style/layers/background_layer.cpp index d3dd02f8a..d4d9805ec 100644 --- a/src/mbgl/style/layers/background_layer.cpp +++ b/src/mbgl/style/layers/background_layer.cpp @@ -1,3 +1,5 @@ +// clang-format off + // This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`. #include @@ -282,3 +284,5 @@ Mutable BackgroundLayer::mutableBaseImpl() const { } // namespace style } // namespace mbgl + +// clang-format on diff --git a/src/mbgl/style/layers/circle_layer.cpp b/src/mbgl/style/layers/circle_layer.cpp index 959f9447b..ad34ba822 100644 --- a/src/mbgl/style/layers/circle_layer.cpp +++ b/src/mbgl/style/layers/circle_layer.cpp @@ -1,3 +1,5 @@ +// clang-format off + // This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`. #include @@ -662,3 +664,5 @@ Mutable CircleLayer::mutableBaseImpl() const { } // namespace style } // namespace mbgl + +// clang-format on diff --git a/src/mbgl/style/layers/fill_extrusion_layer.cpp b/src/mbgl/style/layers/fill_extrusion_layer.cpp index b9f4e4fa6..86f204d82 100644 --- a/src/mbgl/style/layers/fill_extrusion_layer.cpp +++ b/src/mbgl/style/layers/fill_extrusion_layer.cpp @@ -1,3 +1,5 @@ +// clang-format off + // This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`. #include @@ -529,3 +531,5 @@ Mutable FillExtrusionLayer::mutableBaseImpl() const { } // namespace style } // namespace mbgl + +// clang-format on diff --git a/src/mbgl/style/layers/fill_layer.cpp b/src/mbgl/style/layers/fill_layer.cpp index b6cc1eb50..1fc50f36b 100644 --- a/src/mbgl/style/layers/fill_layer.cpp +++ b/src/mbgl/style/layers/fill_layer.cpp @@ -1,3 +1,5 @@ +// clang-format off + // This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`. #include @@ -506,3 +508,5 @@ Mutable FillLayer::mutableBaseImpl() const { } // namespace style } // namespace mbgl + +// clang-format on diff --git a/src/mbgl/style/layers/heatmap_layer.cpp b/src/mbgl/style/layers/heatmap_layer.cpp index 54add7203..e51775d1d 100644 --- a/src/mbgl/style/layers/heatmap_layer.cpp +++ b/src/mbgl/style/layers/heatmap_layer.cpp @@ -1,3 +1,5 @@ +// clang-format off + // This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`. #include @@ -378,3 +380,5 @@ Mutable HeatmapLayer::mutableBaseImpl() const { } // namespace style } // namespace mbgl + +// clang-format on diff --git a/src/mbgl/style/layers/hillshade_layer.cpp b/src/mbgl/style/layers/hillshade_layer.cpp index 04c793575..d3e3ac6dc 100644 --- a/src/mbgl/style/layers/hillshade_layer.cpp +++ b/src/mbgl/style/layers/hillshade_layer.cpp @@ -1,3 +1,5 @@ +// clang-format off + // This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`. #include @@ -422,3 +424,5 @@ Mutable HillshadeLayer::mutableBaseImpl() const { } // namespace style } // namespace mbgl + +// clang-format on diff --git a/src/mbgl/style/layers/layer.cpp.ejs b/src/mbgl/style/layers/layer.cpp.ejs index bfdcd6e05..ab44a9278 100644 --- a/src/mbgl/style/layers/layer.cpp.ejs +++ b/src/mbgl/style/layers/layer.cpp.ejs @@ -4,6 +4,8 @@ const paintProperties = locals.paintProperties; const allProperties = paintProperties.concat(layoutProperties); -%> +// clang-format off + // This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`. #include _layer.hpp> @@ -339,3 +341,5 @@ Mutable <%- camelize(type) %>Layer::mutableBaseImpl() const { } // namespace style } // namespace mbgl + +// clang-format on diff --git a/src/mbgl/style/layers/line_layer.cpp b/src/mbgl/style/layers/line_layer.cpp index 94ec58293..7c1131a68 100644 --- a/src/mbgl/style/layers/line_layer.cpp +++ b/src/mbgl/style/layers/line_layer.cpp @@ -1,3 +1,5 @@ +// clang-format off + // This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`. #include @@ -804,3 +806,5 @@ Mutable LineLayer::mutableBaseImpl() const { } // namespace style } // namespace mbgl + +// clang-format on diff --git a/src/mbgl/style/layers/raster_layer.cpp b/src/mbgl/style/layers/raster_layer.cpp index 66ad87388..72a2f4d63 100644 --- a/src/mbgl/style/layers/raster_layer.cpp +++ b/src/mbgl/style/layers/raster_layer.cpp @@ -1,3 +1,5 @@ +// clang-format off + // This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`. #include @@ -507,3 +509,5 @@ Mutable RasterLayer::mutableBaseImpl() const { } // namespace style } // namespace mbgl + +// clang-format on diff --git a/src/mbgl/style/layers/symbol_layer.cpp b/src/mbgl/style/layers/symbol_layer.cpp index 70f731f30..e94c476b4 100644 --- a/src/mbgl/style/layers/symbol_layer.cpp +++ b/src/mbgl/style/layers/symbol_layer.cpp @@ -1,3 +1,5 @@ +// clang-format off + // This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`. #include @@ -1879,3 +1881,5 @@ Mutable SymbolLayer::mutableBaseImpl() const { } // namespace style } // namespace mbgl + +// clang-format on