averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

REPL: Colorize inputs and responses.

Browse Source 
Rerender inputs in bold after they've been entered. Colorize non-REPL output, cyan for normal responses, and green for REPL directive responses. (In my terminal setup these were the least retina-searing members of the vast and nuanced ANSI color palette.)

Swift SVN r4217
This commit is contained in:
Joe Groff
2013-02-27 01:35:36 +00:00
parent c3a7b132fb
commit 021e10df6c
1 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
tools/swift/Immediate.cpp
View File

@@ -353,6 +353,11 @@ enum class REPLInputKind : int {
SourceCode,
};
/// The main REPL prompt string.
static const wchar_t * const PS1 = L"(swift) ";
/// The REPL prompt string for line continuations.
static const wchar_t * const PS2 = L" ";
/// EditLine wrapper that implements the user interface behavior for reading
/// user input to the REPL. All of its methods must be usable from a separate
/// thread and so shouldn't touch anything outside of the EditLine, History,
@@ -413,6 +418,10 @@ public:
el_wset(e, EL_ADDFN, L"swift-complete",
L"Trigger completion",
BindingFn<&REPLInput::onComplete>);
el_wset(e, EL_ADDFN, L"swift-newline",
L"Handle newline",
BindingFn<&REPLInput::onNewline>);
el_wset(e, EL_BIND, L"\n", L"swift-newline", nullptr);
// Provide some common bindings to complement editline's defaults.
// ^W should delete previous word, not the entire line.
@@ -436,6 +445,10 @@ public:
Line.clear();
// Reset color before showing the prompt.
if (ShowColors)
llvm::outs().resetColor();
do {
// Read one line.
PromptContinuationLevel = BraceCount;
@@ -488,8 +501,13 @@ public:
UnfinishedInfixExpr = false;
if (CurChunkLines == 1 && BraceCount == 0 && *p == ':')
if (CurChunkLines == 1 && BraceCount == 0 && *p == ':') {
// Colorize the response output.
if (ShowColors)
llvm::outs().changeColor(llvm::raw_ostream::GREEN);
return REPLInputKind::REPLDirective;
}
// If we detect unbalanced braces, keep reading before
// we start parsing.
@@ -512,6 +530,10 @@ public:
Line.push_back('\0');
Line.pop_back();
// Colorize the response output.
if (ShowColors)
llvm::outs().changeColor(llvm::raw_ostream::CYAN);
return REPLInputKind::SourceCode;
}
@@ -532,13 +554,11 @@ private:
appendEscapeSequence(PromptString, colorCode);
}
static const wchar_t *PS1 = L"(swift) ";
static const wchar_t *PS2 = L" ";
if (!NeedPromptContinuation)
PromptString.insert(PromptString.end(), PS1, PS1 + wcslen(PS1));
else {
PromptString.insert(PromptString.end(), PS2, PS2 + wcslen(PS1));
PromptString.insert(PromptString.end(), PS2, PS2 + wcslen(PS2));
PromptString.append(2*PromptContinuationLevel, ' ');
}
@@ -778,6 +798,33 @@ private:
llvm_unreachable("got an invalid completion set?!");
}
}
unsigned char onNewline(int ch) {
// Add the character to the string.
wchar_t s[2] = {(wchar_t)ch, 0};
el_winsertstr(e, s);
if (ShowColors) {
// Reprint the line in bold.
LineInfoW const *line = el_wline(e);
llvm::SmallString<100> toDisplay;
convertToUTF8(NeedPromptContinuation
? llvm::makeArrayRef(PS2, wcslen(PS2))
: llvm::makeArrayRef(PS1, wcslen(PS1)),
toDisplay);
llvm::outs() << '\r' << toDisplay;
toDisplay.clear();
convertToUTF8(llvm::makeArrayRef(line->buffer, line->lastchar),
toDisplay);
llvm::outs().changeColor(llvm::raw_ostream::SAVEDCOLOR,
/*Bold*/ true);
llvm::outs() << toDisplay;
llvm::outs().resetColor();
} else
llvm::outs() << '\n';
return CC_NEWLINE;
}
};