Skip to content

Commit 350a184

Browse files
No need to run document lifecycle operation with scheduling rule
1 parent c98fd2c commit 350a184

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

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

+3-6
Original file line numberDiff line numberDiff line change
@@ -302,44 +302,41 @@ public IProblemRequestor getProblemRequestor(ICompilationUnit workingCopy) {
302302

303303
public void didClose(DidCloseTextDocumentParams params) {
304304
documentVersions.remove(params.getTextDocument().getUri());
305-
ISchedulingRule rule = JDTUtils.getRule(params.getTextDocument().getUri());
306305
try {
307306
ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
308307
@Override
309308
public void run(IProgressMonitor monitor) throws CoreException {
310309
handleClosed(params);
311310
}
312-
}, rule, IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
311+
}, null, IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
313312
} catch (CoreException e) {
314313
JavaLanguageServerPlugin.logException("Handle document close ", e);
315314
}
316315
}
317316

318317
public void didOpen(DidOpenTextDocumentParams params) {
319318
documentVersions.put(params.getTextDocument().getUri(), params.getTextDocument().getVersion());
320-
ISchedulingRule rule = JDTUtils.getRule(params.getTextDocument().getUri());
321319
try {
322320
ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
323321
@Override
324322
public void run(IProgressMonitor monitor) throws CoreException {
325323
handleOpen(params);
326324
}
327-
}, rule, IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
325+
}, null, IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
328326
} catch (CoreException e) {
329327
JavaLanguageServerPlugin.logException("Handle document open ", e);
330328
}
331329
}
332330

333331
public void didChange(DidChangeTextDocumentParams params) {
334332
documentVersions.put(params.getTextDocument().getUri(), params.getTextDocument().getVersion());
335-
ISchedulingRule rule = JDTUtils.getRule(params.getTextDocument().getUri());
336333
try {
337334
ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
338335
@Override
339336
public void run(IProgressMonitor monitor) throws CoreException {
340337
handleChanged(params);
341338
}
342-
}, rule, IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
339+
}, null, IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
343340
} catch (CoreException e) {
344341
JavaLanguageServerPlugin.logException("Handle document change ", e);
345342
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public static int toOffset(IDocument document, int line, int column) {
8484
try {
8585
return document.getLineOffset(line) + column;
8686
} catch (BadLocationException e) {
87-
JavaLanguageServerPlugin.logException(e.getMessage(), e);
87+
JavaLanguageServerPlugin.debugTrace("toOffset: " + (e.getMessage() == null ? e.toString() : e.getMessage()));
8888
}
8989
}
9090
return -1;
@@ -157,7 +157,7 @@ public static int[] toLine(IDocument document, int offset) {
157157
int column = offset - document.getLineOffset(line);
158158
return new int[] { line, column };
159159
} catch (BadLocationException e) {
160-
JavaLanguageServerPlugin.logException(e.getMessage(), e);
160+
JavaLanguageServerPlugin.debugTrace("toLine: " + (e.getMessage() == null ? e.toString() : e.getMessage()));
161161
}
162162
}
163163
return null;

0 commit comments

Comments
 (0)