]> Sergey Matveev's repositories - vim-lsp.git/log
vim-lsp.git
2 years agoAdd sent messages to TraceLog
Roberto Castagnola [Thu, 27 Oct 2022 12:45:51 +0000 (14:45 +0200)]
Add sent messages to TraceLog

2 years agoMerge pull request #86 from D4yvid/feat/code-action-in-popup
Yegappan Lakshmanan [Thu, 27 Oct 2022 01:46:35 +0000 (18:46 -0700)]
Merge pull request #86 from D4yvid/feat/code-action-in-popup

Create custom popup for code action and added a option to enable/disable it

2 years agoUpdate the logic used to jump to a symbol location.
Yegappan Lakshmanan [Thu, 27 Oct 2022 01:07:21 +0000 (18:07 -0700)]
Update the logic used to jump to a symbol location.

2 years agoMerge pull request #83 from Shane-XB-Qian/pr_kept_using_cur_win_if_same_buf
Yegappan Lakshmanan [Thu, 27 Oct 2022 01:01:56 +0000 (18:01 -0700)]
Merge pull request #83 from Shane-XB-Qian/pr_kept_using_cur_win_if_same_buf

fix: not jump if cur one is same buf also

2 years agoCreated a option to use popup menu in code action
D4yvid [Thu, 27 Oct 2022 00:18:32 +0000 (21:18 -0300)]
Created a option to use popup menu in code action

2 years agoRemoved "Print()" method used for debugging
D4yvid [Thu, 27 Oct 2022 00:14:57 +0000 (21:14 -0300)]
Removed "Print()" method used for debugging

2 years agoCreate custom popup for code action and added a option to enable/disable it
D4yvid [Thu, 27 Oct 2022 00:13:19 +0000 (21:13 -0300)]
Create custom popup for code action and added a option to enable/disable it

2 years agoclarify the comment about symbol jump if same buf had in cur win
shane.xb.qian [Wed, 26 Oct 2022 22:51:59 +0000 (06:51 +0800)]
clarify the comment about symbol jump if same buf had in cur win

2 years agoMerge pull request #84 from Shane-XB-Qian/pr_ft_server_status
Yegappan Lakshmanan [Wed, 26 Oct 2022 22:46:51 +0000 (15:46 -0700)]
Merge pull request #84 from Shane-XB-Qian/pr_ft_server_status

Pr ft server status

2 years agorename serverStatus to serverRunning
shane.xb.qian [Wed, 26 Oct 2022 22:06:19 +0000 (06:06 +0800)]
rename serverStatus to serverRunning

2 years agoMerge pull request #85 from D4yvid/fix/fix-newlines-in-popups
Yegappan Lakshmanan [Wed, 26 Oct 2022 20:35:02 +0000 (13:35 -0700)]
Merge pull request #85 from D4yvid/fix/fix-newlines-in-popups

Fix new lines in completion popup and in the completion detail popup

2 years agoUpdate handlers.vim
Dayvid [Wed, 26 Oct 2022 20:06:35 +0000 (17:06 -0300)]
Update handlers.vim

2 years agoFix new lines in completion popup and in the completion detail popup
D4yvid [Wed, 26 Oct 2022 16:51:58 +0000 (13:51 -0300)]
Fix new lines in completion popup and in the completion detail popup

2 years agoIn the plugin source files, set the tabstop option in the modeline
Yegappan Lakshmanan [Wed, 26 Oct 2022 15:40:30 +0000 (08:40 -0700)]
In the plugin source files, set the tabstop option in the modeline

2 years agoAdd a function to use with the 'tagfunc' option to jump to a symbol definition
Yegappan Lakshmanan [Wed, 26 Oct 2022 15:35:26 +0000 (08:35 -0700)]
Add a function to use with the 'tagfunc' option to jump to a symbol definition

2 years agoMerge pull request #82 from Shane-XB-Qian/pr_lspsign_trig_chk
Yegappan Lakshmanan [Wed, 26 Oct 2022 14:25:03 +0000 (07:25 -0700)]
Merge pull request #82 from Shane-XB-Qian/pr_lspsign_trig_chk

fix: check lsp sign trig exist as well

2 years agoUse a popup window by default to display the diag message when using the LspDiagCurre...
Yegappan Lakshmanan [Wed, 26 Oct 2022 14:23:58 +0000 (07:23 -0700)]
Use a popup window by default to display the diag message when using the LspDiagCurrent command

2 years agoMerge pull request #81 from D4yvid/feat/diag-in-popup
Yegappan Lakshmanan [Wed, 26 Oct 2022 13:20:42 +0000 (06:20 -0700)]
Merge pull request #81 from D4yvid/feat/diag-in-popup

Add option to show diagnostics in a popup

2 years agoUpdate autoload/lsp/options.vim
D4yvid [Wed, 26 Oct 2022 12:46:17 +0000 (09:46 -0300)]
Update autoload/lsp/options.vim

2 years agofeat: add LspServerStatus(ft) func to detect ft lsp server was running or not
shane.xb.qian [Wed, 26 Oct 2022 11:34:41 +0000 (19:34 +0800)]
feat: add LspServerStatus(ft) func to detect ft lsp server was running or not

2 years agoissue_5: adding func to get LSP server status for ft.
shane.xb.qian [Wed, 17 Nov 2021 02:57:28 +0000 (10:57 +0800)]
issue_5: adding func to get LSP server status for ft.

2 years agofix: not jump if cur one is same buf also
shane.xb.qian [Mon, 17 Jan 2022 08:09:49 +0000 (16:09 +0800)]
fix: not jump if cur one is same buf also

2 years agoignore *.swp as well (by gitignore)
shane.xb.qian [Wed, 26 Oct 2022 09:01:26 +0000 (17:01 +0800)]
ignore *.swp as well (by gitignore)

2 years agofix: check lsp sign trig exist as well
shane.xb.qian [Wed, 26 Oct 2022 06:51:01 +0000 (14:51 +0800)]
fix: check lsp sign trig exist as well

2 years agoAdd new showDiagInPopup option into lsp.txt at doc/lsp.txt
D4yvid [Wed, 26 Oct 2022 03:24:34 +0000 (00:24 -0300)]
Add new showDiagInPopup option into lsp.txt at doc/lsp.txt

2 years agoAdd option to show diagnostics in a popup
D4yvid [Tue, 25 Oct 2022 21:32:41 +0000 (18:32 -0300)]
Add option to show diagnostics in a popup

2 years agoRefresh the diag message signs when re-enabling diag highlighting
Yegappan Lakshmanan [Tue, 25 Oct 2022 02:50:09 +0000 (19:50 -0700)]
Refresh the diag message signs when re-enabling diag highlighting

2 years agoCode coverage doesn't work for Vim9 scripts. Remove it for now
Yegappan Lakshmanan [Tue, 25 Oct 2022 02:19:10 +0000 (19:19 -0700)]
Code coverage doesn't work for Vim9 scripts.  Remove it for now

2 years agoWait for diag messages from LSP server
Yegappan Lakshmanan [Tue, 25 Oct 2022 02:16:14 +0000 (19:16 -0700)]
Wait for diag messages from LSP server

2 years agoUpdate the help text with details about using the LSP diagnostics. The location...
Yegappan Lakshmanan [Tue, 25 Oct 2022 01:59:25 +0000 (18:59 -0700)]
Update the help text with details about using the LSP diagnostics.  The location list is not reused for LSP diagnostics.  Update the test to wait for the LSP diags to be available.

2 years agoMerge pull request #79 from Shane-XB-Qian/pr_check_trig_char
Yegappan Lakshmanan [Mon, 24 Oct 2022 17:07:37 +0000 (10:07 -0700)]
Merge pull request #79 from Shane-XB-Qian/pr_check_trig_char

fix: check trig char if exist first otherwise broken.

2 years agofix: change to `get()` style.
shane.xb.qian [Mon, 24 Oct 2022 17:01:30 +0000 (01:01 +0800)]
fix: change to `get()` style.

2 years agoMerge branch 'main' of github.com:yegappan/lsp
Yegappan Lakshmanan [Mon, 24 Oct 2022 15:35:37 +0000 (08:35 -0700)]
Merge branch 'main' of github.com:yegappan/lsp

2 years agoAdd test for LspOutline
Yegappan Lakshmanan [Mon, 24 Oct 2022 15:35:22 +0000 (08:35 -0700)]
Add test for LspOutline

2 years agofix: check trig char if exist first otherwise broken.
shane.xb.qian [Mon, 24 Oct 2022 06:35:35 +0000 (14:35 +0800)]
fix: check trig char if exist first otherwise broken.

2 years agoMerge pull request #78 from Shane-XB-Qian/pr_empty_user_data
Yegappan Lakshmanan [Sun, 23 Oct 2022 19:39:50 +0000 (12:39 -0700)]
Merge pull request #78 from Shane-XB-Qian/pr_empty_user_data

fix: user_data maybe empty otherwise mis-type err.

2 years agofix: user_data maybe empty otherwise mis-type err.
shane.xb.qian [Sun, 23 Oct 2022 18:03:03 +0000 (02:03 +0800)]
fix: user_data maybe empty otherwise mis-type err.

2 years agoFix indentation
Yegappan Lakshmanan [Sun, 23 Oct 2022 05:47:50 +0000 (22:47 -0700)]
Fix indentation

2 years agoMerge pull request #77 from rcasta74/lazy_doc
Yegappan Lakshmanan [Sun, 23 Oct 2022 05:25:03 +0000 (22:25 -0700)]
Merge pull request #77 from rcasta74/lazy_doc

Lazy documentation for selected completion item

2 years agoLazy documentation for selected completion item
Roberto Castagnola [Sun, 23 Oct 2022 00:48:45 +0000 (02:48 +0200)]
Lazy documentation for selected completion item

2 years agoSymbol local variable shadows the imported script name
Yegappan Lakshmanan [Sun, 23 Oct 2022 00:34:37 +0000 (17:34 -0700)]
Symbol local variable shadows the imported script name

2 years agoMerge pull request #76 from rcasta74/wait_lspserver_ready
Yegappan Lakshmanan [Sun, 23 Oct 2022 00:24:26 +0000 (17:24 -0700)]
Merge pull request #76 from rcasta74/wait_lspserver_ready

Initialize buffer with autocmd when LSP server not yet ready

2 years agoInitialize buffer with autocmd when LSP server not yet ready
Roberto Castagnola [Sat, 22 Oct 2022 15:05:40 +0000 (17:05 +0200)]
Initialize buffer with autocmd when LSP server not yet ready

2 years agoautocomplete overwrites the dot character in typescript files. Fixes issue #71
Yegappan Lakshmanan [Fri, 21 Oct 2022 16:18:51 +0000 (09:18 -0700)]
autocomplete overwrites the dot character in typescript files.  Fixes issue #71

2 years agoSupport using omni completion when auto completion is also enabled. Support LSP...
Yegappan Lakshmanan [Fri, 21 Oct 2022 16:05:52 +0000 (09:05 -0700)]
Support using omni completion when auto completion is also enabled.  Support LSP server trace message

2 years agoUpdate the steps to register LSP servers when using vim-plug to install the lsp plugin.
Yegappan Lakshmanan [Fri, 21 Oct 2022 03:16:48 +0000 (20:16 -0700)]
Update the steps to register LSP servers when using vim-plug to install the lsp plugin.

2 years agoUse sync RPC for workspace symbol search
Yegappan Lakshmanan [Tue, 18 Oct 2022 04:26:44 +0000 (21:26 -0700)]
Use sync RPC for workspace symbol search

2 years agoRevert to clangd-12 as clangd-14 is not availble in Ubuntu focal
Yegappan Lakshmanan [Sat, 15 Oct 2022 02:13:40 +0000 (19:13 -0700)]
Revert to clangd-12 as clangd-14 is not availble in Ubuntu focal

2 years agoUse sync RPC for the LspIncomingCalls and LspOutgoingCalls commands. Add a test...
Yegappan Lakshmanan [Sat, 15 Oct 2022 02:09:04 +0000 (19:09 -0700)]
Use sync RPC for the LspIncomingCalls and LspOutgoingCalls commands.  Add a test for the :LspIncomingCalls command.  Use clangd-14 for github CI

2 years agoRename lspoptions.vim to options.vim
Yegappan Lakshmanan [Wed, 12 Oct 2022 03:35:44 +0000 (20:35 -0700)]
Rename lspoptions.vim to options.vim

2 years agoUse sync RPC call for showing references
Yegappan Lakshmanan [Wed, 12 Oct 2022 02:11:48 +0000 (19:11 -0700)]
Use sync RPC call for showing references

2 years agoUse a sync RPC for shutting down a LSP server
Yegappan Lakshmanan [Mon, 10 Oct 2022 14:40:01 +0000 (07:40 -0700)]
Use a sync RPC for shutting down a LSP server

2 years agoUse sync RPC for symbol rename operation. Display an error message when a RPC reques...
Yegappan Lakshmanan [Sun, 9 Oct 2022 19:24:33 +0000 (12:24 -0700)]
Use sync RPC for symbol rename operation.  Display an error message when a RPC request fails

2 years agoUse sync RPC call for formatting a file
Yegappan Lakshmanan [Sun, 9 Oct 2022 00:53:41 +0000 (17:53 -0700)]
Use sync RPC call for formatting a file

2 years agoUse sync RPC for SwitchSourceHeader
Yegappan Lakshmanan [Sat, 8 Oct 2022 22:26:47 +0000 (15:26 -0700)]
Use sync RPC for SwitchSourceHeader

2 years agoUse sync RPC for text selection. Update the help text.
Yegappan Lakshmanan [Sat, 8 Oct 2022 15:25:31 +0000 (08:25 -0700)]
Use sync RPC for text selection. Update the help text.

2 years agoUse sync rpc to the LSP server and simplify jumping to a symbol location
Yegappan Lakshmanan [Fri, 7 Oct 2022 16:00:47 +0000 (09:00 -0700)]
Use sync rpc to the LSP server and simplify jumping to a symbol location

2 years agoUse the lsp channel mode to simplify the code
Yegappan Lakshmanan [Thu, 6 Oct 2022 03:39:16 +0000 (20:39 -0700)]
Use the lsp channel mode to simplify the code

2 years agoDon't load the plugin in older vim versions
Yegappan Lakshmanan [Sat, 1 Oct 2022 14:44:20 +0000 (07:44 -0700)]
Don't load the plugin in older vim versions

2 years agoBump up the minimum required Vim version to 9.0 and cleanup the code
Yegappan Lakshmanan [Fri, 30 Sep 2022 01:55:10 +0000 (18:55 -0700)]
Bump up the minimum required Vim version to 9.0 and cleanup the code

2 years agoMerge pull request #70 from atgote/main
Yegappan Lakshmanan [Thu, 29 Sep 2022 14:30:03 +0000 (07:30 -0700)]
Merge pull request #70 from atgote/main

Provide LSP server initializationOptions support

2 years agoProvide LSP server initializationOptions support
Andrei Tihonovschi [Thu, 29 Sep 2022 09:43:47 +0000 (12:43 +0300)]
Provide LSP server initializationOptions support

This is to add support for LSP server initializationOptions.
For me it was important to allow transmission of the licenseKey to the
intelephense PHP language server, however it is a standard field and
other servers configurations may require these too.

Some of configurations are (or may be) expected to be determined by the
editor ('LSP client') however this should require individual per-server
'wrappers' or something similar.

* Add 'initializationOptions' as LSP server configuration option.
* Check if 'initializationOptions' are not empty and if so transmit
  these to the LSP server
* Updated README.md
* Updated plugin documentation

2 years agoUpdate the LSP server configuration help
Yegappan Lakshmanan [Tue, 27 Sep 2022 14:19:25 +0000 (07:19 -0700)]
Update the LSP server configuration help

2 years agoUpdate the LSP server configuration help
Yegappan Lakshmanan [Tue, 27 Sep 2022 14:17:45 +0000 (07:17 -0700)]
Update the LSP server configuration help

2 years agoUpdate LSP server configuration help
Yegappan Lakshmanan [Tue, 27 Sep 2022 14:16:06 +0000 (07:16 -0700)]
Update LSP server configuration help

2 years agoMerge pull request #68 from Shane-XB-Qian/pr_doc_syncinit
Yegappan Lakshmanan [Tue, 27 Sep 2022 14:03:41 +0000 (07:03 -0700)]
Merge pull request #68 from Shane-XB-Qian/pr_doc_syncinit

doc: correct doc about 'syncInit' and refine instr

2 years agodoc: correct doc about 'syncInit' and refine instr
shane.xb.qian [Mon, 26 Sep 2022 03:15:45 +0000 (11:15 +0800)]
doc: correct doc about 'syncInit' and refine instr

2 years agoRename sync option to syncInit and update doc
Yegappan Lakshmanan [Sat, 24 Sep 2022 01:19:55 +0000 (18:19 -0700)]
Rename sync option to syncInit and update doc

2 years agoMerge pull request #67 from dezza/sync
Yegappan Lakshmanan [Fri, 23 Sep 2022 20:44:41 +0000 (13:44 -0700)]
Merge pull request #67 from dezza/sync

lspserver: sync property

2 years agolspserver: sync property
Christoffer Aasted [Fri, 16 Sep 2022 01:06:57 +0000 (03:06 +0200)]
lspserver: sync property

2 years agoUpdate the installation instructions with the correct directory name.
Yegappan Lakshmanan [Sat, 10 Sep 2022 00:40:12 +0000 (17:40 -0700)]
Update the installation instructions with the correct directory name.

2 years agoMerge pull request #63 from tenderlove/fix-readme
Yegappan Lakshmanan [Sat, 10 Sep 2022 00:37:40 +0000 (17:37 -0700)]
Merge pull request #63 from tenderlove/fix-readme

Fix installation instructions

2 years agoFix installation instructions
Aaron Patterson [Fri, 9 Sep 2022 19:54:54 +0000 (12:54 -0700)]
Fix installation instructions

The installation instructions put the lsp plugin in the wrong directory
for the `packadd` command.  This updates the readme to fix the
installation instructions.

Fixes #62

3 years agoInvoke the User autocmd only when some handlers is present
Yegappan Lakshmanan [Thu, 31 Mar 2022 16:09:48 +0000 (09:09 -0700)]
Invoke the User autocmd only when some handlers is present

3 years agoMerge pull request #58 from gpanders/autocmd-attach
Yegappan Lakshmanan [Thu, 31 Mar 2022 14:24:40 +0000 (07:24 -0700)]
Merge pull request #58 from gpanders/autocmd-attach

Fire event when LSP client is attached to a buffer

3 years agoFire event when LSP client is attached to a buffer
Gregory Anders [Wed, 30 Mar 2022 14:57:15 +0000 (08:57 -0600)]
Fire event when LSP client is attached to a buffer

This provides a hook for users to configure buffers that use LSP. For
example,

    autocmd User LspAttached {
        nnoremap <buffer> <C-]> <Cmd>LspGotoDefinition<CR>
    }

3 years agoRefresh the location list window with the latest diagnostics messages
Yegappan Lakshmanan [Thu, 31 Mar 2022 05:33:45 +0000 (22:33 -0700)]
Refresh the location list window with the latest diagnostics messages

3 years agoMerge pull request #60 from tpope/tabsize-shiftwidth
Yegappan Lakshmanan [Thu, 31 Mar 2022 04:19:38 +0000 (21:19 -0700)]
Merge pull request #60 from tpope/tabsize-shiftwidth

Use shiftwidth() as tabSize

3 years agoUse shiftwidth() as tabSize
Tim Pope [Thu, 31 Mar 2022 03:47:41 +0000 (23:47 -0400)]
Use shiftwidth() as tabSize

The tabSize field in the LSP spec is poorly named, as it's not used for
anything tab related but rather the indent size when formatting.  This
corresponds to shiftwidth() in Vim.

3 years agoMerge pull request #59 from gpanders/auto-populate-diags
Yegappan Lakshmanan [Thu, 31 Mar 2022 03:25:12 +0000 (20:25 -0700)]
Merge pull request #59 from gpanders/auto-populate-diags

Add option to automatically populate location list with diagnostics

3 years agoAdd option to automatically populate location list with diagnostics
Gregory Anders [Wed, 30 Mar 2022 16:04:21 +0000 (10:04 -0600)]
Add option to automatically populate location list with diagnostics

3 years agoMerge pull request #55 from Shane-XB-Qian/pr_req_id_is_num
Yegappan Lakshmanan [Fri, 18 Mar 2022 14:06:25 +0000 (07:06 -0700)]
Merge pull request #55 from Shane-XB-Qian/pr_req_id_is_num

shane/mdf: request.id of response to lsp server perhaps was not a number

3 years agoshane/mdf: request.id of response to lsp server perhaps was not a number
shane.xb.qian [Sun, 13 Mar 2022 02:57:33 +0000 (10:57 +0800)]
shane/mdf: request.id of response to lsp server perhaps was not a number

3 years agoMerge pull request #56 from Shane-XB-Qian/pr_ntf_only_once
Yegappan Lakshmanan [Fri, 18 Mar 2022 05:13:47 +0000 (22:13 -0700)]
Merge pull request #56 from Shane-XB-Qian/pr_ntf_only_once

shane/mdf: adding ntfOnce func and make unsupported telemetry/event ntf only ntf once

3 years agoshane/mdf: adding ntfOnce func and make unsupported telemetry/event ntf only ntf...
shane.xb.qian [Sun, 13 Mar 2022 04:10:38 +0000 (12:10 +0800)]
shane/mdf: adding ntfOnce func and make unsupported telemetry/event ntf only ntf once

3 years agoAdd dummy handlers for workspace folders and client register capability messages
Yegappan Lakshmanan [Fri, 11 Mar 2022 04:48:55 +0000 (20:48 -0800)]
Add dummy handlers for workspace folders and client register capability messages

3 years agoMerge pull request #53 from Shane-XB-Qian/pr_defdecl_null
Yegappan Lakshmanan [Fri, 11 Mar 2022 04:40:45 +0000 (20:40 -0800)]
Merge pull request #53 from Shane-XB-Qian/pr_defdecl_null

shane/mdf: to avoid if location (result) of defDecl was null

3 years agoshane/mdf: to avoid if location (result) of defDecl was null
shane.xb.qian [Fri, 11 Mar 2022 02:22:16 +0000 (10:22 +0800)]
shane/mdf: to avoid if location (result) of defDecl was null

3 years agoUpdate the switch source header support
Yegappan Lakshmanan [Tue, 8 Mar 2022 22:22:09 +0000 (14:22 -0800)]
Update the switch source header support

3 years agoMerge pull request #49 from noscript/LspSwitchSourceHeader
Yegappan Lakshmanan [Tue, 8 Mar 2022 21:58:31 +0000 (13:58 -0800)]
Merge pull request #49 from noscript/LspSwitchSourceHeader

Add support for LspSwitchSourceHeader command

3 years agoAdd support for LspSwitchSourceHeader command
Sergey Vlasov [Tue, 8 Mar 2022 21:17:35 +0000 (23:17 +0200)]
Add support for LspSwitchSourceHeader command

3 years agoWhen jumping to a symbol definition, reuse the current window if 'hidden' is set
Yegappan Lakshmanan [Tue, 8 Mar 2022 18:56:05 +0000 (10:56 -0800)]
When jumping to a symbol definition, reuse the current window if 'hidden' is set

3 years agoRename Hover function to avoid name conflicts
Yegappan Lakshmanan [Mon, 21 Feb 2022 15:56:40 +0000 (07:56 -0800)]
Rename Hover function to avoid name conflicts

3 years agoHandle a null reply from the LSP server properly
Yegappan Lakshmanan [Mon, 21 Feb 2022 15:32:27 +0000 (07:32 -0800)]
Handle a null reply from the LSP server properly

3 years agoFix typo in popup menu name
Yegappan Lakshmanan [Sun, 20 Feb 2022 15:55:08 +0000 (07:55 -0800)]
Fix typo in popup menu name

3 years agoDirectly use the function name as funcref instead of using function() call
Yegappan Lakshmanan [Sun, 20 Feb 2022 06:58:55 +0000 (22:58 -0800)]
Directly use the function name as funcref instead of using function() call

3 years agoRemove the s: prefix for script local functions
Yegappan Lakshmanan [Sat, 19 Feb 2022 21:24:50 +0000 (13:24 -0800)]
Remove the s: prefix for script local functions

3 years agoMove the autoload files into the lsp subdirectory
Yegappan Lakshmanan [Fri, 18 Feb 2022 02:06:38 +0000 (18:06 -0800)]
Move the autoload files into the lsp subdirectory

3 years agoAdd support for the LspServerRestart command to restart the LSP server
Yegappan Lakshmanan [Fri, 18 Feb 2022 01:54:35 +0000 (17:54 -0800)]
Add support for the LspServerRestart command to restart the LSP server

3 years agoRemove s: prefix in a few more places
Yegappan Lakshmanan [Wed, 16 Feb 2022 04:22:07 +0000 (20:22 -0800)]
Remove s: prefix in a few more places