refactor: use code_action native function for refactor commands

s1n7ax · s1n7ax · commit 5d3a1d5f92e6 · 2024-07-14T14:52:33.000+05:30
diff --git a/README.md b/README.md
@@ -132,7 +132,6 @@ Yep! That's all :)
 - `JavaRefactorExtractConstant` - Create a constant from the value at cursor/selection
 - `JavaRefactorExtractMethod` - Create a method from the value at cursor/selection
 - `JavaRefactorExtractField` - Create a field from the value at cursor/selection
-- `JavaRefactorConvertVariableToField` - Change a local variable to field
 
 ### Settings
 
@@ -256,12 +255,6 @@ require('java').refactor.extract_method()
 require('java').refactor.extract_field()
 ```
 
-- `convert_variable_to_field` - Change a local variable to field
-
-```lua
-require('java').refactor.convert_variable_to_field()
-```
-
 ### Settings
 
 - `change_runtime` - Change the JDK version to another
diff --git a/lua/java/api/refactor.lua b/lua/java/api/refactor.lua
@@ -1,43 +1,39 @@
-local jdtls = require('java.utils.jdtls2')
-local get_error_handler = require('java.handlers.error')
-
-local async = require('java-core.utils.async').sync
-
 local M = {}
 
 function M.extract_variable()
-	M.extract('extractVariable')
+	M.run_code_action('refactor.extract.variable', 'extractVariable')
 end
 
 function M.extract_variable_all_occurrence()
-	M.extract('extractVariableAllOccurrence')
+	M.run_code_action('refactor.extract.variable', 'extractVariableAllOccurrence')
 end
 
 function M.extract_constant()
-	M.extract('extractConstant')
+	M.run_code_action('refactor.extract.constant')
 end
 
 function M.extract_method()
-	M.extract('extractMethod')
+	M.run_code_action('refactor.extract.function')
 end
 
 function M.extract_field()
-	M.extract('extractField')
-end
-
-function M.convert_variable_to_field()
-	M.extract('convertVariableToField')
+	M.run_code_action('refactor.extract.field')
 end
 
----@param refactor_command jdtls.CodeActionCommand
-function M.extract(refactor_command)
-	return async(function()
-			local RefactorCommands = require('java-refactor.refactor-commands')
-			local refactor_commands = RefactorCommands(jdtls())
-			refactor_commands:refactor(refactor_command)
-		end)
-		.catch(get_error_handler('failed to refactor variable'))
-		.run()
+---@private
+---@param action_type string
+---@param filter? string
+function M.run_code_action(action_type, filter)
+	vim.lsp.buf.code_action({
+		apply = true,
+		context = {
+			diagnostics = vim.lsp.diagnostic.get_line_diagnostics(0),
+			only = { action_type },
+		},
+		filter = filter and function(refactor)
+			return refactor.command.arguments[1] == filter
+		end or nil,
+	})
 end
 
 return M
diff --git a/plugin/java.lua b/plugin/java.lua
@@ -50,11 +50,6 @@ local cmd_map = {
 		java.refactor.extract_field,
 		{ range = 2 },
 	},
-
-	JavaRefactorConvertVariableToField = {
-		java.refactor.convert_variable_to_field,
-		{ range = 2 },
-	},
 }
 
 for cmd, details in pairs(cmd_map) do
