diff --git a/org.eclipse.lsp4j/src/main/java/org/eclipse/lsp4j/Protocol.xtend b/org.eclipse.lsp4j/src/main/java/org/eclipse/lsp4j/Protocol.xtend index 0bf36965..dcc1d617 100644 --- a/org.eclipse.lsp4j/src/main/java/org/eclipse/lsp4j/Protocol.xtend +++ b/org.eclipse.lsp4j/src/main/java/org/eclipse/lsp4j/Protocol.xtend @@ -3629,7 +3629,7 @@ class FormattingOptions extends LinkedHashMap getProperties() { - val properties = newLinkedHashMap + val properties = new LinkedHashMap for (entry : entrySet) { val value = switch it: entry.value { case isFirst: getFirst diff --git a/org.eclipse.lsp4j/src/main/java/org/eclipse/lsp4j/adapters/HoverTypeAdapter.xtend b/org.eclipse.lsp4j/src/main/java/org/eclipse/lsp4j/adapters/HoverTypeAdapter.xtend index 5843ba5a..eb55d9c7 100644 --- a/org.eclipse.lsp4j/src/main/java/org/eclipse/lsp4j/adapters/HoverTypeAdapter.xtend +++ b/org.eclipse.lsp4j/src/main/java/org/eclipse/lsp4j/adapters/HoverTypeAdapter.xtend @@ -24,6 +24,7 @@ import org.eclipse.lsp4j.MarkedString import org.eclipse.lsp4j.MarkupContent import org.eclipse.lsp4j.generator.TypeAdapterImpl import org.eclipse.lsp4j.jsonrpc.messages.Either +import com.google.common.collect.Lists /** * A type adapter for the Hover protocol type. @@ -37,7 +38,7 @@ class HoverTypeAdapter { protected def readContents(JsonReader in) throws IOException { val nextToken = in.peek() if (nextToken == JsonToken.STRING) { - val List> value = newArrayList(Either.forLeft(in.nextString)) + val List> value = Lists.newArrayList(Either.forLeft(in.nextString)) return Either.forLeft(value) } else if (nextToken == JsonToken.BEGIN_ARRAY) { val value = gson.fromJson(in, LIST_STRING_MARKEDSTRING.type) @@ -45,7 +46,7 @@ class HoverTypeAdapter { } else { val object = new JsonParser().parse(in) as JsonObject if (object.has("language")) { - val List> value = newArrayList(Either.forRight(gson.fromJson(object, MarkedString))) + val List> value = Lists.newArrayList(Either.forRight(gson.fromJson(object, MarkedString))) return Either.forLeft(value) } else { return Either.forRight(gson.fromJson(object, MarkupContent))