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

fakevim: improve reading of mappings from .vimrc

Browse Source 
Change-Id: I3a575ae71c3c84dea98e2d35d1eda429a3c1ea66
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-11-10 16:13:10 +01:00
committed by hjk
parent 82f5573626
commit ddc85fe192
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -449,6 +449,12 @@ public:
&& m_text == a.m_text; && m_text == a.m_text;
} }
// Ignore e.g. ShiftModifier, which is not available in sourced data.
bool matchesForMap(const Input &a) const
{
return (a.m_key == m_key || a.m_xkey == m_xkey) && m_text == a.m_text;
}
bool operator!=(const Input &a) const { return !operator==(a); } bool operator!=(const Input &a) const { return !operator==(a); }
QString text() const { return m_text; } QString text() const { return m_text; }
@@ -654,7 +660,7 @@ public:
for (int i = 0; i != size(); ++i) { for (int i = 0; i != size(); ++i) {
const Inputs &haystack = at(i).first; const Inputs &haystack = at(i).first;
// A mapping // A mapping
if (startsWith(haystack, *inputs)) { if (couldTriggerMap(haystack, *inputs)) {
if (haystack.size() != inputs->size()) if (haystack.size() != inputs->size())
return false; // This can be extended. return false; // This can be extended.
// Actual mapping. // Actual mapping.
@@ -667,13 +673,13 @@ public:
} }
private: private:
static bool startsWith(const Inputs &haystack, const Inputs &needle) static bool couldTriggerMap(const Inputs &haystack, const Inputs &needle)
{ {
// Input is already too long. // Input is already too long.
if (needle.size() > haystack.size()) if (needle.size() > haystack.size())
return false; return false;
for (int i = 0; i != needle.size(); ++i) { for (int i = 0; i != needle.size(); ++i) {
if (needle.at(i) != haystack.at(i)) if (!needle.at(i).matchesForMap(haystack.at(i)))
return false; return false;
} }
return true; return true;