Cleanup

Author: devSparkle

src/luau-lsp-plugin.luau

@@ -12,37 +12,48 @@ local function IsLibrary(Uri: Uri): boolean
 	return true
 end
 
+local function NormalizePath(Path: string)
+	return string.gsub(Path, "[/\\]", "/")
+end
+
+local function GetParentDirectory(Path: string)
+	return string.gsub(Path, "[/\\][^/\\]-$", "")
+end
+
+local function GetRelativePath(Path: string, RelativeTo: string)
+	Path = NormalizePath(Path)
+	RelativeTo = NormalizePath(RelativeTo)
+	
+	if string.find(Path, "^/?%a:") then
+		Path = string.sub(Path, 2)
+	end
+	
+	for _, Directory in ipairs(string.split(RelativeTo, "/")) do
+		if string.find(Path, `{Directory}/`, 1, true) == 1 then
+			Path = string.sub(Path, #Directory + 2)
+		else
+			Path = `../{Path}`
+		end
+	end
+	
+	Path = `./{Path}`
+	Path = string.gsub(Path, "%./%.%.", "..")
+	
+	return Path
+end
+
 local function GetLibraries(RelativeTo: string, _Libraries, _Uri: Uri?)
 	local Libraries = (_Libraries or {})
 	local Uri = (_Uri or lsp.workspace.getRootUri())
 
-	RelativeTo = string.gsub(RelativeTo, "[/\\]", "/")
+	RelativeTo = NormalizePath(RelativeTo)
 
 	for _, Entry in lsp.fs.listDirectory(Uri) do
 		local Name = string.sub(Entry:toString(), #Uri:toString() + 2)
 		local Library = string.match(Name, "(.*)%.meta%.json$")
 
 		if Library and IsLibrary(Entry) then
-			local FixedPath = Entry.path
-			
-			FixedPath = string.gsub(FixedPath, "[/\\]", "/")
-			
-			if string.find(FixedPath, "^/?%a:") then
-				FixedPath = string.sub(FixedPath, 2)
-			end
-			
-			for _, Directory in ipairs(string.split(RelativeTo, "/")) do
-				if string.find(FixedPath, `{Directory}/`, 1, true) == 1 then
-					FixedPath = string.sub(FixedPath, #Directory + 2)
-				else
-					FixedPath = `../{FixedPath}`
-				end
-			end
-			
-			FixedPath = `./{FixedPath}`
-			FixedPath = string.gsub(FixedPath, "%./%.%.", "..")
-			
-			Libraries[Library] = (string.sub(FixedPath, 1, -#Name - 1) .. Library)
+			Libraries[Library] = (string.sub(GetRelativePath(Entry.path, RelativeTo), 1, -#Name - 1) .. Library)
 		else
 			pcall(GetLibraries, RelativeTo, Libraries, Entry)
 		end
@@ -56,7 +67,7 @@ return {
 		local Changes = {}
 		local Line, LineStart = 1, 1
 
-		local Libraries = GetLibraries((string.gsub(Context.filePath, "[/\\][^/\\]-$", "")))
+		local Libraries = GetLibraries(GetParentDirectory(Context.filePath))
 
 		for Index = 1, #Source do
 			if string.sub(Source, Index, Index) == "\n" then