feat: add more extract commands

s1n7ax · s1n7ax · commit 0ec0f463efa7 · 2024-07-11T02:03:47.000+05:30
diff --git a/README.md b/README.md
@@ -119,7 +119,11 @@ Yep! That's all :)
 
 ### Refactor
 
-- `JavaRefactorExtractVariable` - Create a variable from returned value at cursor
+- `JavaRefactorExtractVariable` - Create a variable from value at cursor
+- `JavaRefactorExtractVariableAllOccurrence` - Create a variable for all
+  occurrences from value at cursor
+- `JavaRefactorExtractConstant` - Create a constant from the value at cursor
+- `JavaRefactorExtractMethod` - Create method from the value at cursor
 
 ### Settings
 
@@ -212,12 +216,31 @@ require('java').profile.ui()
 
 ### Refactor
 
-- `extract_variable` - Create a variable from returned value at cursor
+- `extract_variable` - Create a variable from value at cursor
 
 ```lua
 require('java').refactor.extract_variable()
 ```
 
+- `extract_variable_all_occurrence` - Create a variable for all occurrences from
+  value at cursor
+
+```lua
+require('java').refactor.extract_variable_all_occurrence()
+```
+
+- `extract_constant` - Create a constant from the value at cursor
+
+```lua
+require('java').refactor.extract_constant()
+```
+
+- `extract_method` - Create method from the value at cursor
+
+```lua
+require('java').refactor.extract_method()
+```
+
 ### Settings
 
 - `change_runtime` - Change the JDK version to another
diff --git a/lua/java.lua b/lua/java.lua
@@ -84,6 +84,10 @@ M.manipulate = {}
 ----------------------------------------------------------------------
 M.refactor = {}
 M.refactor.extract_variable = refactor.extract_variable
+M.refactor.extract_constant = refactor.extract_constant
+M.refactor.extract_method = refactor.extract_method
+M.refactor.extract_variable_all_occurrence =
+	refactor.extract_variable_all_occurrence
 
 ----------------------------------------------------------------------
 --                            Runner APIs                           --
diff --git a/lua/java/api/refactor.lua b/lua/java/api/refactor.lua
@@ -6,10 +6,28 @@ local async = require('java-core.utils.async').sync
 local M = {}
 
 function M.extract_variable()
+	M.extract('extractVariable')
+end
+
+function M.extract_variable_all_occurrence()
+	M.extract('extractVariableAllOccurrence')
+end
+
+function M.extract_constant()
+	M.extract('extractConstant')
+end
+
+function M.extract_method()
+	M.extract('extractMethod')
+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:extract_variable()
+			refactor_commands:refactor(refactor_command)
 		end)
 		.catch(get_error_handler('failed to refactor variable'))
 		.run()
diff --git a/plugin/java.lua b/plugin/java.lua
@@ -30,6 +30,20 @@ local cmd_map = {
 		java.refactor.extract_variable,
 		{ range = 2 },
 	},
+
+	JavaRefactorExtractMethod = {
+		java.refactor.extract_method,
+	},
+
+	JavaRefactorExtractConstant = {
+		java.refactor.extract_constant,
+		{ range = 2 },
+	},
+
+	JavaRefactorExtractVariableAllOccurrence = {
+		java.refactor.extract_variable_all_occurrence,
+		{ range = 2 },
+	},
 }
 
 for cmd, details in pairs(cmd_map) do
