From a88ee95480a5f7c3699aa876d1942c4b4c00046a Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Mon, 18 Mar 2024 17:09:45 -0400 Subject: [PATCH] Change name of cleanup identifier. Signed-off-by: Roland Grunberg --- .../core/internal/handlers/BaseDocumentLifeCycleHandler.java | 1 + .../jdt/ls/core/internal/handlers/JDTLanguageServer.java | 2 +- .../jdt/ls/core/internal/handlers/SaveActionHandler.java | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/BaseDocumentLifeCycleHandler.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/BaseDocumentLifeCycleHandler.java index a82debe93e..083d87b2dc 100644 --- a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/BaseDocumentLifeCycleHandler.java +++ b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/BaseDocumentLifeCycleHandler.java @@ -96,6 +96,7 @@ public abstract class BaseDocumentLifeCycleHandler { public static final String DOCUMENT_LIFE_CYCLE_JOBS = "DocumentLifeCycleJobs"; public static final String PUBLISH_DIAGNOSTICS_JOBS = "DocumentLifeCyclePublishDiagnosticsJobs"; + public static final String RENAME_FILE_TO_TYPE = "renameFileToType"; /** * The max & init value of adaptive debounce time for document lifecycle job. diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JDTLanguageServer.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JDTLanguageServer.java index 66cfb6579d..80420414ae 100644 --- a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JDTLanguageServer.java +++ b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JDTLanguageServer.java @@ -941,7 +941,7 @@ public void didSave(DidSaveTextDocumentParams params) { lspCleanups = preferences.getCleanUpActions(); } - if (lspCleanups.contains("renameFile")) { + if (lspCleanups.contains(BaseDocumentLifeCycleHandler.RENAME_FILE_TO_TYPE)) { computeAsync((monitor) -> { DocumentLifeCycleHandler.handleFileRenameForTypeDeclaration(documentUri); return null; diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/SaveActionHandler.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/SaveActionHandler.java index 3b6290a18a..7caf6dbf82 100644 --- a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/SaveActionHandler.java +++ b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/SaveActionHandler.java @@ -80,7 +80,7 @@ public List willSaveWaitUntil(WillSaveTextDocumentParams params, IProg Collection jdtSettingCleanups = getCleanupsFromJDTUIPreferences(jdtUiPreferences); cleanUpIds.addAll(canUseInternalSettings ? jdtSettingCleanups : lspCleanups); - cleanUpIds.remove("renameFile"); + cleanUpIds.remove(BaseDocumentLifeCycleHandler.RENAME_FILE_TO_TYPE); List cleanUpEdits = cleanUpRegistry.getEditsForAllActiveCleanUps(params.getTextDocument(), new ArrayList<>(cleanUpIds), monitor); edit.addAll(cleanUpEdits); return edit; @@ -103,7 +103,7 @@ public WorkspaceEdit performManualCleanupActions(TextDocumentIdentifier doc, IPr Collection jdtSettingCleanups = getCleanupsFromJDTUIPreferences(jdtUiPreferences); cleanUpIds.addAll(canUseInternalSettings ? jdtSettingCleanups : lspCleanups); - cleanUpIds.remove("renameFile"); + cleanUpIds.remove(BaseDocumentLifeCycleHandler.RENAME_FILE_TO_TYPE); List cleanUpEdits = cleanUpRegistry.getEditsForAllActiveCleanUps(doc, new ArrayList<>(cleanUpIds), monitor); edit.addAll(cleanUpEdits); Map> editMap = new HashMap<>();