Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into tr-locale
Browse files Browse the repository at this point in the history
  • Loading branch information
bitigchi committed Oct 2, 2022
2 parents c9eeff6 + 0643645 commit 5ca36e9
Show file tree
Hide file tree
Showing 21 changed files with 399 additions and 676 deletions.
19 changes: 7 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,7 @@ jobs:
DEPS_BUILD_DIR: ${{ format('{0}/nvim-deps', github.workspace) }}
DEPS_PREFIX: ${{ format('{0}/nvim-deps/usr', github.workspace) }}
CMAKE_BUILD_TYPE: "RelWithDebInfo"
strategy:
matrix:
include:
- config: MSVC_64
archive: nvim-win64
name: windows (${{ matrix.config }})
name: windows (MSVC_64)
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -147,10 +142,10 @@ jobs:
run: .\ci\build.ps1 -Package
- uses: actions/upload-artifact@v3
with:
name: ${{ matrix.archive }}
name: nvim-win64
path: |
build/${{ matrix.archive }}.msi
build/${{ matrix.archive }}.zip
build/nvim-win64.msi
build/nvim-win64.zip
retention-days: 1

publish:
Expand Down Expand Up @@ -238,10 +233,10 @@ jobs:
steps:
- if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.tag_name != 'nightly')
name: Publish stable
uses: vedantmgoyal2009/winget-releaser@latest
uses: vedantmgoyal2009/winget-releaser@v1
with:
identifier: Neovim.Neovim
release-tag: ${{ github.event.inputs.tag_name || github.ref }}
release-tag: ${{ github.event.inputs.tag_name || github.ref_name }}
token: ${{ secrets.WINGET_TOKEN }}
- if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.event.inputs.tag_name == 'nightly')
name: Get nightly version
Expand All @@ -253,7 +248,7 @@ jobs:
echo "::set-output name=version::$VERSION"
- if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.event.inputs.tag_name == 'nightly')
name: Publish nightly
uses: vedantmgoyal2009/winget-releaser@latest
uses: vedantmgoyal2009/winget-releaser@v1
with:
identifier: Neovim.Neovim.Nightly
version: ${{ steps.get-version.outputs.version }}
Expand Down
4 changes: 1 addition & 3 deletions runtime/doc/builtin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5010,7 +5010,7 @@ matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
respectively. 3 is reserved for use by the |matchparen|
plugin.
If the {id} argument is not specified or -1, |matchadd()|
automatically chooses a free ID.
automatically chooses a free ID, which is at least 1000.

The optional {dict} argument allows for further custom
values. Currently this is used to specify a match specific
Expand Down Expand Up @@ -5068,8 +5068,6 @@ matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])
ignored, as well as entries with negative column numbers and
lengths.

The maximum number of positions in {pos} is 8.

Returns -1 on error.

Example: >
Expand Down
79 changes: 0 additions & 79 deletions runtime/doc/lsp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1145,59 +1145,6 @@ format({options}) *vim.lsp.buf.format()*
Defaults to `nil` in other modes, formatting the full
buffer

formatting({options}) *vim.lsp.buf.formatting()*
Formats the current buffer.

Parameters: ~
{options} (table|nil) Can be used to specify FormattingOptions. Some
unspecified options will be automatically derived from the
current Neovim options.

See also: ~
https://microsoft.github.io/language-server-protocol/specification#textDocument_formatting

*vim.lsp.buf.formatting_seq_sync()*
formatting_seq_sync({options}, {timeout_ms}, {order})
Formats the current buffer by sequentially requesting formatting from
attached clients.

Useful when multiple clients with formatting capability are attached.

Since it's synchronous, can be used for running on save, to make sure
buffer is formatted prior to being saved. {timeout_ms} is passed on to the
|vim.lsp.client| `request_sync` method. Example: >
vim.api.nvim_command[[autocmd BufWritePre <buffer> lua vim.lsp.buf.formatting_seq_sync()]]
<

Parameters: ~
{options} (table|nil) `FormattingOptions` entries
{timeout_ms} (number|nil) Request timeout
{order} (table|nil) List of client names. Formatting is
requested from clients in the following order: first all
clients that are not in the `order` list, then the
remaining clients in the order as they occur in the
`order` list.

*vim.lsp.buf.formatting_sync()*
formatting_sync({options}, {timeout_ms})
Performs |vim.lsp.buf.formatting()| synchronously.

Useful for running on save, to make sure buffer is formatted prior to
being saved. {timeout_ms} is passed on to |vim.lsp.buf_request_sync()|.
Example:
>
autocmd BufWritePre <buffer> lua vim.lsp.buf.formatting_sync()
<

Parameters: ~
{options} (table|nil) with valid `FormattingOptions` entries
{timeout_ms} (number) Request timeout

See also: ~
|vim.lsp.buf.format()|

hover() *vim.lsp.buf.hover()*
Displays hover information about the symbol under the cursor in a floating
window. Calling the function twice will jump into the floating window.
Expand All @@ -1224,32 +1171,6 @@ outgoing_calls() *vim.lsp.buf.outgoing_calls()*
|quickfix| window. If the symbol can resolve to multiple items, the user
can pick one in the |inputlist()|.

*vim.lsp.buf.range_code_action()*
range_code_action({context}, {start_pos}, {end_pos})
Performs |vim.lsp.buf.code_action()| for a given range.

Parameters: ~
{context} (table|nil) `CodeActionContext` of the LSP specification:
• diagnostics: (table|nil) LSP`Diagnostic[]` . Inferred from the current position if not provided.
• only: (table|nil) List of LSP `CodeActionKind`s used to
filter the code actions. Most language servers support
values like `refactor` or `quickfix`.
{start_pos} ({number, number}, optional) mark-indexed position.
Defaults to the start of the last visual selection.
{end_pos} ({number, number}, optional) mark-indexed position.
Defaults to the end of the last visual selection.

*vim.lsp.buf.range_formatting()*
range_formatting({options}, {start_pos}, {end_pos})
Formats a given range.

Parameters: ~
{options} Table with valid `FormattingOptions` entries.
{start_pos} ({number, number}, optional) mark-indexed position.
Defaults to the start of the last visual selection.
{end_pos} ({number, number}, optional) mark-indexed position.
Defaults to the end of the last visual selection.

references({context}, {options}) *vim.lsp.buf.references()*
Lists all the references to the symbol under the cursor in the quickfix
window.
Expand Down
2 changes: 1 addition & 1 deletion runtime/doc/options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5357,7 +5357,7 @@ A jump table for the options with a short description can be found at |Q_op|.
To use PowerShell: >
let &shell = executable('pwsh') ? 'pwsh' : 'powershell'
let &shellcmdflag = '-NoLogo -NoProfile -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.Encoding]::UTF8;'
let &shellredir = '-RedirectStandardOutput %s -NoNewWindow -Wait'
let &shellredir = '2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode'
let &shellpipe = '2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode'
set shellquote= shellxquote=
Expand Down
13 changes: 0 additions & 13 deletions runtime/lua/vim/diagnostic.lua
Original file line number Diff line number Diff line change
Expand Up @@ -357,19 +357,6 @@ local function execute_scheduled_display(namespace, bufnr)
M.show(namespace, bufnr, nil, args)
end

--- @deprecated
--- Callback scheduled when leaving Insert mode.
---
--- called from the Vimscript autocommand.
---
--- See @ref schedule_display()
---
---@private
function M._execute_scheduled_display(namespace, bufnr)
vim.deprecate('vim.diagnostic._execute_scheduled_display', nil, '0.9')
execute_scheduled_display(namespace, bufnr)
end

--- Table of autocmd events to fire the update for displaying new diagnostic information
local insert_leave_auto_cmds = { 'InsertLeave', 'CursorHoldI' }

Expand Down
Loading

0 comments on commit 5ca36e9

Please sign in to comment.