Commit Graph

759 Commits

Author SHA1 Message Date
hjk
703a93d7e1 FakeVim: Fix cw on white space
Task-number: QTCREATORBUG-11757
Change-Id: I99ac0f78c02e0bb6684fc714d2cba2c35a3b7db3
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-25 19:10:27 +01:00
Sergio Ahumada
c375436847 Fix some typos
Change-Id: I3be73c2a4d256a0d28e863fd2517a4d7442b34d8
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-05 09:39:42 +01:00
hluk
bc45321949 FakeVim: Allow to insert space on <S-SPACE>
Change-Id: I20f3e8e6602c35b812e2a1f29fdc2b1b458468e5
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-27 12:56:01 +01:00
hluk
d8a56f9dc1 FakeVim: Save and restore cursor if handling custom Ex command
Change-Id: I38ee04fd76f92b0e0e5755e6a9f8828bd347c245
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-21 13:31:12 +01:00
hluk
2ec277bc46 FakeVim: Keep visual selection when focusing editor
Change-Id: I4dddcf8f8a214810e140af356078cefe82e9381c
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-19 13:44:43 +01:00
hluk
6defaacedd FakeVim: Update text cursor when leaving search sub-mode
Change-Id: Ie02f47390a95572db780f0aaf6e509cea8caa1a8
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-19 13:41:02 +01:00
hluk
d90d6f40b3 FakeVim: Fixes for insert/change in visual mode
Always limit position of marks to current document (mainly position of
'<' and '>' marks for last selection).

Command '$' selects end of selected lines in visual block mode. This
will require editor support since visual representation of such
selection isn't always rectangle.

Command 'c' works the same as 's' in visual block mode.

Corrected positions for 'I', 'A', 's' and 'c' commands in visual block
mode after '<ESC>'.

Task-number: QTCREATORBUG-11378
Change-Id: I86582b634eb782829db48fd1b914713f87ac409f
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-11 11:27:44 +01:00
hluk
33345045bc FakeVim: Differentiate between <S-SPACE> and <SPACE> and others
Since some keys with shift modifier pressed generate same string (e.g.
<S-SPACE> and <SPACE>), the modifier must not be ignored.

Recognize Qt::Key_Backtab as <S-TAB>.

Change-Id: I6b25dec4b3bc9564249609449f9df7cd7fab263e
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-11 11:27:33 +01:00
hjk
5ea71557be FakeVim: Don't touch cursor on focus in.
Change-Id: Ic8199fc14089717a6b121b384ddc0bbc606a5fb7
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-02 21:14:59 +01:00
hluk
ff30e7f577 FakeVim: Toggle boolean option and print option
Allow to use character '!' to toggle a boolean option and '?' to print
an option at the end of ":set {option}" command.

Change-Id: I7475c6a748c834c40de03cca57a59c428b1c4188
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-01-21 17:39:20 +01:00
hluk
348c823ab9 FakeVim: Remove redundant variable
Change-Id: Ia10bd60de7e1a55903024f20bd041df23c85b151
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-01-21 17:39:03 +01:00
hluk
fc5799367c FakeVim: Select matched text when searching backwards
Task-number: QTCREATORBUG-7251
Change-Id: I3ef998683080b92e9e4a301434e45dc56c5a2f0a
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-01-21 17:38:53 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
hluk
2976345ff5 FakeVim: Fix mappings in insert mode
Mapped user input shouldn't break edit block in insert mode.

Change-Id: I47ad449d9f0a2623cfcbdfa6c66626aa876ed76b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-12-30 16:59:54 +01:00
hluk
99d8567103 FakeVim: Use registers 0, 1 and -
Command "y" additionally yanks text to register 0 if the default
register " is used.

Delete and change command set register 1, if removed text contains
multiple lines, or to small delete register (-).

Register " is always set.

Change-Id: I9d357911cedaac97fb1a91698523c9b0f3de8621
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-12-30 16:56:58 +01:00
hluk
227ef8240a FakeVim: Command % jumps to first known parenthesis character
Change-Id: I28988925f397af8c4927c416774d7fe21e982dcb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-12-30 13:25:27 +01:00
hluk
8ea6a21a78 FakeVim: Added Vim commands "g0", "g^" and "g$"
Change-Id: I05958e56282f0b290feb7e8e01d30b77f566d11b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-12-30 13:24:04 +01:00
hluk
bf587d179e FakeVim: Added Vim commands "gj" and "gk"
Change-Id: I1d38f86a1993f4aa82eb5dbf4595af69e062c0e1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-12-30 13:22:04 +01:00
Eike Ziller
920d524d38 Merge remote-tracking branch 'origin/3.0' 2013-12-03 12:46:39 +01:00
hluk
b1a714ed44 FakeVim: Fix infinite loop when replacing empty text
Change-Id: Ie4ba6420889b0a6a5712b43a11f8366aa9a30edc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-12-03 11:40:51 +01:00
Eike Ziller
0a893fc6b4 Merge remote-tracking branch 'origin/3.0' 2013-12-02 15:33:56 +01:00
hjk
dc30a4a2bd FakeVim: Prevent crash in scrollToLine with Qt 4
There seem to be cases where QTextLines::isValid() returns true but
its lines_ are empty.

Change-Id: Ia4b9a66aec8d10754f7ff7dd0c90e7295e2a2220
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-12-02 14:53:56 +01:00
hluk
2bc961f075 FakeVim: Don't overwrite document with ":!..." commands
Ignore range in ":!..." commands.

Task-number: QTCREATORBUG-7396
Change-Id: I428a403b105499024ed84c6253240e808b3cdcd8
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-28 14:07:02 +01:00
Eike Ziller
5e2e0e469b Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I0485b1bf75cc02f9fbcb5c05e350da91f491abe3
2013-11-25 08:57:10 +01:00
Orgad Shaneh
5a268789ef FakeVim: Fix control modifier test
* Fix logic
* Rename the function

Change-Id: Ifa0bb77693e17ee75f30646ea3bbbf858e6e391c
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-22 10:38:31 +01:00
Eike Ziller
559e66cb35 Merge remote-tracking branch 'origin/3.0' 2013-11-22 09:11:51 +01:00
hluk
4042fa7082 FakeVim: Get rid of signed/unsigned compare compiler warning
Change-Id: I9647eb7a3679e6a1a545d8ed71d9c531e1691d25
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-21 17:58:52 +01:00
Eike Ziller
242b7bd209 Merge remote-tracking branch 'origin/3.0' 2013-10-29 08:17:05 +01:00
hluk
7af8af0136 FakeVim: Use current text cursor to find out line geometry
Change-Id: If4581d2f38db8311138b871b67fdbe164dde1688
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-28 17:06:21 +01:00
Friedemann Kleint
119548a0ff Remove most leading/trailing blanks from translated messages.
They are a hassle for translators and reviewers alike.

Change-Id: I363138212b692cf75fe1605df8af3721315d37e1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 10:50:56 +02:00
Eike Ziller
c3119d1aa7 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	src/plugins/qnx/qnxutils.cpp

Change-Id: I019ad21fb4c128eb736c8ab2d09310757e3be037
2013-10-24 08:56:29 +02:00
hluk
0dba50ee3d FakeVim: Scrolls correctly if text cursor moves on wrapped lines
Change-Id: I789fc822ad4f60d7e3a39f8231d7d0cb4a78bf70
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-23 12:38:32 +02:00
hjk
43ceec94f4 FakeVim: Initialize new m_inFakeVim member
Also move initialization before connection setup.

Task-number: QTCREATORBUG-10443
Change-Id: I3f3d074534a44a0aa6b8cc60c8ffbcd22d96ca33
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-10-22 10:01:29 +02:00
Eike Ziller
4eabcdc8fd Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/git/gitplugin.cpp
	src/plugins/qt4projectmanager/qmakeproject.cpp

Change-Id: Icbd485214b1add7869233dfe0dd9c6a76bddfc7d
2013-10-22 08:40:59 +02:00
hluk
be1736f95f FakeVim: Don't override "gm" with "m" command
Change-Id: I4e9d8c6780ce4241e6bcbcca6fd7f5b792fa03f1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-17 18:18:21 +02:00
hluk
893c054ea0 FakeVim: Clear command line to properly save its history
Change-Id: Ibb773ebd3d110ba828e55e29170843ed29e325a8
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-16 22:55:24 +02:00
hluk
739f7ab5cf FakeVim: Disable recursive event filtering only in current handler
Fixes handling of commands that switch or create new editors
(<C-W><C-W>, <C-W>V).

Change-Id: Iefad2571390afeb085c7c270187e5de451892521
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-16 11:37:56 +02:00
Eike Ziller
4e32babc44 Merge remote-tracking branch 'origin/3.0' 2013-10-16 11:22:20 +02:00
hluk
1a03adf444 FakeVim: Always use valid text cursor
Change-Id: Iacf7f96d0b0295c85905e3bbb7efb04c416a8ef2
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-14 23:01:29 +02:00
Eike Ziller
8474a6f128 Merge remote-tracking branch 'origin/3.0' 2013-10-14 15:31:54 +02:00
hluk
9e4dabc884 FakeVim: Dot command works for letter case commands in visual mode
Change-Id: I303c464c0ca2fb01f4a951d3fe7b6796f31d0ab2
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-10 15:59:57 +02:00
hluk
8e0597687c FakeVim: Don't filter events recursively
Task-number: QTCREATORBUG-10226
Change-Id: Ic5fdb125cfce603c24e8c88cbcd43f13e8af9d06
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-10 14:21:57 +02:00
Erik Verbruggen
f047d7eef9 VIM: remove unnecessary (and invalid) cast.
fakevimhandler.cpp:941:43: warning: comparison of integers of different signs: 'Int' (aka 'unsigned int') and 'int' [-Wsign-compare]
        return m_xkey == c && m_modifiers != int(HostOsInfo::controlModifier());
                                      ~~~~~~~~~~~ ^  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Change-Id: I360873f0c74512d95ca8ecaac4f1ab0a477877e7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-09-30 12:13:02 +02:00
Robert Loehning
4d89786a88 FakeVim: Fix handling of some hungarian characters
Done-by: hjk
Task-number: QTCREATORBUG-10236

Change-Id: Iba97b6ebbd4fee8a4ab52a3986a2f79c7344b75b
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-27 12:03:03 +02:00
hjk
196674d0de FakeVim: Use Qt::KeyboardModifiers for keyboard modifiers
Change-Id: I8651d396563dd82da2103c0a8c9fcd3fded6c5e3
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-27 11:45:58 +02:00
Eike Ziller
63ff745213 Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
2013-09-27 10:44:32 +02:00
hluk
a12a9f491c FakeVim: Ensure that enterFakeVim() is not called recursively
Task-number: QTCREATORBUG-10226
Change-Id: Ib58d43dc11071a5dc28bad53e13213a4413fca71
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-26 21:52:47 +02:00
hluk
2e0508ca26 FakeVim: Handle deleted editor widget in insert mode
Change-Id: I7e6585872552a9b4a5bd126e7d01a8f9ea18339a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-19 12:18:58 +02:00
hluk
a636a933d0 FakeVim: Fix searching in visual mode and with commands
Search in visual mode should select text up to matched position.

Using commands should work with search movement; e.g. 'd2/needle<CR>'.
Commands should be also properly canceled if search movement fails.

Change-Id: Ic695dccaf3f36ccae2f2b1a93f888d5ba9805a78
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-19 12:17:37 +02:00