From e32ec1f88677cb286e0caccfab11ac4b33c95496 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Wed, 13 Apr 2022 19:19:48 +0800 Subject: [PATCH] fix(lang#php)!: change `g D` key binding BREAKING CHANGE: use `g D` to jump to declaration --- autoload/SpaceVim/layers/lang/php.vim | 5 +++-- doc/SpaceVim.txt | 2 +- docs/layers/lang/php.md | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/autoload/SpaceVim/layers/lang/php.vim b/autoload/SpaceVim/layers/lang/php.vim index 330f08566..d6531a720 100644 --- a/autoload/SpaceVim/layers/lang/php.vim +++ b/autoload/SpaceVim/layers/lang/php.vim @@ -49,7 +49,7 @@ " > " key binding Description " -------------------------------- -" g D jump to type definition +" g D jump to declaration " SPC l e rename symbol " SPC l x show references " SPC l h show line diagnostics @@ -103,6 +103,8 @@ function! SpaceVim#layers#lang#php#config() abort \ || SpaceVim#layers#lsp#check_server('intelephense') call SpaceVim#mapping#gd#add('php', \ function('SpaceVim#lsp#go_to_def')) + call SpaceVim#mapping#g_capital_d#add('php', + \ function('SpaceVim#lsp#go_to_declaration')) endif if s:auto_fix @@ -125,7 +127,6 @@ function! s:on_ft() abort \ || SpaceVim#layers#lsp#check_server('phpactor') \ || SpaceVim#layers#lsp#check_server('intelephense') nnoremap K :call SpaceVim#lsp#show_doc() - nnoremap gD :call SpaceVim#lsp#go_to_typedef() call SpaceVim#mapping#space#langSPC('nnoremap', ['l', 'd'], \ 'call SpaceVim#lsp#show_doc()', 'show-document', 1) diff --git a/doc/SpaceVim.txt b/doc/SpaceVim.txt index e16bbe5ef..b35c77f5f 100644 --- a/doc/SpaceVim.txt +++ b/doc/SpaceVim.txt @@ -3966,7 +3966,7 @@ If the lsp layer is enabled for php, the following key bindings can be used: > key binding Description -------------------------------- - g D jump to type definition + g D jump to declaration SPC l e rename symbol SPC l x show references SPC l h show line diagnostics diff --git a/docs/layers/lang/php.md b/docs/layers/lang/php.md index 7d3307bf6..7f0418432 100644 --- a/docs/layers/lang/php.md +++ b/docs/layers/lang/php.md @@ -96,7 +96,7 @@ be used: | key binding | Description | | ----------- | ----------------------- | -| `g D` | jump to type definition | +| `g D` | jump to declaration | | `SPC l e` | rename symbol | | `SPC l x` | show references | | `SPC l s` | show line diagnostics |