feat: add extract_field command

s1n7ax · s1n7ax · commit aabca011b56b · 2024-07-12T09:32:30.000+05:30
diff --git a/README.md b/README.md
@@ -123,11 +123,12 @@ Yep! That's all :)
 
 ### Refactor
 
-- `JavaRefactorExtractVariable` - Create a variable from value at cursor
+- `JavaRefactorExtractVariable` - Create a variable from value at cursor/selection
 - `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
+  occurrences from value at cursor/selection
+- `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
 
 ### Settings
 
@@ -220,31 +221,37 @@ require('java').profile.ui()
 
 ### Refactor
 
-- `extract_variable` - Create a variable from value at cursor
+- `extract_variable` - Create a variable from value at cursor/selection
 
 ```lua
 require('java').refactor.extract_variable()
 ```
 
 - `extract_variable_all_occurrence` - Create a variable for all occurrences from
-  value at cursor
+  value at cursor/selection
 
 ```lua
 require('java').refactor.extract_variable_all_occurrence()
 ```
 
-- `extract_constant` - Create a constant from the value at cursor
+- `extract_constant` - Create a constant from the value at cursor/selection
 
 ```lua
 require('java').refactor.extract_constant()
 ```
 
-- `extract_method` - Create method from the value at cursor
+- `extract_method` - Create method from the value at cursor/selection
 
 ```lua
 require('java').refactor.extract_method()
 ```
 
+- `extract_field` - Create a field from the value at cursor/selection
+
+```lua
+require('java').refactor.extract_field()
+```
+
 ### Settings
 
 - `change_runtime` - Change the JDK version to another
diff --git a/lua/java.lua b/lua/java.lua
@@ -86,6 +86,7 @@ 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_field = refactor.extract_field
 M.refactor.extract_variable_all_occurrence =
 	refactor.extract_variable_all_occurrence
 
diff --git a/lua/java/api/refactor.lua b/lua/java/api/refactor.lua
@@ -21,6 +21,10 @@ function M.extract_method()
 	M.extract('extractMethod')
 end
 
+function M.extract_field()
+	M.extract('extractField')
+end
+
 ---
 ---@param refactor_command jdtls.CodeActionCommand
 function M.extract(refactor_command)
diff --git a/lua/java/utils/ui.lua b/lua/java/utils/ui.lua
@@ -8,7 +8,7 @@ local M = {}
 ---@generic T
 ---@param prompt string
 ---@param values T[]
----@param format_item fun(item: T): string
+---@param format_item? fun(item: T): string
 ---@return T
 function M.select(prompt, values, format_item)
 	return await(function(callback)
diff --git a/plugin/java.lua b/plugin/java.lua
@@ -33,6 +33,7 @@ local cmd_map = {
 
 	JavaRefactorExtractMethod = {
 		java.refactor.extract_method,
+		{ range = 2 },
 	},
 
 	JavaRefactorExtractConstant = {
@@ -44,6 +45,11 @@ local cmd_map = {
 		java.refactor.extract_variable_all_occurrence,
 		{ range = 2 },
 	},
+
+	JavaRefactorExtractField = {
+		java.refactor.extract_field,
+		{ range = 2 },
+	},
 }
 
 for cmd, details in pairs(cmd_map) do
