Skip to content

Commit 02b046f

Browse files
committed
Expand "workspace/willRenameFiles" support to include folders.
- Allow folder renames to trigger workspace/willRenameFiles since the language server can update source files during such an operation Signed-off-by: Roland Grunberg <[email protected]>
1 parent 822133b commit 02b046f

File tree

1 file changed

+8
-3
lines changed
  • org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers

1 file changed

+8
-3
lines changed

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/InitHandler.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,14 @@ public void registerCapabilities(InitializeResult initializeResult) {
220220

221221
if (preferenceManager.getClientPreferences().isWorkspaceWillRenameFilesSupported()) {
222222
FileOperationsServerCapabilities wsFileOperations = new FileOperationsServerCapabilities();
223-
FileOperationPattern fileOpPattern = new FileOperationPattern("**/*.java");
224-
fileOpPattern.setMatches(FileOperationPatternKind.File);
225-
wsFileOperations.setWillRename(new FileOperationOptions(List.of(new FileOperationFilter(fileOpPattern, "file"))));
223+
FileOperationPattern fileOpPatternJava = new FileOperationPattern("**/*.java");
224+
fileOpPatternJava.setMatches(FileOperationPatternKind.File);
225+
FileOperationPattern fileOpPatternPackage = new FileOperationPattern("**");
226+
fileOpPatternPackage.setMatches(FileOperationPatternKind.Folder);
227+
wsFileOperations.setWillRename(new FileOperationOptions(List.of(
228+
new FileOperationFilter(fileOpPatternJava, "file"),
229+
new FileOperationFilter(fileOpPatternPackage, "file")
230+
)));
226231
wsCapabilities.setFileOperations(wsFileOperations);
227232
}
228233

0 commit comments

Comments
 (0)