Dominique.Fournier/DomFramework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

console : Allow to autocomplete with value+help, or value only

Browse Source 
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@4235 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
Dominique Fournier
2018-06-12 18:47:33 +00:00
parent 0f7ef786e8
commit 80abee3b12
1 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
console.php
View File

@@ -240,30 +240,50 @@ class console
// {{{ // {{{
{ {
$completeArr = call_user_func ($this->completionFunction, $string); $completeArr = call_user_func ($this->completionFunction, $string);
$isAssoc = is_array ($completeArr) &&
array_diff_key ($completeArr, array_keys (array_keys ($completeArr)));
if (count ($completeArr) === 1) if (count ($completeArr) === 1)
{ {
if (substr ($string, -1) === " ") if (substr ($string, -1) !== " ")
{
// Next word is unique : add this to the string
$string .= reset ($completeArr);
}
else
{ {
// Continuous word is unique : replace the last word by the proposal // Continuous word is unique : replace the last word by the proposal
$pos = mb_strrpos ($string, " "); $pos = mb_strrpos ($string, " ");
if ($pos === false) if ($pos === false)
$string = reset ($completeArr); $string = "";
else else
{ {
$string = mb_substr ($string, 0, $pos +1); $string = mb_substr ($string, 0, $pos +1);
$string .= reset ($completeArr);
} }
} }
else
{
// Next word is unique : add this to the string
}
if ($isAssoc)
$string .= key ($completeArr);
else
$string .= reset ($completeArr);
} }
else else
{ {
// Multiple answers : display them // Multiple answers : display them
echo "\n".implode ("\n", $completeArr)."\n"; if ($isAssoc)
{
// In associative array, the key is the possible answer to
// autocompletion, and the value is the helper message
// Get the largest key length to make a beautiful alignment
$maxlen = 0;
foreach ($completeArr as $key => $val)
$maxlen = max ($maxlen, mb_strlen ($key));
$maxlen = $maxlen + 5;
echo "\n";
foreach ($completeArr as $key => $val)
printf ("%-${maxlen}s %s\n", $key, $val);
}
else
{
echo "\n".implode ("\n", $completeArr)."\n";
}
} }
$cursorPos = mb_strlen ($prompt.$string); $cursorPos = mb_strlen ($prompt.$string);
$this->rewriteLine ($prompt.$string); $this->rewriteLine ($prompt.$string);