vim-patch:8.2.4746: supercollider filetype not recognized (#18102)

Problem:    Supercollider filetype not recognized.
Solution:   Match file extentions and check file contents to detect
            supercollider. (closes vim/vim#10142)
https://github.com/vim/vim/commit/8cac20ed42b7b7fc9c6b54e3055ca1047f50b8ca

3 files changed, 37 insertions, 8 deletions

diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index 0063e9da0b..866196a7df 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -773,6 +773,28 @@ func dist#ft#SQL()
   endif
 endfunc
 
+" This function checks the first 25 lines of file extension "sc" to resolve
+" detection between scala and SuperCollider
+func dist#ft#FTsc()
+  for lnum in range(1, min([line("$"), 25]))
+    if getline(lnum) =~# '[A-Za-z0-9]*\s:\s[A-Za-z0-9]\|var\s<\|classvar\s<\|\^this.*\||\w*|\|+\s\w*\s{\|\*ar\s'
+      setf supercollider
+      return
+    endif
+  endfor
+  setf scala
+endfunc
+
+" This function checks the first line of file extension "scd" to resolve
+" detection between scdoc and SuperCollider
+func dist#ft#FTscd()
+  if getline(1) =~# '\%^\S\+(\d[0-9A-Za-z]*)\%(\s\+\"[^"]*\"\%(\s\+\"[^"]*\"\)\=\)\=$'
+    setf scdoc
+  else
+    setf supercollider
+  endif
+endfunc
+
 " If the file has an extension of 't' and is in a directory 't' or 'xt' then
 " it is almost certainly a Perl test file.
 " If the first line starts with '#' and contains 'perl' it's probably a Perl
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c5690ba716..f7c0317eff 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -202,12 +202,12 @@ au BufNewFile,BufRead *.iba,*.ibi		setf ibasic
 au BufNewFile,BufRead *.fb			setf freebasic
 
 " Batch file for MSDOS. See dist#ft#FTsys for *.sys
-au BufNewFile,BufRead *.bat 			setf dosbatch
+au BufNewFile,BufRead *.bat			setf dosbatch
 " *.cmd is close to a Batch file, but on OS/2 Rexx files also use *.cmd.
 au BufNewFile,BufRead *.cmd
 	\ if getline(1) =~ '^/\*' | setf rexx | else | setf dosbatch | endif
 " ABB RAPID or Batch file for MSDOS.
-au BufNewFile,BufRead *.sys\c 			call dist#ft#FTsys()
+au BufNewFile,BufRead *.sys\c			call dist#ft#FTsys()
 
 " Batch file for 4DOS
 au BufNewFile,BufRead *.btm			call dist#ft#FTbtm()
@@ -1140,7 +1140,7 @@ au BufNewFile,BufRead *.mms			call dist#ft#FTmms()
 au BufNewFile,BufRead *.mmp			setf mmp
 
 " ABB Rapid, Modula-2, Modsim III or LambdaProlog
-au BufNewFile,BufRead *.mod\c 			call dist#ft#FTmod()
+au BufNewFile,BufRead *.mod\c			call dist#ft#FTmod()
 
 " Modula-2  (.md removed in favor of Markdown, see dist#ft#FTmod for *.MOD)
 au BufNewFile,BufRead *.m2,*.DEF,*.mi		setf modula2
@@ -1630,16 +1630,22 @@ au BufNewFile,BufRead *.sass			setf sass
 au BufNewFile,BufRead *.sa			setf sather
 
 " Scala
-au BufNewFile,BufRead *.scala,*.sc		setf scala
+au BufNewFile,BufRead *.scala			setf scala
 
 " SBT - Scala Build Tool
 au BufNewFile,BufRead *.sbt			setf sbt
 
+" SuperCollider
+au BufNewFile,BufRead *.sc			call dist#ft#FTsc()
+
+au BufNewFile,BufRead *.quark			setf supercollider
+
+" scdoc
+au BufNewFile,BufRead *.scd			call dist#ft#FTscd()
+
 " Scilab
 au BufNewFile,BufRead *.sci,*.sce		setf scilab
 
-" scdoc
-au BufNewFile,BufRead *.scd			setf scdoc
 
 " SCSS
 au BufNewFile,BufRead *.scss			setf scss
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 880b99a2fa..603f9f854a 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -569,8 +569,6 @@ local extension = {
   sa = "sather",
   sbt = "sbt",
   scala = "scala",
-  sc = "scala",
-  scd = "scdoc",
   ss = "scheme",
   scm = "scheme",
   sld = "scheme",
@@ -644,6 +642,7 @@ local extension = {
   mata = "stata",
   ado = "stata",
   stp = "stp",
+  quark = "supercollider",
   sface = "surface",
   svelte = "svelte",
   svg = "svg",
@@ -830,6 +829,8 @@ local extension = {
   r = function() vim.fn["dist#ft#FTr"]() end,
   rdf = function() vim.fn["dist#ft#Redif"]() end,
   rules = function() vim.fn["dist#ft#FTRules"]() end,
+  sc = function() vim.fn["dist#ft#FTsc"]() end,
+  scd = function() vim.fn["dist#ft#FTscd"]() end,
   sh = function() vim.fn["dist#ft#SetFileTypeSH"](vim.fn.getline(1)) end,
   shtml = function() vim.fn["dist#ft#FThtml"]() end,
   sql = function() vim.fn["dist#ft#SQL"]() end,