Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

An option to show the colon at the start of the command line box #2064

Merged
merged 15 commits into from
Oct 12, 2017

Conversation

gadkadosh
Copy link
Contributor

@gadkadosh gadkadosh commented Oct 11, 2017

Just a simple option to show the colon character at the start of the command line box.
Something I've been missing from vim itself, maybe others would find this useful too. If set to false the behavior should be the same like now.
I find it helps distinguish the vim command line with the command palette and the file search boxes.

xconverge and others added 5 commits October 7, 2017 16:33
Use the normal selection in insert mode.
This fixes VSCodeVim#1951. Selection in insert mode seems to be
specific to this plugin and is not easily possible in normal Vim.
@xconverge
Copy link
Member

I would like to have it set to false by default as to not confuse our current userbase. Also can you add this to the README.md settings area, thanks!

@gadkadosh
Copy link
Contributor Author

Sorry about that, was being stupid. Or just tired.
Fixed also a typo in package.json related to vim.substituteGlobalFlag option.
I would suggest setting ignoreFocusOut to false for the command line box. The way it is now is often quite a bit in the way, and forces you to use the mouse again to gain focus back, in a very non-vim way.
Should I squash commits together?

@xconverge
Copy link
Member

Hmm the merge still doesn't look right...can you try again please? Github lets me squash and merge which I can do at the end once it is ready to go

@gadkadosh
Copy link
Contributor Author

What do you mean? It merges fine for me now. Have I messed something up?

package.json Outdated
@@ -550,7 +550,11 @@
"vim.cmdLineInitialColon": {
"type": "boolean",
"description": "When typing a command show the initial colon ':' character",
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you fix these merge conflicts?

@@ -328,7 +328,11 @@ class ConfigurationClass {
/**
* When typing a command show the initial colon ':' character
*/
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unresolved merge conflicts

@xconverge
Copy link
Member

you didn't modify extension.ts yet it shows up in the diff...

@gadkadosh
Copy link
Contributor Author

I'm sorry, I'm not following. Those snippets seem to me to be from an older commit, not the most recent one. The most recent one really doesn't conflict for me with the master. So at the moment I'm not sure what it is that I should fix.
Mind you, I'm quite new to this, so maybe I'm just doing something really wrong. I would appreciate if you would point me in the right direction. Thanks!

@xconverge xconverge merged commit 68137e9 into VSCodeVim:master Oct 12, 2017
@xconverge
Copy link
Member

squashed it and it looks good, thanks for the contribution!

68137e9

@gadkadosh gadkadosh deleted the feature-cmdline-colon branch October 13, 2017 17:55
@gadkadosh
Copy link
Contributor Author

Thanks!
I would still like to add ignoreFocusOut false, which seems to be the same like the builtin input boxes of VSCode, and is also more convenient for a vim-like mouse-less usage. What do you think?

@xconverge
Copy link
Member

sure that sounds good to me!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants