feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

FakeVim: Support backslashes in substitute command patterns

Browse Source 
Change-Id: Ibfcea7fdc550082e4975e1fc4d2fba6563dbfd02
Done-by: Jochen Baier
Fixes: QTCREATORBUG-26955
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2022-01-31 07:42:30 +01:00
parent 2f925e2098
commit 5af00873cf
2 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/plugins/fakevim/fakevim_test.cpp
View File

@@ -3029,6 +3029,50 @@ void FakeVimPlugin::test_vim_substitute()
COMMAND("undo | s/\\(b...E\\)/\\U\\1/g", "aBC DEfGh");
COMMAND("undo | s/\\(C..E\\)/\\l\\1/g", "abc dEfGh");
COMMAND("undo | s/\\(b...E\\)/\\L\\1/g", "abc defGh");
// replace 1 backslash with 1 forward slash (separator: /)
data.setText(R"(abc\def)");
COMMAND(R"(s/\\/\/)", X "abc/def");
// replace 1 backslash with X normal on line (separator: /)
data.setText(R"(abc\def\ghi)");
COMMAND(R"(s/\\/X/g)", X "abcXdefXghi");
// replace 1 backslash with 1 forward slash on line (separator: /)
data.setText(R"(abc\def\ghi)");
COMMAND(R"(s/\\/\//g)", X "abc/def/ghi");
// replace 1 backslash with 1 forward slash
data.setText(R"(abc\def)");
COMMAND(R"(s#\\#/)", X "abc/def");
// replace 1 backslash with 1 forward slash on line
data.setText(R"(abc\def\ghi)");
COMMAND(R"(s#\\#/#g)", X "abc/def/ghi");
// replace 2 backslash with 2 forward slash
data.setText(R"(abc\\def)");
COMMAND(R"(s#\\\\#//)", X "abc//def");
// replace 2 backslash with 2 forward slash on line
data.setText(R"(abc\\def\\ghi)");
COMMAND(R"(s#\\\\#//#g)", X "abc//def//ghi");
// replace 1 backslash with 1 forward slash last char
data.setText(R"(abc\)");
COMMAND(R"(s#\\#/)", X "abc/");
// replace 1 backslash with 1 forward slash first char
data.setText(R"(\abc)");
COMMAND(R"(s#\\#/)", X "/abc");
// replace 1 # with 2 # on line
data.setText(R"(abc#def#ghi)");
COMMAND(R"(s#\##\#\##g)", X "abc##def##ghi");
// replace 2 # with 4 # on line
data.setText(R"(abc##def##ghi)");
COMMAND(R"(s#\#\##\#\#\#\##g)", X "abc####def####ghi");
}
void FakeVimPlugin::test_vim_ex_commandbuffer_paste()

11
src/plugins/fakevim/fakevimhandler.cpp
View File

@@ -816,9 +816,18 @@ static bool substituteText(QString *text,
static int findUnescaped(QChar c, const QString &line, int from)
{
bool singleBackSlashBefore = false;
for (int i = from; i < line.size(); ++i) {
if (line.at(i) == c && (i == 0 || line.at(i - 1) != '\\'))
const QChar currentChar = line.at(i);
if (currentChar == '\\') {
singleBackSlashBefore = !singleBackSlashBefore;
continue;
}
if (currentChar == c && !singleBackSlashBefore)
return i;
singleBackSlashBefore = false;
}
return -1;
}