No need to run didOpen/didClose/didChange with scheduling rule (#2637)

No need to run document lifecycle operation with scheduling rule
eclipse-jdtls · May 8, 2023 · 1bbff65 · 1bbff65
1 parent c98fd2c
commit 1bbff65
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/...t.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/BaseDocumentLifeCycleHandler.java b/...t.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/BaseDocumentLifeCycleHandler.java
@@ -302,44 +302,41 @@ public IProblemRequestor getProblemRequestor(ICompilationUnit workingCopy) {
 
 	public void didClose(DidCloseTextDocumentParams params) {
 		documentVersions.remove(params.getTextDocument().getUri());
-		ISchedulingRule rule = JDTUtils.getRule(params.getTextDocument().getUri());
 		try {
 			ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
 				@Override
 				public void run(IProgressMonitor monitor) throws CoreException {
 					handleClosed(params);
 				}
-			}, rule, IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
+			}, null, IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
 		} catch (CoreException e) {
 			JavaLanguageServerPlugin.logException("Handle document close ", e);
 		}
 	}
 
 	public void didOpen(DidOpenTextDocumentParams params) {
 		documentVersions.put(params.getTextDocument().getUri(), params.getTextDocument().getVersion());
-		ISchedulingRule rule = JDTUtils.getRule(params.getTextDocument().getUri());
 		try {
 			ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
 				@Override
 				public void run(IProgressMonitor monitor) throws CoreException {
 					handleOpen(params);
 				}
-			}, rule, IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
+			}, null, IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
 		} catch (CoreException e) {
 			JavaLanguageServerPlugin.logException("Handle document open ", e);
 		}
 	}
 
 	public void didChange(DidChangeTextDocumentParams params) {
 		documentVersions.put(params.getTextDocument().getUri(), params.getTextDocument().getVersion());
-		ISchedulingRule rule = JDTUtils.getRule(params.getTextDocument().getUri());
 		try {
 			ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
 				@Override
 				public void run(IProgressMonitor monitor) throws CoreException {
 					handleChanged(params);
 				}
-			}, rule, IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
+			}, null, IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
 		} catch (CoreException e) {
 			JavaLanguageServerPlugin.logException("Handle document change ", e);
 		}

diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JsonRpcHelpers.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JsonRpcHelpers.java
@@ -84,7 +84,7 @@ public static int toOffset(IDocument document, int line, int column) {
 			try {
 				return document.getLineOffset(line) + column;
 			} catch (BadLocationException e) {
-				JavaLanguageServerPlugin.logException(e.getMessage(), e);
+				JavaLanguageServerPlugin.debugTrace("toOffset: " + (e.getMessage() == null ? e.toString() : e.getMessage()));
 			}
 		}
 		return -1;
@@ -157,7 +157,7 @@ public static int[] toLine(IDocument document, int offset) {
 				int column = offset - document.getLineOffset(line);
 				return new int[] { line, column };
 			} catch (BadLocationException e) {
-				JavaLanguageServerPlugin.logException(e.getMessage(), e);
+				JavaLanguageServerPlugin.debugTrace("toLine: " + (e.getMessage() == null ? e.toString() : e.getMessage()));
 			}
 		}
 		return null;