m-vim_plugins/vim-polyglot
1
0
Fork 0
mirror of https://github.com/sheerun/vim-polyglot.git synced 2025-11-14 14:33:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove empty blocks

Browse Source
This commit is contained in:
Adam Stankiewicz
2020-09-06 19:23:23 +02:00
parent e9b3bcd5e1
commit 3169f80169
2 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ftdetect/polyglot.vim
View File

@@ -515,9 +515,6 @@ if !has_key(s:disabled_packages, 'coffee-script')
au BufNewFile,BufRead *.litcoffee setf litcoffee
endif
if !has_key(s:disabled_packages, 'cjsx')
endif
if !has_key(s:disabled_packages, 'cryptol')
au BufNewFile,BufRead *.cry setf cryptol
au BufNewFile,BufRead *.cyl setf cryptol
@@ -812,9 +809,6 @@ if !has_key(s:disabled_packages, 'ion')
au BufNewFile,BufRead ~/.config/ion/initrc setf ion
endif
if !has_key(s:disabled_packages, 'javascript-sql')
endif
if !has_key(s:disabled_packages, 'javascript')
au BufNewFile,BufRead *._js setf javascript
au BufNewFile,BufRead *.bones setf javascript
@@ -1204,12 +1198,6 @@ if !has_key(s:disabled_packages, 'python')
au BufNewFile,BufRead wscript setf python
endif
if !has_key(s:disabled_packages, 'python-indent')
endif
if !has_key(s:disabled_packages, 'python-compiler')
endif
if !has_key(s:disabled_packages, 'requirements')
au BufNewFile,BufRead *.pip setf requirements
au BufNewFile,BufRead *require.{txt,in} setf requirements
@@ -1352,9 +1340,6 @@ if !has_key(s:disabled_packages, 'rspec')
au BufNewFile,BufRead *_spec.rb if !did_filetype() | set ft=ruby syntax=rspec | endif
endif
if !has_key(s:disabled_packages, 'yard')
endif
if !has_key(s:disabled_packages, 'brewfile')
au BufNewFile,BufRead Brewfile setf brewfile
endif
@@ -1420,9 +1405,6 @@ if !has_key(s:disabled_packages, 'sh')
au BufNewFile,BufRead {.,}zshrc setf zsh
endif
if !has_key(s:disabled_packages, 'zinit')
endif
if !has_key(s:disabled_packages, 'slim')
au BufNewFile,BufRead *.slim setf slim
endif
@@ -1453,9 +1435,6 @@ if !has_key(s:disabled_packages, 'svg')
au BufNewFile,BufRead *.svg setf svg
endif
if !has_key(s:disabled_packages, 'svg-indent')
endif
if !has_key(s:disabled_packages, 'swift')
au BufNewFile,BufRead *.swift setf swift
endif
@@ -1677,9 +1656,6 @@ if !has_key(s:disabled_packages, 'xsl')
au BufNewFile,BufRead *.xslt setf xsl
endif
if !has_key(s:disabled_packages, 'yaml-extras')
endif
if !has_key(s:disabled_packages, 'ansible')
au BufNewFile,BufRead group_vars/* setf yaml.ansible
au BufNewFile,BufRead handlers.*.y{a,}ml setf yaml.ansible

21
scripts/build
View File

@@ -416,14 +416,11 @@ def generate_ftdetect(packages, heuristics)
end
for package in packages
name = package.fetch("name")
output << "if !has_key(s:disabled_packages, '#{name}')\n"
filetypes = package["filetypes"] or raise "Unknown filetype for: #{package["name"]}"
package_heuristics = []
autocommands = ""
for filetype in filetypes
name = filetype.fetch("name")
syntax = filetype["syntax"] ? " | set syntax=#{filetype["syntax"]}" : ""
@@ -454,8 +451,8 @@ def generate_ftdetect(packages, heuristics)
for extension in extensions.sort
outer_filetype = filetype["outer_filetype"]
if outer_filetype
output << " au BufNewFile *.*.#{extension} execute \"do BufNewFile filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}\n"
output << " au BufReadPre *.*.#{extension} execute \"do BufRead filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}\n"
autocommands << " au BufNewFile *.*.#{extension} execute \"do BufNewFile filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}\n"
autocommands << " au BufReadPre *.*.#{extension} execute \"do BufRead filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}\n"
end
heuristic = heuristics.find { |h| h["extensions"].include?(extension) }
@@ -466,7 +463,7 @@ def generate_ftdetect(packages, heuristics)
# puts "Ambiguous extension without heuristic: #{extension} => #{filetype["name"]}"
# end
#
output << " au BufNewFile,BufRead *.#{extension} #{set_command}\n"
autocommands << " au BufNewFile,BufRead *.#{extension} #{set_command}\n"
end
end
@@ -474,16 +471,20 @@ def generate_ftdetect(packages, heuristics)
if filename[0] == "."
filename = "{.,}" + filename[1..]
end
output << " au BufNewFile,BufRead #{filename} #{set_command}\n"
autocommands << " au BufNewFile,BufRead #{filename} #{set_command}\n"
end
end
for heuristic in package_heuristics.uniq
extensions = heuristic["extensions"].map { |e| "*.#{e}" }
output << " au! BufNewFile,BufRead #{extensions.join(",")} call polyglot#Detect#{camelize(heuristic["extensions"].first)}Filetype()\n"
autocommands << " au! BufNewFile,BufRead #{extensions.join(",")} call polyglot#Detect#{camelize(heuristic["extensions"].first)}Filetype()\n"
end
output << "endif\n\n"
if autocommands != ""
output << "if !has_key(s:disabled_packages, '#{package["name"]}')\n"
output << autocommands
output << "endif\n\n"
end
end
ftdetect = File.read('ftdetect/polyglot.vim')