Change Sort Dependencies code action kind to source.organizeImports

joaopsazevedo · joaopsazevedo · commit 302dc21658ab · 2025-07-22T13:59:24.000Z
diff --git a/source/ada/lsp-ada_client_capabilities.adb b/source/ada/lsp-ada_client_capabilities.adb
@@ -383,7 +383,8 @@ package body LSP.Ada_Client_Capabilities is
       function Supported_Code_Action_Kinds
         return LSP.Structures.CodeActionKind_Vectors.Vector is
           [LSP.Enumerations.QuickFix,
-           LSP.Enumerations.RefactorRewrite];
+           LSP.Enumerations.RefactorRewrite,
+           LSP.Enumerations.SourceOrganizeImports];
 
       function Full_codeActionProvider
         return LSP.Structures.Boolean_Or_CodeActionOptions_Optional is
diff --git a/source/ada/lsp-ada_handlers-refactor-sort_dependencies.adb b/source/ada/lsp-ada_handlers-refactor-sort_dependencies.adb
@@ -50,7 +50,7 @@ package body LSP.Ada_Handlers.Refactor.Sort_Dependencies is
         (title       => "Sort Dependencies",
          kind        =>
            (Is_Set => True,
-            Value  => LSP.Enumerations.Refactor),
+            Value  => LSP.Enumerations.SourceOrganizeImports),
          diagnostics => <>,
          edit        => (Is_Set => False),
          isPreferred => (Is_Set => False),
diff --git a/testsuite/ada_lsp/completion.standard_package/test.json b/testsuite/ada_lsp/completion.standard_package/test.json
@@ -101,7 +101,6 @@
                      "documentSymbolProvider": true,
                      "codeActionProvider": {
                         "workDoneProgress": false,
-                        "codeActionKinds": ["quickfix", "refactor.rewrite"],
                         "resolveProvider": false
                      },
                      "workspaceSymbolProvider": true,
diff --git a/testsuite/ada_lsp/hover.incomplete_types/test.json b/testsuite/ada_lsp/hover.incomplete_types/test.json
@@ -110,7 +110,6 @@
                      "documentSymbolProvider": true,
                      "codeActionProvider": {
                         "workDoneProgress": false,
-                        "codeActionKinds": ["quickfix", "refactor.rewrite"],
                         "resolveProvider": false
                      },
                      "workspaceSymbolProvider": true,
diff --git a/testsuite/ada_lsp/hover.predefined_entities/test.json b/testsuite/ada_lsp/hover.predefined_entities/test.json
@@ -110,7 +110,6 @@
                      "documentSymbolProvider": true,
                      "codeActionProvider": {
                         "workDoneProgress": false,
-                        "codeActionKinds": ["quickfix", "refactor.rewrite"],
                         "resolveProvider": false
                      },
                      "workspaceSymbolProvider": true,
diff --git a/testsuite/ada_lsp/refactoring_sort_dependencies/SA22-035/test.json b/testsuite/ada_lsp/refactoring_sort_dependencies/SA22-035/test.json
@@ -46,7 +46,8 @@
                                  "refactor",
                                  "refactor.extract",
                                  "refactor.inline",
-                                 "refactor.rewrite"
+                                 "refactor.rewrite",
+                                 "source.organizeImports"
                               ]
                            }
                         }
@@ -69,7 +70,7 @@
                      "codeActionProvider": {
                         "codeActionKinds": [
                            "<HAS>",
-                           "refactor.rewrite"
+                           "source.organizeImports"
                         ]
                      },
                      "executeCommandProvider": {
@@ -177,7 +178,7 @@
                "result": [
                   {
                      "title": "Sort Dependencies",
-                     "kind": "refactor",
+                     "kind": "source.organizeImports",
                      "command": {
                         "title": "",
                         "command": "als-refactor-sort_dependencies",
diff --git a/testsuite/ada_lsp/refactoring_sort_dependencies/prelude_range/test.json b/testsuite/ada_lsp/refactoring_sort_dependencies/prelude_range/test.json
@@ -46,7 +46,8 @@
                                  "refactor",
                                  "refactor.extract",
                                  "refactor.inline",
-                                 "refactor.rewrite"
+                                 "refactor.rewrite",
+                                 "source.organizeImports"
                               ]
                            }
                         }
@@ -69,7 +70,7 @@
                      "codeActionProvider": {
                         "codeActionKinds": [
                            "<HAS>",
-                           "refactor.rewrite"
+                           "source.organizeImports"
                         ]
                      },
                      "executeCommandProvider": {
@@ -177,7 +178,7 @@
                "result": [
                   {
                      "title": "Sort Dependencies",
-                     "kind": "refactor",
+                     "kind": "source.organizeImports",
                      "command": {
                         "title": "",
                         "command": "als-refactor-sort_dependencies",

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@`
`46`	`46`	`"refactor",`
`47`	`47`	`"refactor.extract",`
`48`	`48`	`"refactor.inline",`
`49`		`- "refactor.rewrite"`
	`49`	`+ "refactor.rewrite",`
	`50`	`+ "source.organizeImports"`
`50`	`51`	`]`
`51`	`52`	`}`
`52`	`53`	`}`
`@@ -69,7 +70,7 @@`
`69`	`70`	`"codeActionProvider": {`
`70`	`71`	`"codeActionKinds": [`
`71`	`72`	`"<HAS>",`
`72`		`- "refactor.rewrite"`
	`73`	`+ "source.organizeImports"`
`73`	`74`	`]`
`74`	`75`	`},`
`75`	`76`	`"executeCommandProvider": {`
`@@ -177,7 +178,7 @@`
`177`	`178`	`"result": [`
`178`	`179`	`{`
`179`	`180`	`"title": "Sort Dependencies",`
`180`		`- "kind": "refactor",`
	`181`	`+ "kind": "source.organizeImports",`
`181`	`182`	`"command": {`
`182`	`183`	`"title": "",`
`183`	`184`	`"command": "als-refactor-sort_dependencies",`