-
Notifications
You must be signed in to change notification settings - Fork 148
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Introduced type adapter for CompletionItemDefaults.editRange
Harmonized Naming convention and package structure Fixes #624 Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
- Loading branch information
Showing
6 changed files
with
79 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
.../src/main/java/org/eclipse/lsp4j/adapters/CompletionItemDefaultsEditRangeTypeAdapter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /****************************************************************************** | ||
| * Copyright (c) 2022 itemis AG and others. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0, | ||
| * or the Eclipse Distribution License v. 1.0 which is available at | ||
| * http://www.eclipse.org/org/documents/edl-v10.php. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause | ||
| ******************************************************************************/ | ||
| package org.eclipse.lsp4j.adapters; | ||
|
|
||
| import java.util.function.Predicate; | ||
|
|
||
| import org.eclipse.lsp4j.InsertReplaceRange; | ||
| import org.eclipse.lsp4j.Range; | ||
| import org.eclipse.lsp4j.jsonrpc.json.adapters.EitherTypeAdapter; | ||
| import org.eclipse.lsp4j.jsonrpc.json.adapters.EitherTypeAdapter.PropertyChecker; | ||
| import org.eclipse.lsp4j.jsonrpc.messages.Either; | ||
|
|
||
| import com.google.gson.Gson; | ||
| import com.google.gson.JsonElement; | ||
| import com.google.gson.TypeAdapter; | ||
| import com.google.gson.TypeAdapterFactory; | ||
| import com.google.gson.reflect.TypeToken; | ||
|
|
||
| public class CompletionItemDefaultsEditRangeTypeAdapter implements TypeAdapterFactory { | ||
| private static final TypeToken<Either<Range, InsertReplaceRange>> ELEMENT_TYPE = new TypeToken<Either<Range, InsertReplaceRange>>() { | ||
| }; | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| @Override | ||
| public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) { | ||
| Predicate<JsonElement> leftChecker = new PropertyChecker("start"); | ||
| Predicate<JsonElement> rightChecker = new PropertyChecker("insert").or(new PropertyChecker("replace")); | ||
| return (TypeAdapter<T>) new EitherTypeAdapter<>(gson, ELEMENT_TYPE, leftChecker, rightChecker); | ||
| } | ||
| } |
33 changes: 33 additions & 0 deletions
33
...test/java/org/eclipse/lsp4j/test/adapters/CompletionItemDefaultsEditRangeAdapterTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /****************************************************************************** | ||
| * Copyright (c) 2022 itemis AG and others. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0, | ||
| * or the Eclipse Distribution License v. 1.0 which is available at | ||
| * http://www.eclipse.org/org/documents/edl-v10.php. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause | ||
| ******************************************************************************/ | ||
| package org.eclipse.lsp4j.test.adapters; | ||
|
|
||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| import org.eclipse.lsp4j.CompletionItemDefaults; | ||
| import org.junit.Test; | ||
|
|
||
| import com.google.gson.Gson; | ||
| import com.google.gson.GsonBuilder; | ||
|
|
||
| public class CompletionItemDefaultsEditRangeAdapterTest { | ||
|
|
||
| @Test | ||
| public void test() { | ||
| GsonBuilder builder = new GsonBuilder(); | ||
| Gson gson = builder.create(); | ||
| CompletionItemDefaults object = gson.fromJson("{\"editRange\":{\"start\":{\"line\":0,\"character\":1},\"end\":{\"line\":0,\"character\":2}}}", CompletionItemDefaults.class); | ||
| assertTrue(object.toString(), object.getEditRange().isLeft()); | ||
| object = gson.fromJson("{\"editRange\":{\"insert\":{\"start\":{\"line\":0,\"character\":1},\"end\":{\"line\":0,\"character\":2}},\"replace\":{\"start\":{\"line\":1,\"character\":1},\"end\":{\"line\":1,\"character\":2}}}}", CompletionItemDefaults.class); | ||
| assertTrue(object.toString(), object.getEditRange().isRight()); | ||
| } | ||
| } |