cleanup

Author: sumneko

Diff for: script/config/config.lua

@@ -152,7 +152,7 @@ local Template = {
                                                 "?/init.lua",
                                             },
     ['Lua.runtime.special']                 = Type.Hash(Type.String, Type.String),
-    ['Lua.runtime.meta']                    = Type.String >> '${version} ${language}',
+    ['Lua.runtime.meta']                    = Type.String >> '${version} ${language} ${encoding}',
     ['Lua.runtime.unicodeName']             = Type.Boolean,
     ['Lua.runtime.nonstandardSymbol']       = Type.Hash(Type.String, Type.Boolean, ';'),
     ['Lua.runtime.plugin']                  = Type.String,

Diff for: script/encoding/init.lua

@@ -0,0 +1,24 @@
+local platform = require 'bee.platform'
+local unicode
+
+if platform.OS == 'Windows' then
+    unicode = require 'bee.unicode'
+end
+
+local m = {}
+
+function m.ansi2utf8(text)
+    if not unicode then
+        return text
+    end
+    return unicode.a2u(text)
+end
+
+function m.utf82ansi(text)
+    if not unicode then
+        return text
+    end
+    return unicode.u2a(text)
+end
+
+return m

Diff for: script/files.lua

@@ -10,12 +10,7 @@ local util     = require 'utility'
 local guide    = require 'parser.guide'
 local smerger  = require 'string-merger'
 local progress = require "progress"
-
-local unicode
-
-if platform.OS == 'Windows' then
-    unicode  = require 'bee.unicode'
-end
+local encoding = require 'encoding'
 
 ---@class files
 local m = {}
@@ -144,9 +139,9 @@ function m.setText(uri, text, isTrust, instance)
     if file.trusted and not isTrust then
         return
     end
-    if not isTrust and unicode then
+    if not isTrust then
         if config.get 'Lua.runtime.fileEncoding' == 'ansi' then
-            text = unicode.a2u(text)
+            text = encoding.ansi2utf8(text)
         end
     end
     if file.originText == text then

Diff for: script/library.lua

@@ -200,11 +200,13 @@ local function initBuiltIn()
     if not m.inited then
         return
     end
-    local langID  = lang.id
-    local version = config.get 'Lua.runtime.version'
+    local langID   = lang.id
+    local version  = config.get 'Lua.runtime.version'
+    local encoding = config.get 'Lua.runtime.fileEncoding'
     local metaPath = fs.path(METAPATH) / config.get 'Lua.runtime.meta':gsub('%$%{(.-)%}', {
         version  = version,
         language = langID,
+        encoding = encoding,
     })
 
     local metaLang = loadMetaLocale('en-US')