refact: add LSPEclipseUtils.toRange() (#1253)

Author: sebthom

org.eclipse.lsp4e/src/org/eclipse/lsp4e/DocumentContentSynchronizer.java

@@ -55,7 +55,6 @@
 import org.eclipse.lsp4j.FormattingOptions;
 import org.eclipse.lsp4j.MessageParams;
 import org.eclipse.lsp4j.MessageType;
-import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.ServerCapabilities;
 import org.eclipse.lsp4j.TextDocumentContentChangeEvent;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
@@ -198,9 +197,7 @@ private boolean createChangeEvent(DocumentEvent event) {
 			int length = event.getLength();
 			try {
 				// try to convert the Eclipse start/end offset to LS range.
-				final var range = new Range(LSPEclipseUtils.toPosition(offset, document),
-						LSPEclipseUtils.toPosition(offset + length, document));
-				changeEvent.setRange(range);
+				changeEvent.setRange(LSPEclipseUtils.toRange(offset, offset + length, document));
 				changeEvent.setText(newText);
 				changeEvent.setRangeLength(length);
 			} catch (BadLocationException e) {

org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java

@@ -191,6 +191,11 @@ private LSPEclipseUtils() {
 		// this class shouldn't be instantiated
 	}
 
+	public static Range toRange(final int startOffset, final int endOffset, final IDocument document)
+			throws BadLocationException {
+		return new Range(toPosition(startOffset, document), toPosition(endOffset, document));
+	}
+
 	public static Position toPosition(int offset, IDocument document) throws BadLocationException {
 		final var res = new Position();
 		res.setLine(document.getLineOfOffset(offset));

org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/codeactions/LSPCodeActionQuickAssistProcessor.java

@@ -38,7 +38,6 @@
 import org.eclipse.lsp4e.ui.Messages;
 import org.eclipse.lsp4j.CodeActionContext;
 import org.eclipse.lsp4j.CodeActionParams;
-import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.ServerCapabilities;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
@@ -197,8 +196,7 @@ private static CodeActionParams prepareCodeActionParams(final IDocument doc, int
 		final var params = new CodeActionParams();
 		params.setTextDocument(castNonNull(LSPEclipseUtils.toTextDocumentIdentifier(doc)));
 		try {
-			params.setRange(new Range(LSPEclipseUtils.toPosition(offset, doc), LSPEclipseUtils
-					.toPosition(offset + (length > 0 ? length : 0), doc)));
+			params.setRange(LSPEclipseUtils.toRange(offset, offset + (length > 0 ? length : 0), doc));
 		} catch (BadLocationException e) {
 			LanguageServerPlugin.logError(e);
 		}

org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/codeactions/LSPCodeActionsMenu.java

@@ -69,8 +69,8 @@ public void initialize(IServiceLocator serviceLocator) {
 			this.document = document;
 			final var selection = (ITextSelection) textEditor.getSelectionProvider().getSelection();
 			try {
-				this.range = new Range(LSPEclipseUtils.toPosition(selection.getOffset(), document),
-						LSPEclipseUtils.toPosition(selection.getOffset() + selection.getLength(), document));
+				this.range = LSPEclipseUtils.toRange(selection.getOffset(),
+						selection.getOffset() + selection.getLength(), document);
 			} catch (BadLocationException e) {
 				LanguageServerPlugin.logError(e);
 			}

org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/completion/LSCompletionProposal.java

@@ -485,9 +485,7 @@ protected void apply(IDocument document, char trigger, int stateMask, int offset
 		try {
 			if (textEdit == null) {
 				insertText = getInsertText();
-				Position start = LSPEclipseUtils.toPosition(bestOffset, document);
-				Position end = LSPEclipseUtils.toPosition(offset, document); // need 2 distinct objects
-				textEdit = new TextEdit(new Range(start, end), insertText);
+				textEdit = new TextEdit(LSPEclipseUtils.toRange(bestOffset, offset, document), insertText);
 			} else if (offset > initialOffset) {
 				// characters were added after completion was activated
 				int shift = offset - initialOffset;
@@ -729,9 +727,7 @@ private Range getTextEditRange() throws BadLocationException {
 		if (textEdit != null) {
 			return textEdit.map(TextEdit::getRange, InsertReplaceEdit::getInsert);
 		} else {
-				Position start = LSPEclipseUtils.toPosition(bestOffset, document);
-				Position end = LSPEclipseUtils.toPosition(initialOffset, document);
-				return new Range(start, end);
+			return LSPEclipseUtils.toRange(bestOffset, initialOffset, document);
 		}
 	}
 

org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/format/LSPFormatter.java

@@ -29,8 +29,6 @@
 import org.eclipse.lsp4j.DocumentFormattingParams;
 import org.eclipse.lsp4j.DocumentRangeFormattingParams;
 import org.eclipse.lsp4j.FormattingOptions;
-import org.eclipse.lsp4j.Position;
-import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.ServerCapabilities;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.ui.editors.text.EditorsUI;
@@ -80,12 +78,10 @@ public static DocumentRangeFormattingParams getRangeFormattingParams(IDocument d
 		final var rangeParams = new DocumentRangeFormattingParams();
 		rangeParams.setTextDocument(docId);
 		rangeParams.setOptions(formatOptions);
-		boolean fullFormat = textSelection.getLength() == 0;
-		Position start = LSPEclipseUtils.toPosition(fullFormat ? 0 : textSelection.getOffset(), document);
-		Position end = LSPEclipseUtils.toPosition(
-				fullFormat ? document.getLength() : textSelection.getOffset() + textSelection.getLength(),
-				document);
-		rangeParams.setRange(new Range(start, end));
+		final boolean isFullFormat = textSelection.isEmpty();
+		final int startAt = isFullFormat ? 0 : textSelection.getOffset();
+		final int endAt = isFullFormat ? document.getLength() : startAt + textSelection.getLength();
+		rangeParams.setRange(LSPEclipseUtils.toRange(startAt, endAt, document));
 		return rangeParams;
 	}