From ea3c93399d6c36f568cbbd8596090b22110bf99f Mon Sep 17 00:00:00 2001 From: Sheng Chen Date: Mon, 15 Jul 2019 16:20:46 +0800 Subject: [PATCH] fix: Update the implementation to align with the v3 protocol --- .../microsoft/java/lsif/core/internal/IConstant.java | 2 +- .../lsif/core/internal/protocol/DefinitionResult.java | 10 ++++++---- .../lsif/core/internal/protocol/ReferenceItem.java | 6 +++--- .../java/lsif/core/internal/protocol/SymbolData.java | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/IConstant.java b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/IConstant.java index 5712d8c..bc057d6 100644 --- a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/IConstant.java +++ b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/IConstant.java @@ -16,5 +16,5 @@ private IConstant() { public final static String DEFAULT_LSIF_FILE_NAME = "lsif.json"; - public final static String LSIF_FORMAT_VERSION = "0.1.0"; + public final static String LSIF_FORMAT_VERSION = "0.3.0"; } diff --git a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/protocol/DefinitionResult.java b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/protocol/DefinitionResult.java index 3b6b4eb..ea41fac 100644 --- a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/protocol/DefinitionResult.java +++ b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/protocol/DefinitionResult.java @@ -5,17 +5,19 @@ package com.microsoft.java.lsif.core.internal.protocol; +import java.util.Arrays; +import java.util.List; + public class DefinitionResult extends Vertex { - // TODO: Support bag result. - private String result; + private List result; public DefinitionResult(String id, String result) { super(id, Vertex.DEFINITIONRESULT); - this.result = result; + this.result = Arrays.asList(result); } - public String getResult() { + public List getResult() { return this.result; } } diff --git a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/protocol/ReferenceItem.java b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/protocol/ReferenceItem.java index c071a8e..8f8f701 100644 --- a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/protocol/ReferenceItem.java +++ b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/protocol/ReferenceItem.java @@ -7,11 +7,11 @@ public class ReferenceItem extends Edge { - public final static String DECLARATION = "declaration"; + public final static String DECLARATIONS = "declarations"; - public final static String DEFINITION = "definition"; + public final static String DEFINITIONS = "definitions"; - public final static String REFERENCE = "reference"; + public final static String REFERENCES = "references"; private String property; diff --git a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/protocol/SymbolData.java b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/protocol/SymbolData.java index 37e1580..64cc158 100644 --- a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/protocol/SymbolData.java +++ b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/protocol/SymbolData.java @@ -100,7 +100,7 @@ synchronized public void resolveReference(LsifService lsif, Document sourceDocum if (!VisitorUtils.isDefinitionItself(sourceDocument, sourceRange, definitionDocument, definitionRange)) { LsifEmitter.getInstance() .emit(lsif.getEdgeBuilder().referenceItem(this.referenceResult, - sourceRange, ReferenceItem.REFERENCE)); + sourceRange, ReferenceItem.REFERENCES)); } }