Commit Graph

759 Commits

Author SHA1 Message Date
Lukas Holecek
3e6ac65444 fakevim: Fix search issues
Highlighting text is always case sensitive regular expression.

Fix asterisk and hash search.

Change-Id: Ia41eee9266de4ed9bf0bd221609d8e02b72ada03
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-02 09:00:41 +02:00
Lukas Holecek
dcfd97d41d fakevim: Fix search for last submitted expression
Browsing search history shouldn't change last search expression.

If submitted search expression is empty last one is use instead.

Change-Id: I279e2800baa98f48c8592149db16dde81714f24f
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-01 09:41:04 +02:00
Lukas Holecek
6268f943d0 fakevim: Improve Ex command handling
Multi-line commands (lines starting with backslash).

Subcommands separated by bar character (|).

Task-number: QTCREATORBUG-7376
Change-Id: I947b10ee5043824278c6ba71e8ebb19dc5787328
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-01 09:40:33 +02:00
Lukas Holecek
da31e05af0 fakevim: Fix map handling in Ex mode
Change-Id: I23b280351de0e57df751fe5530fec8b3dd9e197d
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-01 09:37:04 +02:00
Lukas Holecek
c1755d4d69 fakevim: Highlight matches using Find::IFindSupport
Highlight color is taken from current color scheme and changing the text
keeps highlighted matches valid for current search.

Change-Id: I9032b48589ff0c638b04f1bcf3a0e26f422af491
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-28 14:51:20 +02:00
Lukas Holecek
1264d0ea5e fakevim: Appearance of command line widget.
Widget for Ex and search mode is QLineEdit.

Messages are displayed using QLabel widget with different style for
error, warnings etc.

Change-Id: I4d4f799bbe261febaf6c2c21c01f6b66e1beec6e
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-26 17:22:21 +02:00
Christian Kandeler
3d9e492860 Do not use the fromAscii() and toAscii() functions.
They are deprecated in Qt 5. Use fromLatin1() and toLatin1() instead. In
Qt 5, these always do the same thing as their "Ascii" counterparts. The
same goes for Qt 4, provided QTextCodec::setCodecForCStrings has not
been set, which it hasn't.

Change-Id: I04edeb376762b6671eff8156094f0d5e2cb8e1ea
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-09-21 21:03:48 +02:00
Lukas Holecek
12f1098329 fakevim: Improved command line buffers
Command line history should be global.

Keep last submitted command/search visible.

Change-Id: I0fc60786d486eb07c849d016aa23f71875d2cede
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-18 08:18:07 +02:00
Lukas Holecek
6bab355134 fakevim: Fix mapped input handling
Do not wait for incomplete input indefinitely.

Handle shift correctly.

Change-Id: I9b500bd9c29de54008d6b940753fa0cf61217b75
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-14 11:19:50 +02:00
Lukas Holecek
97769d1a71 fakevim: Avoid unnecessary clearing message
Change-Id: Ied9d1f2702dd1cb1b9a46547567a1df35ccfe256
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-14 11:18:51 +02:00
Christian Kandeler
405217c111 Utils::HostOsInfo: Introduce controlModifier() method.
Change-Id: Ibd244963c5cd643fc0e8358ceabff0ad5f6599eb
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-13 10:14:53 +02:00
Lukas Holecek
e767fb28fa fakevim: Improved mappings handling
Implemented special key names (e.g. <left>, <space>, <leader>,
<backspace>).

Disallow mapping with <nop>.

Change-Id: I8f4cdc84cb469db0b5cddd9059484cce7aa1b17f
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-12 14:23:05 +02:00
Lukas Holecek
fc5df4b24b fakevim: Improved command line mode
Traverse only history items starting with current command line content.

Clear messages only if necessary.

Change-Id: I6862fe7e32ec0235576e64287481d72c4194e759
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-11 18:32:51 +02:00
Lukas Holecek
3841b85418 fakevim: Fix searching
While searching for expression that is not found keep text cursor on
position before search.

Make search work with visual mode.

Clear message on escape from search mode.

Change-Id: I44e843a5a16bcc45a1bdc573ecc409654c4eb910
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-10 12:05:07 +02:00
Lukas Holecek
b559b53ba6 fakevim: Fixed undo/redo with page down/up in insert mode
Change-Id: Ie657e9d5aeed71a3c301349df031a90237ba6eb8
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-04 10:08:17 +02:00
Lukas Holecek
4503ce663a fakevim: Improved searching
Reset cursor position if search is canceled and always search from
initial cursor position if search expression changes.

Implemented Vim's wrapscan (ws) option.

Task-number: QTCREATORBUG-7251

Change-Id: Ic709cc4fb9dacdb94fbd17f85ac9b75738d5578c
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-04 09:41:28 +02:00
Lukas Holecek
eb8f1379dc fakevim: Improved undo/redo
Change-Id: I9326820cf0b8c551932ffae4cc4ae0af8415fd4e
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-03 11:03:53 +02:00
Lukas Holecek
a57b4cf93e fakevim: Improved jump list
Record jump before changing text cursor position.

Implemented "latest jump" mark (single quote).

Change-Id: Ia3392761f80c185b06ad326718ad9db0d3108d45
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-28 08:16:32 +02:00
Lukas Holecek
2481e58da8 fakevim: Improved word movement
Change-Id: I26f2dfd8780af3cbcc47646c2ddff757c919c88a
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-28 08:14:13 +02:00
Christian Kandeler
e669f05406 Utils: Introduce HostOsInfo class.
The class' member functions are intended to be used
instead of the Q_OS_* macros in all contexts where
the latter are not syntactically required.
This lowers the likelihood of changes made on one
platform breaking the build on another, e.g. due to
the code model missing symbols in #ifdef'ed out code
when refactoring.

Change-Id: I4a54788591b4c8f8d589b8368a6c683d4155c9fa
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-27 17:00:03 +02:00
Lukas Holecek
3306cecd79 fakevim: Fix selectText() with invalid range
If invalid range is passed to selectText() it should return empty
string.

Change-Id: I42ec26fb3dad3f1b521370b1a9596f3d52b92a64
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-22 08:32:02 +02:00
Friedemann Kleint
20fe4725fb Compile with Qt 5.
Change-Id: If0e3eab81aa8c458fe47e2b5d16d1469286840b9
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-21 11:42:24 +02:00
Lukas Holecek
20231b769d fakevim: Clipboard data format compatible with Vim
Store clipboard data that can be used by Vim and vice versa.

Change-Id: If1eb436fa371afeff39fd37353fe0841dafe169a
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-17 08:18:37 +02:00
Lukas Holecek
a1834bba8e fakevim: Fixed pasting text [count] times and in selection
Text pasted correctly [count] times and text cursor position
after the operation is same as in Vim.

P and p keys should work the same if pasting to selection.

Change-Id: Ic1cc82a71a2103b13a37e270ad9b7745ff95954d
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-17 08:17:12 +02:00
Lukas Holecek
64fece4d28 fakevim: Added support for last selection operations
Change-Id: Ib0628790d415b400fa7b2ca6d2d536b4f6a84aed
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-17 08:12:20 +02:00
Lukas Holecek
e6bb2f644b fakevim: Support for count steps in block selections
Added support for combinations like "2vi)" or "3da{".

Change-Id: I548250faca900b6e5c78f1418cbf3cd4591e7e35
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-15 08:14:21 +02:00
Lukas Holecek
b4ec04e5e6 fakevim: Range mode of a clipboard register depends on its content
If register takes its content from clipboard check it it ends with new
line char ('\n' or '\r'). If it does the text can be pasted only on
a new line. This emulates Vim behaviour.

Change-Id: I70ae8b264ba41c3d84a42b1c91f3c4bdb183efd9
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-09 13:16:05 +02:00
Lukas Holecek
77e101406f fakevim: Fixed pasting from clipboard
Paste from clipboard if register is "" and 'clipboard' contains
'unnamedplus' (otherwise from selection if available and 'clipboard'
contains 'unnamed').

Also correctly parse 'clipboard' option to string list.

Change-Id: Ic78cd2953789c0402f515973ed2eb48fc3e72154
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-07 22:21:37 +02:00
Lukas Holecek
7e7460ad33 fakevim: Added support for smartcase searching
Change-Id: I85a83aff0886282a6eac2dc9cc4662087c3b0b95
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-01 16:17:03 +02:00
Lukas Holecek
6544ed2f00 fakevim: Emulate Vim regexp more precisely
Change-Id: Ia951f6e10d0e8d19e8d7d4b2a696eb9277ce6201
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-01 14:52:52 +02:00
Lukas Holecek
d0dcd40635 fakevim: Implement special clipboard buffers
Introduces Vim's special registers "+ and "* and partial support for
"clipboard" option - only values "unnamed" and "unnamedplus" and the
behaviour is only similar.

Task-number: QTCREATORBUG-6342
Change-Id: I1fa95b681edadacfe9690a2fd6eb2e98e7cc5dca
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-01 13:25:04 +02:00
Lukas Holecek
8eae872660 fakevim: Fix for searches with an empty match
If searching (in "/" command mode) with regular expression "\\b" or
".{0}" the search takes infinitely long.

This fix highlights one character to the right of empty match
(behaviour is similar in Vim).

Change-Id: I5113177cf6af0ef0197e14f0165227e7538a3d1d
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-26 15:32:24 +02:00
Lukas Holecek
d4576a4b7a fakevim: Fix block selections
Selection anchor should be in front text cursor position.

Last block with nested block should be selected properly.

Change-Id: I796875ef7bce3527fb703ece5fdf944123f12315
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-23 14:53:22 +02:00
Lukas Holecek
ead1ea2471 fakevim: Selection command for strings
Selection commands for strings (blocks enclosed in double or single
quotes or backtick characters). E.g. "di'", "ca`" etc.

Change-Id: Ic83a5230eab317c9e730a1ddb421f2df432cb8e6
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-23 14:51:58 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
hluk
fd817c675c fakevim: Incorrect commands with nested parentheses
Commands in normal mode like "ci(", "di[", "ca{" etc. should handle
nested parentheses correctly.

task-number: QTCREATORBUG-7632
Change-Id: I7a77ffa61ff7675f0dc8c66918136c2573cf4c06
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-18 13:04:06 +02:00
hjk
4f169b2150 fakevim: fix :!cmd if there is no selection
Change-Id: Ieafb77ecc4d211f97b7b8321fc84fd7d6c81dfc0
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-08 18:11:40 +02:00
Eike Ziller
529c0a8fe2 Merge remote-tracking branch 'origin/2.5' 2012-05-07 15:18:39 +02:00
hjk
8b37921bc5 fakevim: don't allow non-positive numbers for tabstop and shiftwidth
Task-number: QTCREATORBUG-7375
Change-Id: I947dd903a5e7d09e367afbc771582793e6c008f1
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-05-03 11:41:24 +02:00
hjk
b79f13df6a fakevim: make sure pending input is only processed once
Change-Id: I0c6141eff49413f66cfee9a1f117279cdfcd4f36
Reviewed-by: hjk <qthjk@ovi.com>
2012-04-17 11:20:37 +02:00
hjk
88204e9723 fakevim: respect count for < and > in visual mode
Task-number: QTCREATORBUG-7250
Change-Id: I80041c0e902df5274a37a821cd93f036fde9514e
Reviewed-by: hjk <qthjk@ovi.com>
2012-04-11 08:39:10 +02:00
hjk
502ddea099 fakevim: fix handling of the 'Enter' key on the number block
Change-Id: I8d05f9b6a890beb6ff67795e81619e8101127180
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-09 10:13:44 +01:00
Robert Loehning
9988c471fe Replaced one-char-strings
Change-Id: I0bf982b508a237e5b1e6ba3279cb589bae1b1c1d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-03-07 09:18:15 +01:00
Martin Aumüller
31ae1778cb fakevim: fix repeating 'ciw'
Change-Id: I732cc9d6ad1693cf6227bca7c7d6e80a9357fd23
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-21 10:56:23 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
Morten Johan Sorvig
b0cd54c1ec Replace Q_WS_MAC with Q_OS_MAC.
We want to carry over all mac-specific code paths
to Qt 5. WS_MAC is no longer set; OS_MAC is.

This change is compatible with Qt 4 builds since
OS_MAC is set whenever WS_MAC is. (OS_MAC would
also be set for the theoretical X11/Mac platform,
but that's anyway not a supported configuration
for Creator)

Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-26 11:06:12 +01:00
Kai Koehne
f85df65594 FakeVim: Fix gcc warning about unused variable
Change-Id: I2d88e568f91416cdc304446ccb9bd0d98a5eb654
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-06 11:24:17 +01:00
hjk
c9c9937b58 fakevim: fix cursor column after up/down in replace mode
Change-Id: I1a7fe47f1a7bf875447e767edee57fcca4b344f3
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-30 23:23:37 +01:00
hjk
29eff52529 fakevim: rework undo/redo cursor positioning
Change-Id: I1daa788377295fb1446f31d9a74b9fd0df6920d1
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-27 17:40:58 +01:00