Skip to content

Commit b77c5f1

Browse files
committed
Update
1 parent 2c5af8f commit b77c5f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1870
-1202
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
177177
- [rust](https://github.com/rust-lang/rust.vim) (Rust syntax highlighting for rs and rs.in files)
178178
- [scala](https://github.com/derekwyatt/vim-scala) (Scala syntax highlighting for scala, kojo and sc files)
179179
- [scss](https://github.com/cakebaker/scss-syntax.vim) (SCSS syntax highlighting for scss files)
180-
- [sh](https://github.com/arzg/vim-sh) (Shell syntax highlighting for sh, bash, bats, cgi, command and 7 more files)
180+
- [sh](https://github.com/arzg/vim-sh) (Shell syntax highlighting for sh, bash, bats, cgi, command and 8 more files)
181181
- [slim](https://github.com/slim-template/vim-slim) (Slim syntax highlighting for slim files)
182182
- [slime](https://github.com/slime-lang/vim-slime-syntax) (Syntax highlighting for slime files)
183183
- [smt2](https://github.com/bohlender/vim-smt2) (SMT syntax highlighting for smt2 and smt files)
@@ -206,7 +206,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
206206
- [velocity](https://github.com/lepture/vim-velocity) (Syntax highlighting for vm files)
207207
- [vue](https://github.com/posva/vim-vue) (Vue syntax highlighting for vue and wpy files)
208208
- [xdc](https://github.com/amal-khailtash/vim-xdc-syntax) (Syntax highlighting for xdc files)
209-
- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axml and 95 more files)
209+
- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axaml and 96 more files)
210210
- [xsl](https://github.com/vim-scripts/XSLT-syntax) (XSLT syntax highlighting for xslt and xsl files)
211211
- [yard](https://github.com/noprompt/vim-yardoc)
212212
- [zephir](https://github.com/xwsoul/vim-zephir) (Zephir syntax highlighting for zep files)

after/syntax/javascript/graphql.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if graphql#has_syntax_group('jsTemplateExpression')
4646
exec 'syntax match graphqlTaggedTemplate +' . s:tags . '\ze`+ nextgroup=graphqlTemplateString'
4747
syntax region graphqlTemplateExpression start=+${+ end=+}+ contained contains=jsTemplateExpression containedin=graphqlFold keepend
4848

49-
syntax region graphqlTemplateString matchgroup=jsTemplateString start=+`#\s\{,4\}gql\>\s*$+ skip=+\\\\\|\\`+ end=+`+ contains=@GraphQLSyntax,jsTemplateExpression,jsSpecial extend
49+
syntax region graphqlTemplateString matchgroup=jsTemplateString start=+`#\s\{,4\}\(gql\|graphql\)\>\s*$+ skip=+\\\\\|\\`+ end=+`+ contains=@GraphQLSyntax,jsTemplateExpression,jsSpecial extend
5050

5151
hi def link graphqlTemplateString jsTemplateString
5252
hi def link graphqlTaggedTemplate jsTaggedTemplate
@@ -60,7 +60,7 @@ elseif graphql#has_syntax_group('javaScriptStringT')
6060
exec 'syntax match graphqlTaggedTemplate +' . s:tags . '\ze`+ nextgroup=graphqlTemplateString'
6161
syntax region graphqlTemplateExpression start=+${+ end=+}+ contained contains=@javaScriptEmbededExpr containedin=graphqlFold keepend
6262

63-
syntax region graphqlTemplateString matchgroup=javaScriptStringT start=+`#\s\{,4\}gql\>\s*$+ skip=+\\\\\|\\`+ end=+`+ contains=@GraphQLSyntax,javaScriptSpecial,javaScriptEmbed,@htmlPreproc extend
63+
syntax region graphqlTemplateString matchgroup=javaScriptStringT start=+`#\s\{,4\}\(gql\|graphql\)\>\s*$+ skip=+\\\\\|\\`+ end=+`+ contains=@GraphQLSyntax,javaScriptSpecial,javaScriptEmbed,@htmlPreproc extend
6464

6565
hi def link graphqlTemplateString javaScriptStringT
6666
hi def link graphqlTaggedTemplate javaScriptEmbed

after/syntax/typescript/graphql.vim

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,15 @@ exec 'syntax match graphqlTaggedTemplate +' . s:tags . '\ze`+ nextgroup=graphqlT
4646
" Support expression interpolation ((${...})) inside template strings.
4747
syntax region graphqlTemplateExpression start=+${+ end=+}+ contained contains=typescriptTemplateSubstitution containedin=graphqlFold keepend
4848

49+
" support #graphql , #gql comment strings
50+
syntax region graphqlTemplateString
51+
\ start=+`\(#\s\{,4\}\(gql\|graphql\)\)\@=+
52+
\ skip=+\\\\\|\\`+
53+
\ end=+`+me=s-1
54+
\ containedin=typescriptTemplate
55+
\ contained
56+
\ contains=@GraphQLSyntax,typescriptTemplateSubstitution extend
57+
4958
hi def link graphqlTemplateString typescriptTemplate
5059
hi def link graphqlTemplateExpression typescriptTemplateSubstitution
5160

after/syntax/zsh.vim

Lines changed: 161 additions & 114 deletions
Large diffs are not rendered by default.

autoload/clojurecomplete.vim

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

autoload/csv.vim

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -780,8 +780,7 @@ fu! csv#CalculateColumnWidth(row, silent) "{{{3
780780
" row for the row for which to calculate the width
781781
let b:col_width=[]
782782
if has( 'vartabs' ) && b:delimiter == "\t"
783-
let vts_save=&vts
784-
set vts=
783+
setlocal vts=
785784
endif
786785
try
787786
if exists("b:csv_headerline")
@@ -801,9 +800,6 @@ fu! csv#CalculateColumnWidth(row, silent) "{{{3
801800
" delete buffer content in variable b:csv_list,
802801
" this was only necessary for calculating the max width
803802
unlet! b:csv_list s:columnize_count s:decimal_column
804-
if has( 'vartabs' ) && b:delimiter == "\t"
805-
let &vts=vts_save
806-
endif
807803
endfu
808804
fu! csv#Columnize(field) "{{{3
809805
" Internal function, not called from external,

autoload/dart.vim

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,18 +90,6 @@ function! s:FindDartFmt() abort
9090
return []
9191
endfunction
9292

93-
function! dart#analyzer(q_args) abort
94-
call s:error('DartAnalyzer support has been removed. '.
95-
\'If this broke your workflow please comment on '.
96-
\'https://github.com/dart-lang/dart-vim-plugin/issues/89')
97-
endfunction
98-
99-
function! dart#tojs(q_args) abort
100-
call s:error('Dart2JS support has been removed. '.
101-
\'If this broke your workflow please comment on '.
102-
\'https://github.com/dart-lang/dart-vim-plugin/issues/89')
103-
endfunction
104-
10593
" Finds the path to `uri`.
10694
"
10795
" If the file is a package: uri, looks for a .packages file to resolve the path.

autoload/freebasic.vim

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
if polyglot#init#is_disabled(expand('<sfile>:p'), 'freebasic', 'autoload/freebasic.vim')
2+
finish
3+
endif
4+
5+
" Vim filetype plugin file
6+
" Language: FreeBASIC
7+
" Maintainer: Doug Kearns <[email protected]>
8+
" Last Change: 2021 Mar 16
9+
10+
" Dialects can be one of fb, qb, fblite, or deprecated
11+
" Precedence is forcelang > #lang > lang
12+
function! freebasic#GetDialect() abort
13+
if exists("g:freebasic_forcelang")
14+
return g:freebasic_forcelang
15+
endif
16+
17+
if exists("g:freebasic_lang")
18+
let dialect = g:freebasic_lang
19+
else
20+
let dialect = "fb"
21+
endif
22+
23+
" override with #lang directive or metacommand
24+
25+
let skip = "has('syntax_items') && synIDattr(synID(line('.'), col('.'), 1), 'name') =~ 'Comment$'"
26+
let pat = '\c^\s*\%(#\s*lang\s\+\|''\s*$lang\s*:\s*\)"\([^"]*\)"'
27+
28+
let save_cursor = getcurpos()
29+
call cursor(1, 1)
30+
let lnum = search(pat, 'n', '', '', skip)
31+
call setpos('.', save_cursor)
32+
33+
if lnum
34+
let word = matchlist(getline(lnum), pat)[1]
35+
if word =~? '\%(fb\|deprecated\|fblite\|qb\)'
36+
let dialect = word
37+
else
38+
echomsg "freebasic#GetDialect: Invalid lang, found '" .. word .. "' at line " .. lnum .. " " .. getline(lnum)
39+
endif
40+
endif
41+
42+
return dialect
43+
endfunction
44+
45+
" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:

autoload/fsharp.vim

Lines changed: 13 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,7 @@ function! fsharp#loadConfig()
238238
endif
239239

240240
if !exists('g:fsharp#fsautocomplete_command')
241-
let s:fsac = fnamemodify(s:script_root_dir . "fsac/fsautocomplete.dll", ":p")
242-
let g:fsharp#fsautocomplete_command =
243-
\ ['dotnet', s:fsac,
244-
\ '--background-service-enabled'
245-
\ ]
241+
let g:fsharp#fsautocomplete_command = ['fsautocomplete', '--background-service-enabled']
246242
endif
247243
if !exists('g:fsharp#use_recommended_server_config')
248244
let g:fsharp#use_recommended_server_config = 1
@@ -283,6 +279,7 @@ function! fsharp#loadConfig()
283279

284280
" backend configuration
285281
if g:fsharp#backend == 'languageclient-neovim'
282+
let $DOTNET_ROLL_FORWARD='LatestMajor'
286283
if !exists('g:LanguageClient_serverCommands')
287284
let g:LanguageClient_serverCommands = {}
288285
endif
@@ -478,8 +475,17 @@ function! fsharp#OnCursorMove()
478475
endfunction
479476

480477
function! fsharp#showF1Help()
481-
let result = s:f1Help(expand('%:p'), line('.') - 1, col('.') - 1)
482-
echo result
478+
function! s:callback_showF1Help(result)
479+
let result = a:result
480+
if exists('result.result.content')
481+
let content = json_decode(result.result.content)
482+
if exists('content.Data')
483+
let url = 'https://docs.microsoft.com/en-us/dotnet/api/' . substitute(content.Data, '#ctor', '-ctor', 'g')
484+
echo url
485+
endif
486+
endif
487+
endfunction
488+
call s:f1Help(expand('%:p'), line('.') - 1, col('.') - 1, function("s:callback_showF1Help"))
483489
endfunction
484490

485491
function! s:hover()
@@ -505,39 +511,6 @@ function! fsharp#showTooltip()
505511
endfunction
506512

507513

508-
" FSAC update utils
509-
510-
function! s:update_win()
511-
echom "[FSAC] Downloading FSAC. This may take a while..."
512-
let script = s:script_root_dir . "install.ps1"
513-
call system('powershell -ExecutionPolicy Unrestricted ' . script . " update")
514-
endfunction
515-
516-
function! s:update_unix()
517-
echom "[FSAC] Downloading FSAC. This may take a while..."
518-
let zip = s:script_root_dir . "fsac.zip"
519-
call system(
520-
\ 'curl -fLo ' . zip . ' --create-dirs ' .
521-
\ '"https://github.com/fsharp/FsAutoComplete/releases/latest/download/fsautocomplete.netcore.zip"'
522-
\ )
523-
if v:shell_error == 0
524-
call system('unzip -o -d ' . s:script_root_dir . "/fsac " . zip)
525-
call system('find ' . s:script_root_dir . '/fsac' . ' -type f -exec chmod 777 \{\} \;')
526-
echom "[FSAC] Updated FsAutoComplete"
527-
else
528-
echom "[FSAC] Failed to update FsAutoComplete"
529-
endif
530-
endfunction
531-
532-
function! fsharp#updateFSAC(...)
533-
if has('win32') && !has('win32unix')
534-
call s:update_win()
535-
else
536-
call s:update_unix()
537-
endif
538-
endfunction
539-
540-
541514
" FSI integration
542515

543516
let s:fsi_buffer = -1

0 commit comments

Comments
 (0)