Update from main plugin

README.md

@@ -1,21 +1,43 @@
-Typescript Syntax for Vim
+An old Typescript Syntax for Vim
 =========================
 
+---
+
+NOTE: This Typescript syntax was created before Typescript's 1.0 release, more than a decade ago. I hope it 
+has been helpful but there are now other options available. Vim has included 
+[Typescript syntax](https://github.com/vim/vim/blob/master/runtime/syntax/typescript.vim) for some years,
+which receives more frequent updates at its own [repository](https://github.com/HerringtonDarkholme/yats.vim).
+Neovim can also use a [treesitter grammar](https://github.com/tree-sitter/tree-sitter-typescript) for highlighting.
+
+---
+
 Syntax file and other settings for [TypeScript](http://typescriptlang.org). The
-syntax file is taken from this [blog
-post](http://blogs.msdn.com/b/interoperability/archive/2012/10/01/sublime-text-vi-emacs-typescript-enabled.aspx).
+syntax file was originally from this 2012 [blog
+post](https://docs.microsoft.com/en-us/archive/blogs/interoperability/sublime-text-vi-emacs-typescript-enabled).
 
 Checkout [Tsuquyomi](https://github.com/Quramy/tsuquyomi) for omni-completion
 and other features for TypeScript editing.
 
 Install
 -------
 
-The simplest way to install is via a Vim add-in manager such as
+From Vim 8 onward, the plugin can be installed as simply as (Unix/Mac):
+```
+git clone https://github.com/leafgarland/typescript-vim.git ~/.vim/pack/typescript/start/typescript-vim
+```
+
+On Windows/Powershell, use the following:
+```
+git clone https://github.com/leafgarland/typescript-vim.git $home/vimfiles/pack/typescript/start/typescript-vim
+```
+
+For older versions of Vim, the simplest way to install is via a Vim add-in manager such as
 [Plug](https://github.com/junegunn/vim-plug),
 [Vundle](https://github.com/gmarik/vundle) or
 [Pathogen](https://github.com/tpope/vim-pathogen/).
 
+_See the [Installation Wiki](https://github.com/leafgarland/typescript-vim/wiki/Installation)_
+
 ### Pathogen
 
 ```
@@ -89,6 +111,10 @@ let g:typescript_compiler_binary = 'tsc'
 let g:typescript_compiler_options = ''
 ```
 
+These options will be passed to the binary as command arguments. For example,
+if `g:typescript_compiler_binary = 'tsc'` and `g:typescript_compiler_options = '--lib es6'`,
+`l:makeprg` will be: `tsc --lib es6 $* %`.
+
 You can completely override this plugin's compiler settings with something like
 this in your `.vimrc`, where you can set makeprg to whatever you want.
 
@@ -107,4 +133,14 @@ autocmd QuickFixCmdPost [^l]* nested cwindow
 autocmd QuickFixCmdPost l* nested lwindow
 ```
 
+Syntax highlighting
+-------------------
+
+Syntax highlighting for TypeScript can be customized by following variables.
+
+- `g:typescript_ignore_typescriptdoc`: When this variable is defined, doccomments will not be
+ highlighted.
+- `g:typescript_ignore_browserwords`: When this variable is set to `1`, browser API names such as
+ `window` or `document` will not be highlighted. (default to `0`)
+
 ![Obligatory screenshot](https://raw.github.com/leafgarland/typescript-vim/master/vimshot01.png)

compiler/typescript.vim

@@ -15,6 +15,16 @@ if exists(":CompilerSet") != 2
  command! -nargs=* CompilerSet setlocal <args>
 endif
 
-let &l:makeprg = g:typescript_compiler_binary . ' ' . g:typescript_compiler_options . ' $* %'
+let s:cpo_save = &cpo
+set cpo-=C
+
+execute 'CompilerSet makeprg='
+ \ . escape(g:typescript_compiler_binary, ' ')
+ \ . '\ '
+ \ . escape(g:typescript_compiler_options, ' ')
+ \ . '\ $*\ %'
 
 CompilerSet errorformat=%+A\ %#%f\ %#(%l\\\,%c):\ %m,%C%m
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

compiler/typescriptreact.vim

@@ -0,0 +1 @@
+runtime! compiler/typescript.vim

ftplugin/typescript.vim

@@ -13,9 +13,9 @@ setlocal commentstring=//\ %s
 " " and insert the comment leader when hitting <CR> or using "o".
 setlocal formatoptions-=t formatoptions+=croql
 
-setlocal suffixesadd+=.ts
+setlocal suffixesadd+=.ts,.tsx
 
-let b:undo_ftplugin = "setl fo< ofu< com< cms<"
+let b:undo_ftplugin = "setl cms< fo< sua<"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save

ftplugin/typescriptreact.vim

@@ -0,0 +1 @@
+runtime! ftplugin/typescript.vim

indent/typescript.vim

@@ -169,7 +169,7 @@ endfunction
 function s:PrevCodeLine(lnum)
  let l:n = prevnonblank(a:lnum)
  while l:n
- if getline(l:n) =~ '^\s*\/[/*]'
+ if getline(l:n) =~ '^\s*\/[/*]'
  if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') &&
  \ s:syn_at(l:n,1) =~? s:syng_str
  return l:n
@@ -293,8 +293,9 @@ function GetTypescriptIndent()
  let l:line = ''
  endif
 
- " the containing paren, bracket, or curly. Many hacks for performance
- let idx = index([']',')','}'],l:line[0])
+ " the containing paren, bracket, curly, or closing '>'.
+ " Many hacks for performance
+ let idx = index([']',')','}','>'],l:line[0])
  if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
  \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
  call call('cursor',b:js_cache[1:])

indent/typescriptreact.vim

@@ -0,0 +1 @@
+runtime! indent/typescript.vim