From c6010628ca851ddd9a2e97a1b9b854f886bc6d65 Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Wed, 29 May 2024 15:24:43 +0200
Subject: [PATCH] Change filetype detection for .sc

The code used deprecated functions and I don't use Supercollider anyway,
so make .sc always be a scala file
---
 ftdetect/extensions.lua | 19 ++++++++++---------
 ftdetect/sc.lua         | 24 ------------------------
 2 files changed, 10 insertions(+), 33 deletions(-)
 delete mode 100644 ftdetect/sc.lua

diff --git a/ftdetect/extensions.lua b/ftdetect/extensions.lua
index 5268f3f..b37e045 100644
--- a/ftdetect/extensions.lua
+++ b/ftdetect/extensions.lua
@@ -1,18 +1,19 @@
 vim.filetype.add({
 	extension = {
-		['vtt'] = 'vtt',
-		['typ'] = 'typst',
+		["vtt"] = "vtt",
+		["typ"] = "typst",
+		["sc"] = "scala",
 	},
 	filename = {
-		['.scalafmt.conf'] = 'hocon',
-		['kitty.conf'] = 'kitty',
-		['neomuttrc'] = 'neomutt',
-		['template'] = 'sh',
-		['mbsyncrc'] = 'mbsyncrc',
+		[".scalafmt.conf"] = "hocon",
+		["kitty.conf"] = "kitty",
+		["neomuttrc"] = "neomutt",
+		["template"] = "sh",
+		["mbsyncrc"] = "mbsyncrc",
 	},
 	pattern = {
-		['${XDG_CONFIG_HOME}/kitty/*.conf'] = 'kitty',
-		['${XDG_CONFIG_HOME}/kitty/*.session'] = 'kitty-session',
+		["${XDG_CONFIG_HOME}/kitty/*.conf"] = "kitty",
+		["${XDG_CONFIG_HOME}/kitty/*.session"] = "kitty-session",
 	},
 })
 
diff --git a/ftdetect/sc.lua b/ftdetect/sc.lua
deleted file mode 100644
index 6d70f77..0000000
--- a/ftdetect/sc.lua
+++ /dev/null
@@ -1,24 +0,0 @@
--- Override detection from lua/vim/filetype/detect.lua
--- removes match on |%w+| for SuperCollider
-vim.filetype.add({
-	extension = {
-		-- This function checks the first 25 lines of file extension "sc" to resolve
-		-- detection between scala and SuperCollider
-		sc = function(path, bufnr)
-			for _, line in ipairs(vim.filetype.getlines(bufnr, 1, 25)) do
-				if
-						vim.filetype.findany(line, {
-							'var%s<',
-							'classvar%s<',
-							'%^this.*',
-							'%+%s%w*%s{',
-							'%*ar%s',
-						})
-				then
-					return 'supercollider'
-				end
-			end
-			return 'scala'
-		end
-	}
-})