aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattn <mattn.jp@gmail.com>2019-12-26 07:39:24 +0900
committerGitHub <noreply@github.com>2019-12-26 07:39:24 +0900
commit6db923abe70770b189d735e5f0d9b48e2980e686 (patch)
tree617814b8dca11e23dc31f541de394c2ac0a1b57e
parentfb25add36d26303f7082384a4312f9f26a7edaaa (diff)
parent93d2c9e02a8e633c89314315c45a75d0abf6a3e6 (diff)
downloadvim-lsp-settings-6db923abe70770b189d735e5f0d9b48e2980e686.tar.gz
vim-lsp-settings-6db923abe70770b189d735e5f0d9b48e2980e686.tar.bz2
vim-lsp-settings-6db923abe70770b189d735e5f0d9b48e2980e686.zip
Merge pull request #24 from prabirshrestha/fix-typescriptreact
use typescriptreact as filetype for .tsx files
-rw-r--r--settings/javascript-typescript-langserver.vim2
-rw-r--r--settings/typescript-language-server.vim2
2 files changed, 2 insertions, 2 deletions
diff --git a/settings/javascript-typescript-langserver.vim b/settings/javascript-typescript-langserver.vim
index d277b89..72afeb0 100644
--- a/settings/javascript-typescript-langserver.vim
+++ b/settings/javascript-typescript-langserver.vim
@@ -5,7 +5,7 @@ augroup vimlsp_settings_javascript_typescript_langserver
\ 'cmd': {server_info->lsp_settings#get('javascript-typescript-langserver', 'cmd', [lsp_settings#exec_path('javascript-typescript-langserver')])},
\ 'root_uri':{server_info->lsp_settings#get('javascript-typescript-langserver', 'root_uri', lsp_settings#root_uri(['.git/']))},
\ 'initialization_options': lsp_settings#get('javascript-typescript-langserver', 'initialization_options', {"diagnostics": "true"}),
- \ 'whitelist': lsp_settings#get('javascript-typescript-langserver', 'whitelist', ['javascript']),
+ \ 'whitelist': lsp_settings#get('javascript-typescript-langserver', 'whitelist', ['javascript', 'javascriptreact']),
\ 'blacklist': lsp_settings#get('javascript-typescript-langserver', 'blacklist', []),
\ 'config': lsp_settings#get('javascript-typescript-langserver', 'config', {}),
\ 'workspace_config': lsp_settings#get('javascript-typescript-langserver', 'workspace_config', {}),
diff --git a/settings/typescript-language-server.vim b/settings/typescript-language-server.vim
index 1147976..9a5506d 100644
--- a/settings/typescript-language-server.vim
+++ b/settings/typescript-language-server.vim
@@ -5,7 +5,7 @@ augroup vimlsp_settings_typescript_language_server
\ 'cmd': {server_info->lsp_settings#get('typescript-language-server', 'cmd', [lsp_settings#exec_path('typescript-language-server'), '--stdio'])},
\ 'root_uri':{server_info->lsp_settings#get('typescript-language-server', 'root_uri', lsp_settings#root_uri(['.git/', 'package.json']))},
\ 'initialization_options': lsp_settings#get('typescript-language-server', 'initialization_options', {"diagnostics": "true"}),
- \ 'whitelist': lsp_settings#get('typescript-language-server', 'whitelist', ['typescript', 'typescript.tsx']),
+ \ 'whitelist': lsp_settings#get('typescript-language-server', 'whitelist', ['typescript', 'typescriptreact']),
\ 'blacklist': lsp_settings#get('typescript-language-server', 'blacklist', []),
\ 'config': lsp_settings#get('typescript-language-server', 'config', {}),
\ 'workspace_config': lsp_settings#get('typescript-language-server', 'workspace_config', {}),