maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Code] Upgrade ctags langserver to support two more languages (#46317)

Browse source 
* [Code] Upgrade ctags langserver to support two more languages

* [Code] Enable ctags langserver

* Fix test
This commit is contained in:
Pengcheng Xu 2019-09-25 19:52:34 +08:00 committed by GitHub
parent 71ed1609f0
commit 5bb7d7f42a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
x-pack/legacy/plugins/code/common/language_server.ts
View file

@ -34,6 +34,7 @@ export const CTAGS_SUPPORT_LANGS = [
'go',
'html',
'ini',
'kotlin',
'lua',
'json',
'objective-c',
@ -47,6 +48,7 @@ export const CTAGS_SUPPORT_LANGS = [
'scheme',
'shell',
'sql',
'swift',
'tcl',
'typescript',
'java',

4
x-pack/legacy/plugins/code/server/lsp/language_servers.ts
View file

@ -69,8 +69,8 @@ export const CTAGS: LanguageServerDefinition = {
embedPath: require.resolve('@elastic/ctags-langserver/lib/cli.js'),
priority: 1,
};
export const LanguageServers: LanguageServerDefinition[] = [TYPESCRIPT, JAVA, GO];
export const LanguageServersDeveloping: LanguageServerDefinition[] = [CTAGS];
export const LanguageServers: LanguageServerDefinition[] = [TYPESCRIPT, JAVA, GO, CTAGS];
export const LanguageServersDeveloping: LanguageServerDefinition[] = [];
export function enabledLanguageServers(server: ServerFacade) {
const devMode: boolean = server.config().get('env.dev');

4
x-pack/legacy/plugins/code/server/usage_collector.test.ts
View file

@ -120,6 +120,10 @@ describe('Code Usage Collector', () => {
enabled: 0,
key: 'Go',
},
{
enabled: 1,
key: 'Ctags',
},
],
});
});

2
x-pack/package.json
View file

@ -182,7 +182,7 @@
"@babel/core": "^7.5.5",
"@babel/register": "^7.5.5",
"@babel/runtime": "^7.5.5",
"@elastic/ctags-langserver": "^0.1.9",
"@elastic/ctags-langserver": "^0.1.10",
"@elastic/datemath": "5.0.2",
"@elastic/eui": "14.2.0",
"@elastic/javascript-typescript-langserver": "^0.2.2",

8
yarn.lock
View file

@ -965,10 +965,10 @@
ts-debounce "^1.0.0"
uuid "^3.3.2"
"@elastic/ctags-langserver@^0.1.9":
version "0.1.9"
resolved "https://registry.yarnpkg.com/@elastic/ctags-langserver/-/ctags-langserver-0.1.9.tgz#d6e8ad0771db4e1d0fda297570885327c2c505ab"
integrity sha512-eIw5c2WkOTZyodTLWOShHRLEe0jA5umvqH1oTS5PtRbXsLwAIdF1MX4J+An+ScVFYUd4gZjQNVE5gKCuMRPfmg==
"@elastic/ctags-langserver@^0.1.10":
version "0.1.10"
resolved "https://registry.yarnpkg.com/@elastic/ctags-langserver/-/ctags-langserver-0.1.10.tgz#f056c541e726eab73237b8d7e6044a6e074d77bd"
integrity sha512-bGcrsuLCsLI4jfgkMd1PMh7C0LHL4M2+awVuC9+EAGGp/+bQVXnZr1tvSgO/kUqwo62M99dewvmuQD2ui29wPA==
dependencies:
"@elastic/lsp-extension" "^0.1.1"
"@elastic/node-ctags" "1.0.2"