Merge pull request #2147 from fesily/ffi-fix-build-path

ffi:fix build path

Author: sumneko

locale/en-us/setting.lua

@@ -440,3 +440,5 @@ command.exportDocument =
 'Lua: Export Document ...'
 command.addon_manager.open =
 'Lua: Open Addon Manager ...'
+command.reloadFFIMeta =
+'Lua: Reload luajit ffi meta'

locale/pt-br/setting.lua

@@ -440,3 +440,5 @@ command.exportDocument = -- TODO: need translate!
 'Lua: Export Document ...'
 command.addon_manager.open = -- TODO: need translate!
 'Lua: Open Addon Manager ...'
+command.reloadFFIMeta = -- TODO: need translate!
+'Lua: Reload luajit ffi meta'

locale/zh-cn/setting.lua

@@ -439,3 +439,5 @@ command.exportDocument =
 'Lua: 导出文档...'
 command.addon_manager.open =
 'Lua: 打开插件管理器...'
+command.reloadFFIMeta =
+'Lua: 重新生成luajit的FFI模块C语言元数据'

locale/zh-tw/setting.lua

@@ -439,3 +439,5 @@ command.exportDocument = -- TODO: need translate!
 'Lua: Export Document ...'
 command.addon_manager.open = -- TODO: need translate!
 'Lua: Open Addon Manager ...'
+command.reloadFFIMeta = -- TODO: need translate!
+'Lua: Reload luajit ffi meta'

script/plugins/ffi/init.lua

@@ -1,12 +1,11 @@
-local searchCode             = require 'plugins.ffi.searchCode'
-local cdefRerence            = require 'plugins.ffi.cdefRerence'
 local cdriver                = require 'plugins.ffi.c-parser.cdriver'
 local util                   = require 'plugins.ffi.c-parser.util'
 local utility                = require 'utility'
 local SDBMHash               = require 'SDBMHash'
 local config                 = require 'config'
 local fs                     = require 'bee.filesystem'
-local scope                  = require 'workspace.scope'
+local ws                     = require 'workspace'
+local furi                   = require 'file-uri'
 
 local namespace <const>      = 'ffi.namespace*.'
 
@@ -360,12 +359,15 @@ function m.build_single(codes, fileDir, uri)
     if not texts then
         return
     end
+    local fullPath = fileDir /ws.getRelativePath(uri)
 
-    local hash = ('%08x'):format(SDBMHash():hash(uri))
-    local encoding = config.get(nil, 'Lua.runtime.fileEncoding')
-    local filePath = fileDir / table.concat({ hash, encoding }, '_')
+    if fullPath:stem():string():find '%.' then
+        local newPath = fullPath:parent_path() / (fullPath:stem():string():gsub('%.', '/') .. ".lua")
+        fs.create_directories(newPath:parent_path())
+        fullPath = newPath
+    end
 
-    utility.saveFile(tostring(filePath) .. '.d.lua', table.concat(texts, '\n'))
+    utility.saveFile(tostring(fullPath), table.concat(texts, '\n'))
     return true
 end
 

test/plugins/ffi/test.lua

@@ -8,6 +8,8 @@ local template = require 'config.template'
 
 template['Lua.runtime.version'].default = 'LuaJIT'
 
+TESTURI = furi.encode('/unittest.ffi.lua')
+
 ---@async
 local function TestBuilder()
     local builder = require 'core.command.reloadFFIMeta'