Update

Author: sheerun

README.md

@@ -102,7 +102,6 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [hive](https://github.com/zebradil/hive.vim) (HiveQL syntax highlighting for q, hql and ql files)
 - [hjson](https://github.com/hjson/vim-hjson) (Syntax highlighting for hjson files)
 - [html5](https://github.com/othree/html5.vim)
-- [i3/sway](https://github.com/jamespeapen/swayconfig.vim/tree/i3sway) (Syntax highlighting for i3.config, i3config, sway.config and swayconfig files)
 - [icalendar](https://github.com/chutzpah/icalendar.vim) (Syntax highlighting for ics files)
 - [idris2](https://github.com/edwinb/idris2-vim) (Syntax highlighting for idr, ipkg and lidr files)
 - [idris](https://github.com/idris-hackers/idris-vim) (Idris syntax highlighting for idr and lidr files)
@@ -118,7 +117,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [jst](https://github.com/briancollins/vim-jst) (EJS syntax highlighting for ejs, ect and jst files)
 - [jsx](https://github.com/MaxMEllon/vim-jsx-pretty) (Syntax highlighting for jsx files)
 - [julia](https://github.com/JuliaEditorSupport/julia-vim) (Julia syntax highlighting for jl files)
-- [just](https://github.com/NoahTheDuke/vim-just) (Syntax highlighting for justfile and *.just files)
+- [just](https://github.com/NoahTheDuke/vim-just) (Syntax highlighting for just files)
 - [kotlin](https://github.com/udalov/kotlin-vim) (Kotlin syntax highlighting for kt, ktm and kts files)
 - [ledger](https://github.com/ledger/vim-ledger) (Syntax highlighting for ldg, ledger and journal files)
 - [lilypond](https://github.com/anowlcalledjosh/vim-lilypond) (LilyPond syntax highlighting for ly and ily files)
@@ -182,6 +181,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [svelte](https://github.com/leafOfTree/vim-svelte-plugin) (Svelte syntax highlighting for svelte files)
 - [svg-indent](https://github.com/jasonshell/vim-svg-indent)
 - [svg](https://github.com/vim-scripts/svg.vim) (SVG syntax highlighting for svg files)
+- [sway](https://github.com/jamespeapen/swayconfig.vim/tree/i3sway) (Syntax highlighting for i3config, i3.config, swayconfig and sway.config files)
 - [swift](https://github.com/keith/swift.vim) (Swift syntax highlighting for swift files)
 - [sxhkd](https://github.com/baskerville/vim-sxhkdrc) (Syntax highlighting for sxhkdrc files)
 - [systemd](https://github.com/wgwoods/vim-systemd-syntax) (Syntax highlighting for automount, dnssd, link, mount, netdev and 9 more files)

after/ftplugin/just.vim

@@ -0,0 +1,11 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'just', 'after/ftplugin/just.vim')
+  finish
+endif
+
+" Vim ftplugin file
+" Language:	Justfile
+" Maintainer:	Noah Bogart <[email protected]>
+" URL:		https://github.com/NoahTheDuke/vim-just.git
+" Last Change:	2021 May 19
+
+setlocal iskeyword+=-

autoload/polyglot/init.vim

@@ -177,8 +177,12 @@ if !has_key(g:polyglot_is_disabled, 'nftables')
   au BufNewFile,BufRead *.nft,*/nftables.conf setf nftables
 endif
 
+if !has_key(g:polyglot_is_disabled, 'just')
+  au BufNewFile,BufRead *.just,justfile setf just
+endif
+
 if !has_key(g:polyglot_is_disabled, 'sway')
-  au BufNewFile,BufRead *sway/config setf sway
+  au BufNewFile,BufRead *.i3.config,*.i3config,*.sway.config,*.swayconfig,*sway/config,i3.config,sway.config setf i3config
 endif
 
 if !has_key(g:polyglot_is_disabled, 'hjson')
@@ -2293,10 +2297,6 @@ if !has_key(g:polyglot_is_disabled, 'icalendar')
   au BufNewFile,BufRead *.ics setf icalendar
 endif
 
-if !has_key(g:polyglot_is_disabled, 'i3')
-  au BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config setf i3config
-endif
-
 if !has_key(g:polyglot_is_disabled, 'hive')
   au BufNewFile,BufRead *.hql,*.q,*.ql setf hive
 endif

autoload/polyglot/sleuth.vim

@@ -237,7 +237,7 @@ let s:globs = {
   \ 'htmlm4': '*.html.m4',
   \ 'httest': '*.htt,*.htb',
   \ 'hxml': '*.hxml',
-  \ 'i3config': '*.i3.config,*.i3config,i3.config,i3config,.i3.config,.i3config',
+  \ 'i3config': '*.i3config,*.i3.config,*.swayconfig,*.sway.config,i3.config,sway.config',
   \ 'ibasic': '*.iba,*.ibi',
   \ 'icalendar': '*.ics',
   \ 'icemenu': '',
@@ -271,6 +271,7 @@ let s:globs = {
   \ 'jsp': '*.jsp',
   \ 'jst': '*.ejs,*.ect,*.jst',
   \ 'julia': '*.jl',
+  \ 'just': '*.just,justfile',
   \ 'kconfig': 'Kconfig,Kconfig.debug,Kconfig.*',
   \ 'kivy': '*.kv',
   \ 'kix': '*.kix',
@@ -528,7 +529,6 @@ let s:globs = {
   \ 'svelte': '*.svelte',
   \ 'svg': '*.svg',
   \ 'svn': 'svn-commit*.tmp',
-  \ 'sway': '',
   \ 'swift': '*.swift',
   \ 'swiftgyb': '*.swift.gyb',
   \ 'sxhkdrc': '*.sxhkdrc,sxhkdrc',