From 18df6a9a78fc0b450bd37d4394c7422cd56ec12b Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 11 May 2016 10:36:51 -0400 Subject: Tests: Protect unicode literals from clang-format Cpp03 formatting Since CMake is written in C++98 any clang-format configuration must set `Standard` to `Cpp03` so that `A >` is not rewritten as `A>`. However, this will cause `U"foo"` to be rewritten as `U "foo"`. Add markup to turn clang-format off in the one place that the latter case occurs so that we do not need a separate `.clang-format` config file for it. Inspired-by: Daniel Pfeifer --- Tests/CompileFeatures/cxx_unicode_literals.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tests/CompileFeatures/cxx_unicode_literals.cpp b/Tests/CompileFeatures/cxx_unicode_literals.cpp index a7b7df0..7794c11 100644 --- a/Tests/CompileFeatures/cxx_unicode_literals.cpp +++ b/Tests/CompileFeatures/cxx_unicode_literals.cpp @@ -1,3 +1,5 @@ +/* clang-format off */ const char16_t lit_16[] = u"\u00DA"; const char32_t lit_32[] = U"\u00DA"; +/* clang-format on */ -- cgit v0.12 From 062593273f4765e2948993992eaeac9acdab0e27 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 11 May 2016 15:16:04 -0400 Subject: Tests: Wrap long comment lines in VSXaml test Manually wrap the lines and remove literal tab characters. This avoids problems with incremental formatting by clang-format. --- Tests/VSXaml/App.xaml.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Tests/VSXaml/App.xaml.cpp b/Tests/VSXaml/App.xaml.cpp index 2cb2b32..a187ed5 100644 --- a/Tests/VSXaml/App.xaml.cpp +++ b/Tests/VSXaml/App.xaml.cpp @@ -26,8 +26,9 @@ using namespace Windows::UI::Xaml::Navigation; // The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227 /// -/// Initializes the singleton application object. This is the first line of authored code -/// executed, and as such is the logical equivalent of main() or WinMain(). +/// Initializes the singleton application object. This is the first line of +/// authored code executed, and as such is the logical equivalent of main() +/// or WinMain(). /// App::App() { @@ -36,8 +37,9 @@ App::App() } /// -/// Invoked when the application is launched normally by the end user. Other entry points -/// will be used such as when the application is launched to open a specific file. +/// Invoked when the application is launched normally by the end user. +/// Other entry points will be used such as when the application is +/// launched to open a specific file. /// /// Details about the launch request and process. void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ e) @@ -101,9 +103,9 @@ void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEvent } /// -/// Invoked when application execution is being suspended. Application state is saved -/// without knowing whether the application will be terminated or resumed with the contents -/// of memory still intact. +/// Invoked when application execution is being suspended. Application state +/// is saved without knowing whether the application will be terminated or +/// resumed with the contents of memory still intact. /// /// The source of the suspend request. /// Details about the suspend request. -- cgit v0.12