Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/elfmz/far2l.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelfmz <fenix1905@tut.by>2022-02-13 23:37:15 +0300
committerelfmz <fenix1905@tut.by>2022-02-13 23:37:15 +0300
commitfea5890527da9bdb8cb2fdc1064894ff870a62a6 (patch)
tree501e283aa4321a86d793e8f8e5a3bcd14d6c533f /far2l/src/cmdline.cpp
parent097ea05c90b44512ce8c50a74219338cf4855711 (diff)
VT/autocomplete: yet another refactoring (touch #1245)
Diffstat (limited to 'far2l/src/cmdline.cpp')
-rw-r--r--far2l/src/cmdline.cpp22
1 files changed, 1 insertions, 21 deletions
diff --git a/far2l/src/cmdline.cpp b/far2l/src/cmdline.cpp
index dbe919ed..d654f0f9 100644
--- a/far2l/src/cmdline.cpp
+++ b/far2l/src/cmdline.cpp
@@ -65,7 +65,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "vtshell.h"
#include "vtcompletor.h"
#include <limits>
-#include <algorithm>
CommandLine::CommandLine():
CmdStr(CtrlObject->Cp(),0,true,CtrlObject->CmdHistory,0,(Opt.CmdLine.AutoComplete?EditControl::EC_ENABLEAUTOCOMPLETE:0)|EditControl::EC_ENABLEFNCOMPLETE),
@@ -164,27 +163,8 @@ void CommandLine::ProcessCompletion(bool possibilities)
VTCompletor vtc;
if (possibilities) {
std::vector<std::string> possibilities;
- std::string last_cmd_word = cmd;
- size_t last_space = last_cmd_word.rfind(' ');
- if (last_space != std::string::npos)
- last_cmd_word.erase(0, last_space + 1);
if (vtc.GetPossibilities(cmd, possibilities) && !possibilities.empty()) {
- std::sort(possibilities.begin(), possibilities.end());
- fprintf(stderr, "Possibilities: ");
- for(auto &p : possibilities) {
- fprintf(stderr, "%s ", p.c_str());
- if (!last_cmd_word.empty() && p.find(last_cmd_word) == 0) {
- p.insert(0, cmd.substr(0, cmd.size() - last_cmd_word.size()));
-
- } else if (p.find(cmd) != 0) {
- /*if (p.find(' ') != 0 && !cmd.empty() && cmd[cmd.size()-1]!=' ') {
- p.insert(0, 1, ' ');
- }*/
- p.insert(0, cmd);
- }
- }
- fprintf(stderr, "\n");
-
+ //fprintf(stderr, "Possibilities: ");
CmdStr.ShowCustomCompletionList(possibilities);
}
} else {