Skip to content

Update handler.lua to handle more file and folder symbols #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
goidel675 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update handler.lua to handle more file and folder symbols #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 36 additions & 28 deletions lua/unity/handler.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
local utils = require("unity.utils")
local config = require("unity.config")

local function xml_escape_attr(value)
if not value then return "" end
value = value:gsub("&", "&")
value = value:gsub("<", "&lt;")
value = value:gsub(">", "&gt;")
value = value:gsub('"', "&quot;")
value = value:gsub("'", "&apos;")
return value
end

local XmlCsprojHandler = {}
XmlCsprojHandler.__index = XmlCsprojHandler

Expand Down Expand Up @@ -90,33 +100,30 @@ function XmlCsprojHandler:checkProjectCapability(attribute)
return false
end

-- Função para adicionar uma nova Compile tag
function XmlCsprojHandler:addCompileTag(value)
-- Protege o valor para uso em pattern
local escapedValue = value:gsub("([%.%+%-%*%?%^%$%(%)%[%]%%])", "%%%1")
local existingPattern = "<Compile%s+Include%s*=%s*[\"']" .. escapedValue .. "[\"']%s*/?>"

-- Evita duplicação
if self.content:match(existingPattern) then
return false, "[NvimUnity] Script already added in Unity project"
end

-- Se placeholder existe, insere nele
local placeholderPattern = "<!%-%- {{COMPILE_INCLUDES}} %-%->"
if self.content:match(placeholderPattern) then
local newLine = ' <Compile Include="' .. value .. '" />\n <!-- {{COMPILE_INCLUDES}} -->'
self.content = self.content:gsub(placeholderPattern, newLine, 1)
return true, "[NvimUnity] Script added to Unity project"
end

-- Se não existe placeholder, adiciona bloco novo com placeholder e tag
local newItemGroup = " <ItemGroup>\n"
.. "<!-- Auto-generated block: do not modify manually or remove these commented lines -->\n"
.. "<!-- {{COMPILE_INCLUDES}} -->\n"
.. ' <Compile Include="'
.. value
.. '" />\n'
.. " </ItemGroup>"
local encoded = xml_escape_attr(value)

local patternValue = encoded:gsub("([%.%+%-%*%?%^%$%(%)%[%]%%])", "%%%1")
local existingPattern = "<Compile%s+Include%s*=%s*[\"']" .. patternValue .. "[\"']%s*/?>"

if self.content:match(existingPattern) then
return false, "[NvimUnity] Script already added in Unity project"
end

local placeholderPattern = "<!%-%- {{COMPILE_INCLUDES}} %-%->"
if self.content:match(placeholderPattern) then
local newLine = ' <Compile Include="' .. encoded .. '" />\n <!-- {{COMPILE_INCLUDES}} -->'
self.content = self.content:gsub(placeholderPattern, newLine, 1)
return true, "[NvimUnity] Script added to Unity project"
end

local newItemGroup = " <ItemGroup>\n"
.. "<!-- Auto-generated block: do not modify manually or remove these commented lines -->\n"
.. "<!-- {{COMPILE_INCLUDES}} -->\n"
.. ' <Compile Include="'
.. encoded
.. '" />\n'
.. " </ItemGroup>"

-- Extrai a tag <Project>
local openTag, innerContent, closeTag = self.content:match("(<Project.-\n)(.-)(</Project>)")
Expand Down Expand Up @@ -273,8 +280,9 @@ function XmlCsprojHandler:resetCompileTags()
-- Criar novo bloco <Compile />
local newCompileTags = {}
for _, file in ipairs(files) do
local cutFile = utils.cutPath(utils.uriToPath(file), "Assets")
table.insert(newCompileTags, ' <Compile Include="' .. cutFile .. '" />')
local cutFile = utils.cutPath(utils.uriToPath(file), "Assets")
local encoded = xml_escape_attr(cutFile)
table.insert(newCompileTags, ' <Compile Include="' .. encoded .. '" />')
end
local newBlock = table.concat(newCompileTags, "\n")
-- Procurar placeholder
Expand Down