Merge from forked repo #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.139 to 1.0.140. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](serde-rs/serde@v1.0.139...v1.0.140) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…tead of 'merge_toplevel_arrays' (#3080) - This ensures that other values than just the arrays are overridden, like nested objects, where it makes sense - merge_depth is set to 3 so that top-level language features are merged (like 'scope'), but everything deeper is overridden with the user-config
* add spacer element to statusline * docs
Remove padding gutter type, and automatically add 1 padding if gutters is non-empty.
* feat(tree-sitter): ✨ add go template support * fix(tree-sitter): 🐛 go template highlight scope selectors * chore(tree-sitter): 🔧 update go template grammar commit
* improve python queries * update python grammar to `0.20.2` * fix variadic parameter scope * add punctuation scopes * fix order of punctuation scopes * undo `embedded` delete
Also added a note about X on "SELECTING LINES".
Also had to do a little rewording to fit the recap for MOTIONS AND SELECTIONS.
Also fixed consistency of capitalisation and spacing of notes.
Also some consistency issues - redundant/dated comment in JOINING LINES - spacing around slashes - etc.
Some lines went longer than the titlebars, fixed regex in SPLITTING SELECTIONS which wasn't actually correct. Changed 1 "bat" to a "cat" in ADDING SELECTION ON NEXT SEARCH MATCH which makes it harder to do with a simple s select.
* add code for diagnostic. This PR provides a solution to resolve #2994. missing Code Actions for lsp * remote unused import
* Shorten embedded command descriptions - Compact descriptions in command palette and infobox * Shorten typed command descriptions * Fix typo in decrement command description
* added position-pct as a statusline indicator * removed unnecessary mutable reference * pct -> percent * percent -> percentage
* Add color modes to nord theme * Add color-modes to nord_light theme and fixup Fg color was not set in some places and defaulted incorrectly.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.