summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
author最萌小汐 <sumneko@hotmail.com>2021-11-02 12:04:04 +0800
committer最萌小汐 <sumneko@hotmail.com>2021-11-02 12:04:04 +0800
commit310b96f3e4b285a3a8422745ab01a32ca144e91a (patch)
tree7859fd38c7719bb8b781e56eff97f56986b991d2 /script
parent0e47d4c03d30efd7fe508e3bb78f91156ed1f8e7 (diff)
downloadlua-language-server-310b96f3e4b285a3a8422745ab01a32ca144e91a.zip
resolve utf16 bom
Diffstat (limited to 'script')
-rw-r--r--script/encoder/init.lua22
-rw-r--r--script/library.lua2
2 files changed, 20 insertions, 4 deletions
diff --git a/script/encoder/init.lua b/script/encoder/init.lua
index f33f5a1d..d7753c1f 100644
--- a/script/encoder/init.lua
+++ b/script/encoder/init.lua
@@ -4,6 +4,8 @@ local utf16be = require 'encoder.utf16be'
---@alias encoder.encoding '"utf8"'|'"utf16"'|'"utf16le"'|'"utf16be"'
+---@alias encoder.bom '"no"'|'"yes"'|'"auto"'
+
local m = {}
---@param encoding encoder.encoding
@@ -63,9 +65,13 @@ end
---@param encoding encoder.encoding
---@param text string
+---@param bom encoder.bom
---@return string
-function m.encode(encoding, text)
+function m.encode(encoding, text, bom)
if encoding == 'utf8' then
+ if bom == 'yes' then
+ text = '\xEF\xBB\xBF' .. text
+ end
return text
end
if encoding == 'ansi' then
@@ -73,10 +79,20 @@ function m.encode(encoding, text)
end
if encoding == 'utf16'
or encoding == 'utf16le' then
- return utf16le.encode(text)
+ text = utf16le.encode(text)
+ if bom == 'yes'
+ or bom == 'auto' then
+ text = '\xFF\xFE' .. text
+ end
+ return text
end
if encoding == 'utf16be' then
- return utf16be.encode(text)
+ text = utf16be.encode(text)
+ if bom == 'yes'
+ or bom == 'auto' then
+ text = '\xFE\xFF' .. text
+ end
+ return text
end
log.error('Unsupport encode encoding:', encoding)
return text
diff --git a/script/library.lua b/script/library.lua
index 0911750e..943e6d2d 100644
--- a/script/library.lua
+++ b/script/library.lua
@@ -236,7 +236,7 @@ local function initBuiltIn()
local metaDoc = compileSingleMetaDoc(fsu.loadFile(libPath), metaLang, status)
if metaDoc then
local outPath = metaPath / libName
- encoder.encode(encoding, metaDoc)
+ metaDoc = encoder.encode(encoding, metaDoc, 'auto')
out:saveFile(libName, metaDoc)
m.metaPaths[#m.metaPaths+1] = outPath:string()
end