dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 13:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

support vim e command in vmdtab and vvim (#1218)

Browse Source
This commit is contained in:
gydeng 2020-02-23 10:27:59 +08:00 committed by GitHub
parent 8e75c40c86
commit 615826323a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/utils/vvim.cpp
View File

@ -8,13 +8,18 @@
#include <QClipboard>
#include <QApplication>
#include <QMimeData>
#include <QDir>
#include "vconfigmanager.h"
#include "veditor.h"
#include "utils/veditutils.h"
#include "vconstants.h"
#include "vmdeditor.h"
#include "vmainwindow.h"
#include "vdirectory.h"
#include "vdirectorytree.h"
extern VConfigManager *g_config;
extern VMainWindow *g_mainWin;
const QChar VVim::c_unnamedRegister = QChar('"');
const QChar VVim::c_blackHoleRegister = QChar('_');
@ -5953,6 +5958,27 @@ bool VVim::executeCommand(const QString &p_cmd)
} else if (p_cmd == "nohlsearch" || p_cmd == "noh") {
// :nohlsearch, clear highlight search.
clearSearchHighlight();
} else if (p_cmd.size() > 3 && p_cmd.left(2) == "e ") {
// :e <file>, open a note in edit mode.
auto filePath = p_cmd.mid(2).trimmed();
if(filePath.left(2) == "~/") {
filePath.remove(0, 1).insert(0, QDir::homePath());
} else if(filePath.left(2) == "./" || filePath[0] != '/') {
VDirectory *dir = g_mainWin->getDirectoryTree()->currentDirectory();
if(filePath.left(2) == "./") {
filePath.remove(0, 1);
} else {
filePath.insert(0, '/');
}
filePath.insert(0, dir->fetchPath());
}
if(g_mainWin->openFiles(QStringList(filePath), false, OpenFileMode::Edit).size()) {
msg = tr("Open %1 in edit mode.").arg(filePath);
} else {
msg = tr("Unable to open %1").arg(filePath);
}
} else {
validCommand = false;
}

26
src/vmdtab.cpp
View File

@ -24,6 +24,8 @@
#include "vsnippetlist.h"
#include "vlivepreviewhelper.h"
#include "vmathjaxinplacepreviewhelper.h"
#include "vdirectory.h"
#include "vdirectorytree.h"
extern VMainWindow *g_mainWin;
@ -1457,6 +1459,30 @@ bool VMdTab::executeVimCommandInWebView(const QString &p_cmd)
} else if (p_cmd == "nohlsearch" || p_cmd == "noh") {
// :nohlsearch, clear highlight search.
m_webViewer->findText("");
} else if (p_cmd == "e") {
// :e, enter edit mode.
showFileEditMode();
} else if (p_cmd.size() > 2 && p_cmd.left(2) == "e ") {
// :e <file>, open a note in edit mode.
auto filePath = p_cmd.mid(2).trimmed();
if(filePath.left(2) == "~/") {
filePath.remove(0, 1).insert(0, QDir::homePath());
} else if(filePath.left(2) == "./" || filePath[0] != '/') {
VDirectory *dir = g_mainWin->getDirectoryTree()->currentDirectory();
if(filePath.left(2) == "./") {
filePath.remove(0, 1);
} else {
filePath.insert(0, '/');
}
filePath.insert(0, dir->fetchPath());
}
if(g_mainWin->openFiles(QStringList(filePath), false, OpenFileMode::Edit).size()) {
msg = tr("Open %1 in edit mode.").arg(filePath);
} else {
msg = tr("Unable to open %1").arg(filePath);
}
} else {
validCommand = false;
}