Merge pull request #962 from CppCXY/master

编辑器设置优先
LuaLS · Feb 22, 2022 · 60a3a70 · 60a3a70
2 parents d57c21e + c920f96
commit 60a3a70
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/3rd/EmmyLuaCodeStyle b/3rd/EmmyLuaCodeStyle
diff --git a/script/core/formatting.lua b/script/core/formatting.lua
@@ -1,11 +1,11 @@
 local codeFormat = require("code_format")
-local files = require("files")
-local log = require("log")
+local files      = require("files")
+local log        = require("log")
 
-return function(uri)
+return function(uri, options)
     local text = files.getText(uri)
     local ast = files.getState(uri)
-    local status, formattedText = codeFormat.format(uri, text)
+    local status, formattedText = codeFormat.format(uri, text, options)
 
     if not status then
         if formattedText ~= nil then

diff --git a/script/core/rangeformatting.lua b/script/core/rangeformatting.lua
@@ -3,10 +3,10 @@ local files = require("files")
 local log = require("log")
 local converter = require("proto.converter")
 
-return function(uri, range)
+return function(uri, range, options)
     local text = files.getText(uri)
     local status, formattedText, startLine, endLine = codeFormat.range_format(
-        uri, text, range.start.line, range["end"].line)
+        uri, text, range.start.line, range["end"].line, options)
 
     if not status then
         if formattedText ~= nil then

diff --git a/script/provider/provider.lua b/script/provider/provider.lua
@@ -1020,7 +1020,7 @@ m.register 'textDocument/formatting' {
         pformatting.updateConfig(uri)
 
         local core = require 'core.formatting'
-        local edits = core(uri)
+        local edits = core(uri, params.options)
         if not edits or #edits == 0 then
             return nil
         end
@@ -1058,7 +1058,7 @@ m.register 'textDocument/rangeFormatting' {
         pformatting.updateConfig(uri)
 
         local core = require 'core.rangeformatting'
-        local edits = core(uri, params.range)
+        local edits = core(uri, params.range, params.options)
         if not edits or #edits == 0 then
             return nil
         end