From f5d59340a6e8a71fb766fbfbf796377d7d9e4c20 Mon Sep 17 00:00:00 2001 From: Sean Dewar Date: Wed, 17 Jan 2024 14:47:40 +0000 Subject: [PATCH] vim-patch:9b03d3e75b42 (#27059) Translate the Vim9 script Godot files to legacy. `` is not ported yet, so replace it with `` and ``. If it's ported, `call s:` can be used instead. Includes changes from: vim-patch:0daafaa7d99e (was partial, but is now pretty much fully ported) vim-patch:9712ff1288f9 Co-authored-by: Maxim Kim --- runtime/ftplugin/gdscript.vim | 68 +++++++++++++++ runtime/ftplugin/gdshader.vim | 13 +++ runtime/indent/gdscript.vim | 154 ++++++++++++++++++++++++++++++++++ 3 files changed, 235 insertions(+) create mode 100644 runtime/ftplugin/gdscript.vim create mode 100644 runtime/ftplugin/gdshader.vim create mode 100644 runtime/indent/gdscript.vim diff --git a/runtime/ftplugin/gdscript.vim b/runtime/ftplugin/gdscript.vim new file mode 100644 index 0000000000..692afdd0ea --- /dev/null +++ b/runtime/ftplugin/gdscript.vim @@ -0,0 +1,68 @@ +" Vim filetype plugin file +" Language: gdscript (Godot game engine scripting language) +" Maintainer: Maxim Kim +" Website: https://github.com/habamax/vim-gdscript +" +" This file has been manually translated from Vim9 script. + +if exists("b:did_ftplugin") | finish | endif + +let s:save_cpo = &cpo +set cpo&vim + +let b:did_ftplugin = 1 +let b:undo_ftplugin = 'setlocal cinkeys<' + \ .. '| setlocal indentkeys<' + \ .. '| setlocal commentstring<' + \ .. '| setlocal suffixesadd<' + \ .. '| setlocal foldexpr<' + \ .. '| setlocal foldignore<' + +setlocal cinkeys-=0# +setlocal indentkeys-=0# +setlocal suffixesadd=.gd +setlocal commentstring=#\ %s +setlocal foldignore= +setlocal foldexpr=s:GDScriptFoldLevel() + + +function s:GDScriptFoldLevel() abort + let line = getline(v:lnum) + if line =~? '^\s*$' + return "-1" + endif + + let sw = shiftwidth() + let indent = indent(v:lnum) / sw + let indent_next = indent(nextnonblank(v:lnum + 1)) / sw + + if indent_next > indent && line =~# ':\s*$' + return $">{indent_next}" + else + return $"{indent}" + endif +endfunction + + +if !exists("g:no_plugin_maps") + " Next/Previous section + function s:NextSection(back, cnt) abort + for n in range(a:cnt) + call search('^\s*func\s', a:back ? 'bW' : 'W') + endfor + endfunction + + " Nvim: hasn't been ported yet. + " nnoremap ]] NextSection(false, v:count1) + " nnoremap [[ NextSection(true, v:count1) + nnoremap ]] call NextSection(v:false, v:count1) + nnoremap [[ call NextSection(v:true, v:count1) + xmap ]] $'{v:count1}]]m>gv' + xmap [[ $'{v:count1}[[m>gv' + let b:undo_ftplugin ..= + \ " | silent exe 'unmap [['" + \ .. " | silent exe 'unmap ]]'" +endif + +let &cpo = s:save_cpo +unlet s:save_cpo diff --git a/runtime/ftplugin/gdshader.vim b/runtime/ftplugin/gdshader.vim new file mode 100644 index 0000000000..f0d34ee5a6 --- /dev/null +++ b/runtime/ftplugin/gdshader.vim @@ -0,0 +1,13 @@ +" Vim filetype plugin file +" Language: Godot shading language +" Maintainer: Maxim Kim +" Website: https://github.com/habamax/vim-gdscript +" +" This file has been manually translated from Vim9 script. + +if exists("b:did_ftplugin") | finish | endif +let b:did_ftplugin = 1 + +let b:undo_ftplugin = 'setlocal suffixesadd<' + +setlocal suffixesadd=.gdshader diff --git a/runtime/indent/gdscript.vim b/runtime/indent/gdscript.vim new file mode 100644 index 0000000000..bbb4f284f1 --- /dev/null +++ b/runtime/indent/gdscript.vim @@ -0,0 +1,154 @@ +" Vim indent file +" Language: gdscript (Godot game engine) +" Maintainer: Maxim Kim +" Based on python indent file. +" +" This file has been manually translated from Vim9 script. + +if exists("b:did_indent") + finish +endif +let b:did_indent = 1 + +let s:save_cpo = &cpo +set cpo&vim + +let s:undo_opts = "setl indentexpr< indentkeys< lisp< autoindent<" + +if exists('b:undo_indent') + let b:undo_indent ..= "|" .. s:undo_opts +else + let b:undo_indent = s:undo_opts +endif + +setlocal nolisp +setlocal autoindent +setlocal indentexpr=s:GDScriptIndent() +setlocal indentkeys+=<:>,=elif,=except + + +function s:GDScriptIndent() abort + " If this line is explicitly joined: If the previous line was also joined, + " line it up with that one, otherwise add two 'shiftwidth' + if getline(v:lnum - 1) =~# '\\$' + if v:lnum > 1 && getline(v:lnum - 2) =~# '\\$' + return indent(v:lnum - 1) + endif + return indent(v:lnum - 1) + (shiftwidth() * 2) + endif + + " If the start of the line is in a string don't change the indent. + if has('syntax_items') && synIDattr(synID(v:lnum, 1, 1), "name") =~# "String$" + return -1 + endif + + " Search backwards for the previous non-empty line. + let plnum = prevnonblank(v:lnum - 1) + + if plnum == 0 + " This is the first non-empty line, use zero indent. + return 0 + endif + + let plindent = indent(plnum) + let plnumstart = plnum + + " Get the line and remove a trailing comment. + " Use syntax highlighting attributes when possible. + let pline = getline(plnum) + let pline_len = strlen(pline) + if has('syntax_items') + " If the last character in the line is a comment, do a binary search for + " the start of the comment. synID() is slow, a linear search would take + " too long on a long line. + if synIDattr(synID(plnum, pline_len, 1), "name") =~# "\\(Comment\\|Todo\\)$" + let min = 1 + let max = pline_len + while min < max + let col = (min + max) / 2 + if synIDattr(synID(plnum, col, 1), "name") =~# "\\(Comment\\|Todo\\)$" + let max = col + else + let min = col + 1 + endif + endwhile + let pline = strpart(pline, 0, min - 1) + endif + else + let col = 0 + while col < pline_len + if pline[col] ==# '#' + let pline = strpart(pline, 0, col) + break + endif + let col = col + 1 + endwhile + endif + + + " When "inside" parenthesis: If at the first line below the parenthesis add + " one 'shiftwidth' ("inside" is simplified and not really checked) + " my_var = ( + " a + " + b + " + c + " ) + if pline =~# '[({\[]\s*$' + return indent(plnum) + shiftwidth() + endif + + + " If the previous line ended with a colon, indent this line + if pline =~# ':\s*$' + return plindent + shiftwidth() + endif + + " If the previous line was a stop-execution statement... + if getline(plnum) =~# '^\s*\(break\|continue\|raise\|return\|pass\)\>' + " See if the user has already dedented + if indent(v:lnum) > indent(plnum) - shiftwidth() + " If not, recommend one dedent + return indent(plnum) - shiftwidth() + endif + " Otherwise, trust the user + return -1 + endif + + " If the current line begins with a keyword that lines up with "try" + if getline(v:lnum) =~# '^\s*\(except\|finally\)\>' + let lnum = v:lnum - 1 + while lnum >= 1 + if getline(lnum) =~# '^\s*\(try\|except\)\>' + let ind = indent(lnum) + if ind >= indent(v:lnum) + return -1 " indent is already less than this + endif + return ind " line up with previous try or except + endif + let lnum = lnum - 1 + endwhile + return -1 " no matching "try"! + endif + + + " If the current line begins with a header keyword, dedent + if getline(v:lnum) =~# '^\s*\(elif\|else\)\>' + + " Unless the previous line was a one-liner + if getline(plnumstart) =~# '^\s*\(for\|if\|try\)\>' + return plindent + endif + + " Or the user has already dedented + if indent(v:lnum) <= plindent - shiftwidth() + return -1 + endif + + return plindent - shiftwidth() + endif + + return -1 +endfunction + +let &cpo = s:save_cpo +unlet s:save_cpo