mirror of
https://github.com/catchorg/Catch2.git
synced 2025-05-30 08:27:52 +00:00
Refactored ConsoleColour impl. Tweaked the (Windows) colours a bit.
Also fixed issue that would cause warnings on some compilers when doing REQUIRE( p ); where p is a pointer. Moved to build 23
This commit is contained in:
parent
a04981b450
commit
3df6c0d1b4
7 changed files with 237 additions and 235 deletions
|
@ -10,102 +10,36 @@
|
|||
|
||||
#include "catch_console_colour.hpp"
|
||||
|
||||
#if !defined(CATCH_CONFIG_USE_ANSI_COLOUR_CODES) && !defined(CATCH_PLATFORM_WINDOWS)
|
||||
#define CATCH_CONFIG_USE_ANSI_COLOUR_CODES 1
|
||||
#endif
|
||||
|
||||
#if defined( CATCH_CONFIG_USE_ANSI_COLOUR_CODES )
|
||||
|
||||
#include <unistd.h>
|
||||
|
||||
namespace Catch {
|
||||
|
||||
// use POSIX/ ANSI console terminal codes
|
||||
// Implementation contributed by Adam Strzelecki (http://github.com/nanoant)
|
||||
// https://github.com/philsquared/Catch/pull/131
|
||||
|
||||
TextColour::TextColour( Colours colour ) {
|
||||
if( colour )
|
||||
set( colour );
|
||||
}
|
||||
|
||||
TextColour::~TextColour() {
|
||||
set( TextColour::None );
|
||||
}
|
||||
|
||||
namespace { const char colourEscape = '\033'; }
|
||||
|
||||
inline bool shouldUseColour() {
|
||||
static bool s_shouldUseColour
|
||||
= CATCH_CONFIG_USE_ANSI_COLOUR_CODES != 0 &&
|
||||
isatty( fileno(stdout) ) &&
|
||||
!isDebuggerActive();
|
||||
return s_shouldUseColour;
|
||||
}
|
||||
void TextColour::set( Colours colour ) {
|
||||
if( shouldUseColour() ) {
|
||||
switch( colour ) {
|
||||
case TextColour::FileName:
|
||||
std::cout << colourEscape << "[0m"; // white/ normal
|
||||
break;
|
||||
case TextColour::ResultError:
|
||||
std::cout << colourEscape << "[1;31m"; // bold red
|
||||
break;
|
||||
case TextColour::ResultSuccess:
|
||||
std::cout << colourEscape << "[1;32m"; // bold green
|
||||
break;
|
||||
case TextColour::Error:
|
||||
std::cout << colourEscape << "[0;31m"; // red
|
||||
break;
|
||||
case TextColour::Success:
|
||||
std::cout << colourEscape << "[0;32m"; // green
|
||||
break;
|
||||
case TextColour::OriginalExpression:
|
||||
std::cout << colourEscape << "[0;36m"; // cyan
|
||||
break;
|
||||
case TextColour::ReconstructedExpression:
|
||||
std::cout << colourEscape << "[0;33m"; // yellow
|
||||
break;
|
||||
case TextColour::None:
|
||||
std::cout << colourEscape << "[0m"; // reset
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace Catch
|
||||
|
||||
#elif defined ( CATCH_PLATFORM_WINDOWS )
|
||||
#if defined ( CATCH_PLATFORM_WINDOWS ) /////////////////////////////////////////
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
namespace Catch {
|
||||
|
||||
namespace {
|
||||
namespace {
|
||||
using namespace Catch;
|
||||
|
||||
WORD mapConsoleColour( TextColour::Colours colour ) {
|
||||
switch( colour ) {
|
||||
case TextColour::FileName:
|
||||
return FOREGROUND_INTENSITY; // greyed out
|
||||
case TextColour::ResultError:
|
||||
return FOREGROUND_RED | FOREGROUND_INTENSITY; // bright red
|
||||
case TextColour::ResultSuccess:
|
||||
return FOREGROUND_GREEN | FOREGROUND_INTENSITY; // bright green
|
||||
case TextColour::Error:
|
||||
return FOREGROUND_RED; // dark red
|
||||
case TextColour::Success:
|
||||
return FOREGROUND_GREEN; // dark green
|
||||
case TextColour::OriginalExpression:
|
||||
return FOREGROUND_BLUE | FOREGROUND_GREEN; // turquoise
|
||||
case TextColour::ReconstructedExpression:
|
||||
return FOREGROUND_RED | FOREGROUND_GREEN; // greeny-yellow
|
||||
default: return 0;
|
||||
}
|
||||
WORD mapConsoleColour( IConsoleColourCodes::Colours colour ) {
|
||||
switch( colour ) {
|
||||
case IConsoleColourCodes::FileName:
|
||||
return FOREGROUND_INTENSITY; // greyed out
|
||||
case IConsoleColourCodes::ResultError:
|
||||
return FOREGROUND_RED | FOREGROUND_INTENSITY; // bright red
|
||||
case IConsoleColourCodes::ResultSuccess:
|
||||
return FOREGROUND_GREEN | FOREGROUND_INTENSITY; // bright green
|
||||
case IConsoleColourCodes::Error:
|
||||
return FOREGROUND_RED | FOREGROUND_INTENSITY; // bright red
|
||||
case IConsoleColourCodes::Success:
|
||||
return FOREGROUND_GREEN; // dark green
|
||||
case IConsoleColourCodes::OriginalExpression:
|
||||
return FOREGROUND_BLUE | FOREGROUND_GREEN; // turquoise
|
||||
case IConsoleColourCodes::ReconstructedExpression:
|
||||
return FOREGROUND_RED | FOREGROUND_GREEN; // greeny-yellow
|
||||
default: return 0;
|
||||
}
|
||||
}
|
||||
|
||||
struct WindowsConsoleColourCodes : IConsoleColourCodes {
|
||||
|
||||
struct ConsoleColourImpl {
|
||||
|
||||
ConsoleColourImpl()
|
||||
WindowsConsoleColourCodes()
|
||||
: hStdout( GetStdHandle(STD_OUTPUT_HANDLE) ),
|
||||
wOldColorAttrs( 0 )
|
||||
{
|
||||
|
@ -113,11 +47,11 @@ namespace Catch {
|
|||
wOldColorAttrs = csbiInfo.wAttributes;
|
||||
}
|
||||
|
||||
~ConsoleColourImpl() {
|
||||
~WindowsConsoleColourCodes() {
|
||||
SetConsoleTextAttribute( hStdout, wOldColorAttrs );
|
||||
}
|
||||
|
||||
void set( TextColour::Colours colour ) {
|
||||
void set( Colours colour ) {
|
||||
WORD consoleColour = mapConsoleColour( colour );
|
||||
if( consoleColour > 0 )
|
||||
SetConsoleTextAttribute( hStdout, consoleColour );
|
||||
|
@ -127,12 +61,90 @@ namespace Catch {
|
|||
CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
|
||||
WORD wOldColorAttrs;
|
||||
};
|
||||
|
||||
inline bool shouldUseColourForPlatform() {
|
||||
return true;
|
||||
}
|
||||
|
||||
TextColour::TextColour( Colours colour )
|
||||
: m_impl( new ConsoleColourImpl() )
|
||||
{
|
||||
typedef WindowsConsoleColourCodes PlatformConsoleColourCodes;
|
||||
|
||||
} // end anon namespace
|
||||
|
||||
#else // Not Windows - assumed to be POSIX compatible //////////////////////////
|
||||
|
||||
#include <unistd.h>
|
||||
|
||||
namespace {
|
||||
using namespace Catch;
|
||||
|
||||
// use POSIX/ ANSI console terminal codes
|
||||
// Implementation contributed by Adam Strzelecki (http://github.com/nanoant)
|
||||
// https://github.com/philsquared/Catch/pull/131
|
||||
|
||||
struct AnsiConsoleColourCodes : IConsoleColourCodes {
|
||||
|
||||
~AnsiConsoleColourCodes() {
|
||||
set( None );
|
||||
}
|
||||
|
||||
void set( Colours colour ) {
|
||||
const char colourEscape = '\033';
|
||||
switch( colour ) {
|
||||
case FileName:
|
||||
std::cout << colourEscape << "[0m"; // white/ normal
|
||||
break;
|
||||
case ResultError:
|
||||
std::cout << colourEscape << "[0;31m"; // red
|
||||
break;
|
||||
case ResultSuccess:
|
||||
std::cout << colourEscape << "[0;32m"; // green
|
||||
break;
|
||||
case Error:
|
||||
std::cout << colourEscape << "[1;31m"; // bold red
|
||||
break;
|
||||
case Success:
|
||||
std::cout << colourEscape << "[1;32m"; // bold green
|
||||
break;
|
||||
case OriginalExpression:
|
||||
std::cout << colourEscape << "[0;36m"; // cyan
|
||||
break;
|
||||
case ReconstructedExpression:
|
||||
std::cout << colourEscape << "[0;33m"; // yellow
|
||||
break;
|
||||
case None:
|
||||
std::cout << colourEscape << "[0m"; // reset
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
inline bool shouldUseColourForPlatform() {
|
||||
return isatty( fileno(stdout) );
|
||||
}
|
||||
|
||||
typedef AnsiConsoleColourCodes PlatformConsoleColourCodes;
|
||||
|
||||
} // namespace Catch
|
||||
|
||||
#endif // not Windows
|
||||
|
||||
namespace {
|
||||
struct NoConsoleColourCodes : IConsoleColourCodes {
|
||||
void set( Colours ) {}
|
||||
};
|
||||
}
|
||||
|
||||
namespace Catch {
|
||||
|
||||
TextColour::TextColour( Colours colour ) : m_impl( NULL ) {
|
||||
static bool s_shouldUseColour = shouldUseColourForPlatform() &&
|
||||
!isDebuggerActive();
|
||||
if( s_shouldUseColour )
|
||||
m_impl = new PlatformConsoleColourCodes();
|
||||
else
|
||||
m_impl = new NoConsoleColourCodes();
|
||||
|
||||
if( colour )
|
||||
m_impl->set( colour );
|
||||
set( colour );
|
||||
}
|
||||
|
||||
TextColour::~TextColour() {
|
||||
|
@ -145,16 +157,4 @@ namespace Catch {
|
|||
|
||||
} // end namespace Catch
|
||||
|
||||
#else
|
||||
|
||||
namespace Catch {
|
||||
|
||||
TextColour::TextColour( Colours ){}
|
||||
TextColour::~TextColour(){}
|
||||
void TextColour::set( Colours ){}
|
||||
|
||||
} // end namespace Catch
|
||||
|
||||
#endif
|
||||
|
||||
#endif // TWOBLUECUBES_CATCH_CONSOLE_COLOUR_IMPL_HPP_INCLUDED
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue