diff --git a/.gitignore b/.gitignore index 3d8f0fa5..4423a015 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ .DS_Store /build **/.DS_Store -.*.swd* +.*.sw* diff --git a/1.vim b/1.vim index 687d4625..3fab9b60 100644 --- a/1.vim +++ b/1.vim @@ -12,10 +12,8 @@ inoremap coc#pum#visible() ? coc#pum#next(0) : coc#inline inoremap coc#pum#visible() ? coc#pum#prev(1) : coc#inline#visible() ? coc#inline#prev() : "\" inoremap coc#pum#visible() ? coc#pum#next(1) : coc#inline#visible() ? coc#inline#next() : "\" nnoremap  :NERDTreeFind -snoremap  c nnoremap  :NERDTree nmap  (ctrlp) -snoremap  "_c nnoremap  :NERDTreeToggle xmap \T (table-mode-tableize-delimiter) xmap \tt (table-mode-tableize) @@ -28,10 +26,6 @@ nnoremap \1 :call SN("1") nmap \rn (coc-rename) xmap gx NetrwBrowseXVis nmap gx NetrwBrowseX -snoremap c -snoremap c -snoremap c -snoremap "_c nnoremap GitGutterPreviewHunk :call gitgutter#utility#warn('Please change your map GitGutterPreviewHunk to (GitGutterPreviewHunk)') nnoremap (GitGutterPreviewHunk) :GitGutterPreviewHunk nnoremap GitGutterUndoHunk :call gitgutter#utility#warn('Please change your map GitGutterUndoHunk to (GitGutterUndoHunk)') @@ -138,8 +132,6 @@ set shiftwidth=4 set smarttab set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc set updatetime=500 -set winminheight=0 -set winminwidth=0 let s:so_save = &g:so | let s:siso_save = &g:siso | setg so=0 siso=0 | setl so=-1 siso=-1 let v:this_session=expand(":p") silent only @@ -153,26 +145,15 @@ if &shortmess =~ 'A' else set shortmess=aoO endif -badd +185 src/View/Modals/taskSettingsModal.tsx -badd +68 src/View/chatPage.css -badd +22 src/base.css -badd +1 build/index.css -badd +262 build/styles.css -badd +1 src/ViewModel/Global/coreViewModel.ts -badd +54 src/View/Modals/searchModal.tsx -badd +45 src/ViewModel/Utility/searchViewModel.ts -badd +11 src/View/translations.ts -badd +17 src/View/chatPage.tsx -badd +163 src/View/ChatPages/boardPage.tsx -badd +329 src/ViewModel/Pages/boardViewModel.ts -badd +1 src/colors.css +badd +15 src/ViewModel/Pages/messagePageViewModel.ts +badd +0 src/ViewModel/Chat/chatMessageViewModel.ts +badd +0 src/Model/Chat/chatModel.ts argglobal %argdel set stal=2 tabnew +setlocal\ bufhidden=wipe -tabnew +setlocal\ bufhidden=wipe tabrewind -edit src/ViewModel/Utility/searchViewModel.ts +edit src/ViewModel/Pages/messagePageViewModel.ts let s:save_splitbelow = &splitbelow let s:save_splitright = &splitright set splitbelow splitright @@ -192,13 +173,13 @@ set winminheight=0 set winheight=1 set winminwidth=0 set winwidth=1 -exe 'vert 1resize ' . ((&columns * 31 + 106) / 213) -exe 'vert 2resize ' . ((&columns * 90 + 106) / 213) -exe 'vert 3resize ' . ((&columns * 90 + 106) / 213) +exe 'vert 1resize ' . ((&columns * 31 + 111) / 223) +exe 'vert 2resize ' . ((&columns * 95 + 111) / 223) +exe 'vert 3resize ' . ((&columns * 95 + 111) / 223) argglobal enew -file NERD_tree_tab_2 -balt src/ViewModel/Utility/searchViewModel.ts +file NERD_tree_tab_1 +balt src/ViewModel/Pages/messagePageViewModel.ts let s:cpo_save=&cpo set cpo&vim nnoremap :call nerdtree#ui_glue#invokeKeyMap("") @@ -378,7 +359,7 @@ setlocal nowrap setlocal wrapmargin=0 wincmd w argglobal -balt src/View/Modals/searchModal.tsx +balt src/ViewModel/Pages/messagePageViewModel.ts let s:cpo_save=&cpo set cpo&vim nmap [c (GitGutterPrevHunk) @@ -526,16 +507,16 @@ setlocal wrap setlocal wrapmargin=0 silent! normal! zE let &fdl = &fdl -let s:l = 8 - ((7 * winheight(0) + 17) / 34) +let s:l = 17 - ((16 * winheight(0) + 17) / 34) if s:l < 1 | let s:l = 1 | endif keepjumps exe s:l normal! zt -keepjumps 8 -normal! 0 +keepjumps 17 +normal! $ wincmd w argglobal -if bufexists(fnamemodify("src/View/Modals/searchModal.tsx", ":p")) | buffer src/View/Modals/searchModal.tsx | else | edit src/View/Modals/searchModal.tsx | endif -balt src/View/chatPage.css +if bufexists(fnamemodify("src/ViewModel/Chat/chatMessageViewModel.ts", ":p")) | buffer src/ViewModel/Chat/chatMessageViewModel.ts | else | edit src/ViewModel/Chat/chatMessageViewModel.ts | endif +balt src/ViewModel/Pages/messagePageViewModel.ts let s:cpo_save=&cpo set cpo&vim nmap [c (GitGutterPrevHunk) @@ -585,8 +566,8 @@ setlocal nodiff setlocal equalprg= setlocal errorformat=%+A\ %#%f\ %#(%l\\,%c):\ %m,%C%m setlocal noexpandtab -if &filetype != 'typescriptreact' -setlocal filetype=typescriptreact +if &filetype != 'typescript' +setlocal filetype=typescript endif setlocal fillchars= setlocal fixendofline @@ -609,8 +590,8 @@ setlocal iminsert=0 setlocal imsearch=-1 setlocal include= setlocal includeexpr= -setlocal indentexpr=GetTsxIndent() -setlocal indentkeys=0{,0},0),0],0,,!^F,o,O,e,*,<>>,<<>,/ +setlocal indentexpr=GetTypescriptIndent() +setlocal indentkeys=0{,0},0),0],:,0#,!^F,o,O,e,0],0) setlocal noinfercase setlocal iskeyword=@,48-57,_,192-255,$ setlocal keywordprg= @@ -658,8 +639,8 @@ setlocal statusline= setlocal suffixesadd=.ts,.tsx setlocal swapfile setlocal synmaxcol=3000 -if &syntax != 'typescriptreact' -setlocal syntax=typescriptreact +if &syntax != 'typescript' +setlocal syntax=typescript endif setlocal tabstop=8 setlocal tagcase= @@ -683,24 +664,27 @@ setlocal wrap setlocal wrapmargin=0 silent! normal! zE let &fdl = &fdl -let s:l = 33 - ((26 * winheight(0) + 17) / 34) +let s:l = 145 - ((15 * winheight(0) + 17) / 34) if s:l < 1 | let s:l = 1 | endif keepjumps exe s:l normal! zt -keepjumps 33 -normal! 051| +keepjumps 145 +normal! 0 wincmd w -exe 'vert 1resize ' . ((&columns * 31 + 106) / 213) -exe 'vert 2resize ' . ((&columns * 90 + 106) / 213) -exe 'vert 3resize ' . ((&columns * 90 + 106) / 213) +exe 'vert 1resize ' . ((&columns * 31 + 111) / 223) +exe 'vert 2resize ' . ((&columns * 95 + 111) / 223) +exe 'vert 3resize ' . ((&columns * 95 + 111) / 223) tabnext -edit src/View/translations.ts +edit src/Model/Chat/chatModel.ts let s:save_splitbelow = &splitbelow let s:save_splitright = &splitright set splitbelow splitright wincmd _ | wincmd | vsplit -1wincmd h +wincmd _ | wincmd | +vsplit +2wincmd h +wincmd w wincmd w let &splitbelow = s:save_splitbelow let &splitright = s:save_splitright @@ -711,169 +695,35 @@ set winminheight=0 set winheight=1 set winminwidth=0 set winwidth=1 -exe 'vert 1resize ' . ((&columns * 106 + 106) / 213) -exe 'vert 2resize ' . ((&columns * 106 + 106) / 213) +exe 'vert 1resize ' . ((&columns * 31 + 111) / 223) +exe 'vert 2resize ' . ((&columns * 95 + 111) / 223) +exe 'vert 3resize ' . ((&columns * 95 + 111) / 223) argglobal -balt src/ViewModel/Utility/searchViewModel.ts -let s:cpo_save=&cpo -set cpo&vim -nmap [c (GitGutterPrevHunk) -nmap \hp (GitGutterPreviewHunk) -nmap \hu (GitGutterUndoHunk) -nmap \hs (GitGutterStageHunk) -xmap \hs (GitGutterStageHunk) -nmap ]c (GitGutterNextHunk) -xmap ac (GitGutterTextObjectOuterVisual) -omap ac (GitGutterTextObjectOuterPending) -xmap ic (GitGutterTextObjectInnerVisual) -omap ic (GitGutterTextObjectInnerPending) -let &cpo=s:cpo_save -unlet s:cpo_save -setlocal keymap= -setlocal noarabic -setlocal autoindent -setlocal backupcopy= -setlocal balloonexpr= -setlocal nobinary -setlocal nobreakindent -setlocal breakindentopt= -setlocal bufhidden= -setlocal buflisted -setlocal buftype= -setlocal nocindent -setlocal cinkeys=0{,0},0),0],:,0#,!^F,o,O,e -setlocal cinoptions= -setlocal cinscopedecls=public,protected,private -setlocal cinwords=if,else,while,do,for,switch -setlocal colorcolumn= -setlocal comments=s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:- -setlocal commentstring=//\ %s -setlocal complete=.,w,b,u,t,i -setlocal concealcursor= -setlocal conceallevel=0 -setlocal completefunc= -setlocal nocopyindent -setlocal cryptmethod= -setlocal nocursorbind -setlocal nocursorcolumn -setlocal nocursorline -setlocal cursorlineopt=both -setlocal define= -setlocal dictionary= -setlocal nodiff -setlocal equalprg= -setlocal errorformat=%+A\ %#%f\ %#(%l\\,%c):\ %m,%C%m -setlocal noexpandtab -if &filetype != 'typescript' -setlocal filetype=typescript -endif -setlocal fillchars= -setlocal fixendofline -setlocal foldcolumn=0 -setlocal foldenable -setlocal foldexpr=0 -setlocal foldignore=# -setlocal foldlevel=0 -setlocal foldmarker={{{,}}} -setlocal foldmethod=manual -setlocal foldminlines=1 -setlocal foldnestmax=20 -setlocal foldtext=foldtext() -setlocal formatexpr= -setlocal formatoptions=croql -setlocal formatlistpat=^\\s*\\d\\+[\\]:.)}\\t\ ]\\s* -setlocal formatprg= -setlocal grepprg= -setlocal iminsert=0 -setlocal imsearch=-1 -setlocal include= -setlocal includeexpr= -setlocal indentexpr=GetTypescriptIndent() -setlocal indentkeys=0{,0},0),0],:,0#,!^F,o,O,e,0],0) -setlocal noinfercase -setlocal iskeyword=@,48-57,_,192-255,$ -setlocal keywordprg= -setlocal nolinebreak -setlocal nolisp -setlocal lispoptions= -setlocal lispwords= -setlocal nolist -setlocal listchars= -setlocal makeencoding= -setlocal makeprg=tsc\ \ $*\ % -setlocal matchpairs=(:),{:},[:] -setlocal nomodeline -setlocal modifiable -setlocal nrformats=bin,octal,hex -set number -setlocal number -setlocal numberwidth=4 -setlocal omnifunc= -setlocal path= -setlocal nopreserveindent -setlocal nopreviewwindow -setlocal quoteescape=\\ -setlocal noreadonly -setlocal norelativenumber -setlocal norightleft -setlocal rightleftcmd=search -setlocal noscrollbind -setlocal scrolloff=-1 -setlocal shiftwidth=4 -setlocal noshortname -setlocal showbreak= -setlocal sidescrolloff=-1 -set signcolumn=yes -setlocal signcolumn=yes -setlocal nosmartindent -setlocal nosmoothscroll -setlocal softtabstop=0 -setlocal nospell -setlocal spellcapcheck=[.?!]\\_[\\])'\"\ \ ]\\+ -setlocal spellfile= -setlocal spelllang=en -setlocal spelloptions= -setlocal statusline= -setlocal suffixesadd=.ts,.tsx -setlocal swapfile -setlocal synmaxcol=3000 -if &syntax != 'typescript' -setlocal syntax=typescript -endif -setlocal tabstop=8 -setlocal tagcase= -setlocal tagfunc= -setlocal tags= -setlocal termwinkey= -setlocal termwinscroll=10000 -setlocal termwinsize= -setlocal textwidth=0 -setlocal thesaurus= -setlocal thesaurusfunc= -setlocal noundofile -setlocal undolevels=-123456 -setlocal varsofttabstop= -setlocal vartabstop= -setlocal virtualedit= -setlocal wincolor= -setlocal nowinfixheight -setlocal nowinfixwidth -setlocal wrap -setlocal wrapmargin=0 -silent! normal! zE -let &fdl = &fdl -let s:l = 7 - ((6 * winheight(0) + 17) / 34) -if s:l < 1 | let s:l = 1 | endif -keepjumps exe s:l -normal! zt -keepjumps 7 -normal! $ -wincmd w -argglobal -if bufexists(fnamemodify("build/styles.css", ":p")) | buffer build/styles.css | else | edit build/styles.css | endif -balt src/View/translations.ts +enew +file NERD_tree_tab_2 +balt src/Model/Chat/chatModel.ts let s:cpo_save=&cpo set cpo&vim +nnoremap :call nerdtree#ui_glue#invokeKeyMap("") +nnoremap  :call nerdtree#ui_glue#invokeKeyMap("") +nnoremap  :call nerdtree#ui_glue#invokeKeyMap("") +nnoremap ? :call nerdtree#ui_glue#invokeKeyMap("?") +nnoremap A :call nerdtree#ui_glue#invokeKeyMap("A") +nnoremap B :call nerdtree#ui_glue#invokeKeyMap("B") +nnoremap C :call nerdtree#ui_glue#invokeKeyMap("C") +nnoremap CD :call nerdtree#ui_glue#invokeKeyMap("CD") +nnoremap D :call nerdtree#ui_glue#invokeKeyMap("D") +nnoremap FL :call nerdtree#ui_glue#invokeKeyMap("FL") +nnoremap F :call nerdtree#ui_glue#invokeKeyMap("F") +nnoremap I :call nerdtree#ui_glue#invokeKeyMap("I") +nnoremap J :call nerdtree#ui_glue#invokeKeyMap("J") +nnoremap K :call nerdtree#ui_glue#invokeKeyMap("K") +nnoremap O :call nerdtree#ui_glue#invokeKeyMap("O") +nnoremap P :call nerdtree#ui_glue#invokeKeyMap("P") +nnoremap R :call nerdtree#ui_glue#invokeKeyMap("R") +nnoremap T :call nerdtree#ui_glue#invokeKeyMap("T") +nnoremap U :call nerdtree#ui_glue#invokeKeyMap("U") +nnoremap X :call nerdtree#ui_glue#invokeKeyMap("X") nmap [c (GitGutterPrevHunk) nmap \hp (GitGutterPreviewHunk) nmap \hu (GitGutterUndoHunk) @@ -882,8 +732,30 @@ xmap \hs (GitGutterStageHunk) nmap ]c (GitGutterNextHunk) xmap ac (GitGutterTextObjectOuterVisual) omap ac (GitGutterTextObjectOuterPending) +nnoremap cd :call nerdtree#ui_glue#invokeKeyMap("cd") +nnoremap e :call nerdtree#ui_glue#invokeKeyMap("e") +nnoremap f :call nerdtree#ui_glue#invokeKeyMap("f") +nnoremap go :call nerdtree#ui_glue#invokeKeyMap("go") +nnoremap gb :call nerdtree#ui_glue#invokeKeyMap("gb") +nnoremap gi :call nerdtree#ui_glue#invokeKeyMap("gi") +nnoremap gs :call nerdtree#ui_glue#invokeKeyMap("gs") +nnoremap i :call nerdtree#ui_glue#invokeKeyMap("i") xmap ic (GitGutterTextObjectInnerVisual) omap ic (GitGutterTextObjectInnerPending) +nnoremap m :call nerdtree#ui_glue#invokeKeyMap("m") +nnoremap o :call nerdtree#ui_glue#invokeKeyMap("o") +nnoremap p :call nerdtree#ui_glue#invokeKeyMap("p") +nnoremap q :call nerdtree#ui_glue#invokeKeyMap("q") +nnoremap r :call nerdtree#ui_glue#invokeKeyMap("r") +nnoremap s :call nerdtree#ui_glue#invokeKeyMap("s") +nnoremap t :call nerdtree#ui_glue#invokeKeyMap("t") +nnoremap u :call nerdtree#ui_glue#invokeKeyMap("u") +nnoremap x :call nerdtree#ui_glue#invokeKeyMap("x") +nnoremap :call nerdtree#ui_glue#invokeKeyMap("") +nnoremap <2-LeftMouse> :call nerdtree#ui_glue#invokeKeyMap("<2-LeftMouse>") +nnoremap :call nerdtree#ui_glue#invokeKeyMap("") +nnoremap :call nerdtree#ui_glue#invokeKeyMap("") +nnoremap :call nerdtree#ui_glue#invokeKeyMap("") let &cpo=s:cpo_save unlet s:cpo_save setlocal keymap= @@ -894,26 +766,26 @@ setlocal balloonexpr= setlocal nobinary setlocal nobreakindent setlocal breakindentopt= -setlocal bufhidden= -setlocal buflisted -setlocal buftype= +setlocal bufhidden=hide +setlocal nobuflisted +setlocal buftype=nofile setlocal nocindent setlocal cinkeys=0{,0},0),0],:,0#,!^F,o,O,e setlocal cinoptions= setlocal cinscopedecls=public,protected,private setlocal cinwords=if,else,while,do,for,switch setlocal colorcolumn= -setlocal comments=s1:/*,mb:*,ex:*/ +setlocal comments=s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:- setlocal commentstring=/*%s*/ setlocal complete=.,w,b,u,t,i -setlocal concealcursor= -setlocal conceallevel=0 +setlocal concealcursor=nvic +setlocal conceallevel=2 setlocal completefunc= setlocal nocopyindent setlocal cryptmethod= setlocal nocursorbind setlocal nocursorcolumn -setlocal nocursorline +setlocal cursorline setlocal cursorlineopt=both setlocal define= setlocal dictionary= @@ -921,13 +793,13 @@ setlocal nodiff setlocal equalprg= setlocal errorformat= setlocal noexpandtab -if &filetype != 'css' -setlocal filetype=css +if &filetype != 'nerdtree' +setlocal filetype=nerdtree endif setlocal fillchars= setlocal fixendofline setlocal foldcolumn=0 -setlocal foldenable +setlocal nofoldenable setlocal foldexpr=0 setlocal foldignore=# setlocal foldlevel=0 @@ -937,18 +809,18 @@ setlocal foldminlines=1 setlocal foldnestmax=20 setlocal foldtext=foldtext() setlocal formatexpr= -setlocal formatoptions=croql +setlocal formatoptions=tcq setlocal formatlistpat=^\\s*\\d\\+[\\]:.)}\\t\ ]\\s* setlocal formatprg= setlocal grepprg= setlocal iminsert=0 setlocal imsearch=-1 -setlocal include=^\\s*@import\\s\\+\\%(url(\\)\\= +setlocal include= setlocal includeexpr= -setlocal indentexpr=GetCSSIndent() -setlocal indentkeys=0{,0},!^F,o,O +setlocal indentexpr= +setlocal indentkeys=0{,0},0),0],:,0#,!^F,o,O,e setlocal noinfercase -setlocal iskeyword=@,48-57,_,192-255,- +setlocal iskeyword=@,48-57,_,192-255 setlocal keywordprg= setlocal nolinebreak setlocal nolisp @@ -960,17 +832,17 @@ setlocal makeencoding= setlocal makeprg= setlocal matchpairs=(:),{:},[:] setlocal nomodeline -setlocal modifiable +setlocal nomodifiable setlocal nrformats=bin,octal,hex set number -setlocal number +setlocal nonumber setlocal numberwidth=4 -setlocal omnifunc=csscomplete#CompleteCSS +setlocal omnifunc= setlocal path= setlocal nopreserveindent setlocal nopreviewwindow setlocal quoteescape=\\ -setlocal noreadonly +setlocal readonly setlocal norelativenumber setlocal norightleft setlocal rightleftcmd=search @@ -990,12 +862,12 @@ setlocal spellcapcheck=[.?!]\\_[\\])'\"\ \ ]\\+ setlocal spellfile= setlocal spelllang=en setlocal spelloptions= -setlocal statusline= +setlocal statusline=%{exists('b:NERDTree')?b:NERDTree.root.path.str():''} setlocal suffixesadd= -setlocal swapfile +setlocal noswapfile setlocal synmaxcol=3000 -if &syntax != 'css' -setlocal syntax=css +if &syntax != 'nerdtree' +setlocal syntax=nerdtree endif setlocal tabstop=8 setlocal tagcase= @@ -1014,42 +886,12 @@ setlocal vartabstop= setlocal virtualedit= setlocal wincolor= setlocal nowinfixheight -setlocal nowinfixwidth -setlocal wrap +setlocal winfixwidth +setlocal nowrap setlocal wrapmargin=0 -silent! normal! zE -let &fdl = &fdl -let s:l = 645 - ((12 * winheight(0) + 17) / 34) -if s:l < 1 | let s:l = 1 | endif -keepjumps exe s:l -normal! zt -keepjumps 645 -normal! $ wincmd w -exe 'vert 1resize ' . ((&columns * 106 + 106) / 213) -exe 'vert 2resize ' . ((&columns * 106 + 106) / 213) -tabnext -edit src/ViewModel/Global/coreViewModel.ts -let s:save_splitbelow = &splitbelow -let s:save_splitright = &splitright -set splitbelow splitright -wincmd _ | wincmd | -vsplit -1wincmd h -wincmd w -let &splitbelow = s:save_splitbelow -let &splitright = s:save_splitright -wincmd t -let s:save_winminheight = &winminheight -let s:save_winminwidth = &winminwidth -set winminheight=0 -set winheight=1 -set winminwidth=0 -set winwidth=1 -exe 'vert 1resize ' . ((&columns * 106 + 106) / 213) -exe 'vert 2resize ' . ((&columns * 106 + 106) / 213) argglobal -balt src/View/Modals/taskSettingsModal.tsx +balt src/ViewModel/Chat/chatMessageViewModel.ts let s:cpo_save=&cpo set cpo&vim nmap [c (GitGutterPrevHunk) @@ -1197,16 +1039,16 @@ setlocal wrap setlocal wrapmargin=0 silent! normal! zE let &fdl = &fdl -let s:l = 101 - ((31 * winheight(0) + 17) / 34) +let s:l = 496 - ((18 * winheight(0) + 16) / 33) if s:l < 1 | let s:l = 1 | endif keepjumps exe s:l normal! zt -keepjumps 101 -normal! 0 +keepjumps 496 +normal! 036| wincmd w argglobal -if bufexists(fnamemodify("src/colors.css", ":p")) | buffer src/colors.css | else | edit src/colors.css | endif -balt src/ViewModel/Pages/boardViewModel.ts +if bufexists(fnamemodify("src/Model/Chat/chatModel.ts", ":p")) | buffer src/Model/Chat/chatModel.ts | else | edit src/Model/Chat/chatModel.ts | endif +balt src/ViewModel/Chat/chatMessageViewModel.ts let s:cpo_save=&cpo set cpo&vim nmap [c (GitGutterPrevHunk) @@ -1223,7 +1065,7 @@ let &cpo=s:cpo_save unlet s:cpo_save setlocal keymap= setlocal noarabic -setlocal noautoindent +setlocal autoindent setlocal backupcopy= setlocal balloonexpr= setlocal nobinary @@ -1238,8 +1080,8 @@ setlocal cinoptions= setlocal cinscopedecls=public,protected,private setlocal cinwords=if,else,while,do,for,switch setlocal colorcolumn= -setlocal comments=s1:/*,mb:*,ex:*/ -setlocal commentstring=/*%s*/ +setlocal comments=s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:- +setlocal commentstring=//\ %s setlocal complete=.,w,b,u,t,i setlocal concealcursor= setlocal conceallevel=0 @@ -1254,10 +1096,10 @@ setlocal define= setlocal dictionary= setlocal nodiff setlocal equalprg= -setlocal errorformat= +setlocal errorformat=%+A\ %#%f\ %#(%l\\,%c):\ %m,%C%m setlocal noexpandtab -if &filetype != 'css' -setlocal filetype=css +if &filetype != 'typescript' +setlocal filetype=typescript endif setlocal fillchars= setlocal fixendofline @@ -1278,12 +1120,12 @@ setlocal formatprg= setlocal grepprg= setlocal iminsert=0 setlocal imsearch=-1 -setlocal include=^\\s*@import\\s\\+\\%(url(\\)\\= +setlocal include= setlocal includeexpr= -setlocal indentexpr=GetCSSIndent() -setlocal indentkeys=0{,0},!^F,o,O +setlocal indentexpr=GetTypescriptIndent() +setlocal indentkeys=0{,0},0),0],:,0#,!^F,o,O,e,0],0) setlocal noinfercase -setlocal iskeyword=@,48-57,_,192-255,- +setlocal iskeyword=@,48-57,_,192-255,$ setlocal keywordprg= setlocal nolinebreak setlocal nolisp @@ -1292,7 +1134,7 @@ setlocal lispwords= setlocal nolist setlocal listchars= setlocal makeencoding= -setlocal makeprg= +setlocal makeprg=tsc\ \ $*\ % setlocal matchpairs=(:),{:},[:] setlocal nomodeline setlocal modifiable @@ -1300,7 +1142,7 @@ setlocal nrformats=bin,octal,hex set number setlocal number setlocal numberwidth=4 -setlocal omnifunc=csscomplete#CompleteCSS +setlocal omnifunc= setlocal path= setlocal nopreserveindent setlocal nopreviewwindow @@ -1326,11 +1168,11 @@ setlocal spellfile= setlocal spelllang=en setlocal spelloptions= setlocal statusline= -setlocal suffixesadd= +setlocal suffixesadd=.ts,.tsx setlocal swapfile setlocal synmaxcol=3000 -if &syntax != 'css' -setlocal syntax=css +if &syntax != 'typescript' +setlocal syntax=typescript endif setlocal tabstop=8 setlocal tagcase= @@ -1354,17 +1196,18 @@ setlocal wrap setlocal wrapmargin=0 silent! normal! zE let &fdl = &fdl -let s:l = 67 - ((17 * winheight(0) + 17) / 34) +let s:l = 491 - ((13 * winheight(0) + 16) / 33) if s:l < 1 | let s:l = 1 | endif keepjumps exe s:l normal! zt -keepjumps 67 -normal! 05| +keepjumps 491 +normal! $ wincmd w 2wincmd w -exe 'vert 1resize ' . ((&columns * 106 + 106) / 213) -exe 'vert 2resize ' . ((&columns * 106 + 106) / 213) -tabnext 3 +exe 'vert 1resize ' . ((&columns * 31 + 111) / 223) +exe 'vert 2resize ' . ((&columns * 95 + 111) / 223) +exe 'vert 3resize ' . ((&columns * 95 + 111) / 223) +tabnext 2 set stal=1 if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 silent exe 'bwipe ' . s:wipebuf @@ -1379,6 +1222,7 @@ if filereadable(s:sx) exe "source " . fnameescape(s:sx) endif let &g:so = s:so_save | let &g:siso = s:siso_save +nohlsearch doautoall SessionLoadPost unlet SessionLoad " vim: set ft=vim : diff --git a/src/ViewModel/Chat/.chatListViewModel.ts.swp b/src/ViewModel/Chat/.chatListViewModel.ts.swp deleted file mode 100644 index fd67c8c1..00000000 Binary files a/src/ViewModel/Chat/.chatListViewModel.ts.swp and /dev/null differ diff --git a/src/ViewModel/Global/.coreViewModel.ts.swp b/src/ViewModel/Global/.coreViewModel.ts.swp deleted file mode 100644 index 63c6c076..00000000 Binary files a/src/ViewModel/Global/.coreViewModel.ts.swp and /dev/null differ