Skip to content

Commit

Permalink
Merge branch 'master' of github.com:VSCodeVim/Vim
Browse files Browse the repository at this point in the history
  • Loading branch information
Chillee committed Apr 9, 2018
2 parents e525141 + dcaa0ce commit ea115eb
Show file tree
Hide file tree
Showing 15 changed files with 246 additions and 64 deletions.
21 changes: 17 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,23 @@
# Change Log

## [v0.11.1](https://github.com/vscodevim/vim/tree/HEAD)
## [v0.11.3](https://github.com/vscodevim/vim/tree/HEAD)

[Full Changelog](https://github.com/vscodevim/vim/compare/v0.11.0...HEAD)
[Full Changelog](https://github.com/vscodevim/vim/compare/v0.11.2...HEAD)

- docs: add documentation for installing xsel. fixes \#2071 [\#2476](https://github.com/VSCodeVim/Vim/pull/2476) ([jpoon](https://github.com/jpoon))
- Respect vim.visualstar configuration \(fixes \#2469\) [\#2470](https://github.com/VSCodeVim/Vim/pull/2470) ([ytang](https://github.com/ytang))
- feat: Added \<C-w\>= keybind [\#2453](https://github.com/VSCodeVim/Vim/pull/2453) ([844196](https://github.com/844196))
- neovim.ts: typo in log [\#2451](https://github.com/VSCodeVim/Vim/pull/2451) ([prakashdanish](https://github.com/prakashdanish))
- await openEditorAtIndex1 command [\#2442](https://github.com/VSCodeVim/Vim/pull/2442) ([arussellk](https://github.com/arussellk))

## [v0.11.2](https://github.com/vscodevim/vim/tree/v0.11.2) (2018-03-09)
[Full Changelog](https://github.com/vscodevim/vim/compare/v0.11.1...v0.11.2)

- Readds vimState.lastClickWasPastEOL. Fixes \#2404 [\#2433](https://github.com/VSCodeVim/Vim/pull/2433) ([Chillee](https://github.com/Chillee))
- fix: selection in search in visual mode \#2406 [\#2418](https://github.com/VSCodeVim/Vim/pull/2418) ([shortheron](https://github.com/shortheron))

## [v0.11.1](https://github.com/vscodevim/vim/tree/v0.11.1) (2018-03-08)
[Full Changelog](https://github.com/vscodevim/vim/compare/v0.11.0...v0.11.1)

- Set the timeout to 0 for waitforcursorupdatestopropagate [\#2428](https://github.com/VSCodeVim/Vim/pull/2428) ([Chillee](https://github.com/Chillee))
- fix: use 'fsPath'. closes \#2422 [\#2426](https://github.com/VSCodeVim/Vim/pull/2426) ([jpoon](https://github.com/jpoon))
Expand Down Expand Up @@ -1150,6 +1165,4 @@
- Navigation mode [\#4](https://github.com/VSCodeVim/Vim/pull/4) ([jpoon](https://github.com/jpoon))
- Add ex mode [\#3](https://github.com/VSCodeVim/Vim/pull/3) ([guillermooo](https://github.com/guillermooo))



\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ We also recommend going into *System Preferences -> Keyboard* and increasing the

VSCodeVim will take over your control keys, just like real vim, so you get the _full_ vim experience. This behaviour can be adjusted with the [`useCtrlKeys`](#vimusectrlkeys) and [`handleKeys`](#vimhandlekeys) settings.

### Linux setup

If you have configured `vim.useSystemClipboard: "true"`, we rely on [clipboardy](https://github.com/sindresorhus/clipboardy) for cross-platform copy/paste operations. This library is dependent on `xsel`:

```
apt install xsel
```

## Settings

### Quick example settings
Expand Down Expand Up @@ -422,6 +430,7 @@ Motion Command | Description
`<leader><leader><leader> bdw`|Start of word
`<leader><leader><leader> bde`|End of word
`<leader><leader><leader> bdjk`|Start of line
`<leader><leader><leader> j`|JumpToAnywhere motion; default behavior matches beginning & ending of word, camelCase, after _ and after #

`<leader><leader> (2s|2f|2F|2t|2T) <char><char>` and `<leader><leader><leader> bd2t <char>char>` are also available.
The difference is character count required for search.
Expand All @@ -442,6 +451,7 @@ Setting | Description
`vim.easymotionMarkerFontWeight`|The font weight used for the marker text.
`vim.easymotionMarkerYOffset`|The distance between the top of the marker and the text (will typically need some adjusting if height or font size have been changed).
`vim.easymotionKeys`|The characters used for jump marker name
`vim.easymotionJumpToAnywhereRegex`| Custom regex to match for JumpToAnywhere motion (analogous to `Easymotion_re_anywhere`). Example setting (which also matches start & end of line, as well as Javascript comments in addition to the regular behavior (note the double escaping required): ^\\s*.|\\b[A-Za-z0-9]|[A-Za-z0-9]\\b|_.|\\#.|[a-z][A-Z]|//|.$"

### vim-surround

Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:8.9
FROM node:8.11

RUN apt-get update && \
apt-get install -y xorg xvfb libxss-dev libgtk2.0-0 gconf2 libnss3 libasound2
Expand Down
161 changes: 134 additions & 27 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 25 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "Vim",
"description": "Vim emulation for Visual Studio Code",
"icon": "images/icon.png",
"version": "0.11.1",
"version": "0.11.3",
"publisher": "vscodevim",
"galleryBanner": {
"color": "#e3f4ff",
Expand Down Expand Up @@ -488,6 +488,11 @@
"description": "Set the characters used for jump marker name",
"default": "hklyuiopnm,qwertzxcvbasdgjf;"
},
"vim.easymotionJumpToAnywhereRegex": {
"type": "string",
"description": "Regex matches for JumpToAnywhere motion",
"default": "\\b[A-Za-z0-9]|[A-Za-z0-9]\\b|_.|#.|[a-z][A-Z]"
},
"vim.sneak": {
"type": "boolean",
"description": "Enable the Sneak plugin for Vim.",
Expand Down Expand Up @@ -599,24 +604,24 @@
"untildify": "^3.0.2"
},
"devDependencies": {
"@types/copy-paste": "^1.1.30",
"@types/diff": "^3.2.2",
"@types/diff-match-patch": "^1.0.32",
"@types/lodash": "^4.14.100",
"@types/mocha": "^2.2.48",
"@types/node": "^9.4.0",
"gulp": "^3.9.1",
"gulp-bump": "^3.0.0",
"gulp-filter": "^5.1.0",
"gulp-git": "^2.5.1",
"gulp-sourcemaps": "^2.6.4",
"gulp-tag-version": "^1.3.1",
"gulp-tslint": "^8.1.2",
"gulp-typescript": "^3.2.4",
"mocha": "^5.0.0",
"prettier": "^1.10.2",
"tslint": "^5.9.1",
"typescript": "^2.7.1",
"vscode": "^1.1.10"
"@types/copy-paste": "1.1.30",
"@types/diff": "3.2.2",
"@types/diff-match-patch": "1.0.32",
"@types/lodash": "4.14.106",
"@types/mocha": "5.0.0",
"@types/node": "9.6.2",
"gulp": "3.9.1",
"gulp-bump": "3.0.0",
"gulp-filter": "5.1.0",
"gulp-git": "2.5.1",
"gulp-sourcemaps": "2.6.4",
"gulp-tag-version": "1.3.1",
"gulp-tslint": "8.1.3",
"gulp-typescript": "3.2.4",
"mocha": "5.0.5",
"prettier": "1.10.2",
"tslint": "5.9.1",
"typescript": "2.7.1",
"vscode": "1.1.10"
}
}
6 changes: 6 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": [
"config:base",
"default:pinDigestsDisabled"
]
}
Loading

0 comments on commit ea115eb

Please sign in to comment.