fix: improve option parsing

Author: gamemaker1

source/prettier.lua

@@ -28,23 +28,23 @@ local prettierFileTypes = {
 -- The default configuration for prettier
 -- See https://prettier.io/docs/en/options.html
 local preferences = {
-	tabWidth = "2",
-	useTabs = "false",
-	semi = "true",
-	singleQuote = "false",
+	tabWidth = 2,
+	useTabs = false,
+	semi = true,
+	singleQuote = false,
 	quoteProps = "as-needed",
-	jsxSingleQuotes = "false",
+	jsxSingleQuotes = false,
 	trailingComma = "es5",
-	bracketSpacing = "true",
-	bracketSameLine = "false",
+	bracketSpacing = true,
+	bracketSameLine = false,
 	arrowParens = "always",
 	proseWrap = "preserve",
 	endOfLine = "lf",
 	embeddedLanguageFormatting = "auto",
-	vueIndentScriptAndStyle = "false",
+	vueIndentScriptAndStyle = false,
 	htmlWhitespaceSensitivity = "css",
-	requirePragma = "false",
-	insertPragma = "false"
+	requirePragma = false,
+	insertPragma = false
 }
 
 -- Check if a table has a certain value
@@ -58,6 +58,19 @@ local function hasValue(tab, val)
 	return false
 end
 
+-- Retrieve a setting
+function getOption(file, key, default)
+	if file.Buf.Settings["prettier" .. "." .. key] ~= nil then
+		-- If the local buffer's settings has a value set for that option, return it
+		return file.Buf.Settings["prettier" .. "." .. key]
+	elseif config.GetGlobalOption("prettier" .. "." .. key) ~= nil then
+		-- If the global settings has a value set for that option, return it
+		return config.GetGlobalOption("prettier" .. "." .. key)
+	else
+		return default
+	end
+end
+
 -- Format the given file
 function format(file)
 	-- Save the file first
@@ -70,20 +83,27 @@ function format(file)
 
 	-- If not, then use the preferences set for this plugin
 	local options = ""
-	if string.sub(pathToConfig, 1, 7) == "[error]" then
+	if error ~= nil then
+		-- Loop through the options and create a long options string to pass to the
+		-- prettier cli
 		for key, value in pairs(preferences) do
-			value = file.Buf.Settings["prettier" .. "." .. key] or config.GetGlobalOption("prettier" .. "." .. key) or value
-
+			-- Check if the user has set a different value in:
+			-- - local settings
+			-- - global settings
+			-- else use the default value
+			value = tostring(getOption(file, key, value))
+
+			-- Convert the option name to kebab case and append it to the existing
+			-- option string
 			options = options .. " --" .. key:gsub("%u", function (word)
 				return "-" .. string.lower(word)
 			end) .. "=" .. tostring(value)
 		end
 	end
 
-	-- Run prettier
-	local message, error = shell.RunCommand(
-		"prettier" .. options .. " --no-color --write " .. file.Buf.Path
-	)
+	-- Run prettier on the file
+	local command = "prettier" .. options .. " --no-color --write " .. file.Buf.Path
+	local message, error = shell.RunCommand(command)
 	-- If we encounter an error, flash a message on the bar at the bottom and dump
 	-- the message in the logs
 	if error ~= nil then
@@ -112,7 +132,7 @@ end
 -- Editor initialization hook
 function init()
 	-- Register prettier specific configuration
-	for key, value in ipairs(preferences) do
+	for key, value in pairs(preferences) do
 		config.RegisterCommonOption("prettier", key, value)
 	end
 	-- Register plugin specific options