From 5655e6f3d00c8b1028f3b843486fa6c610af704f Mon Sep 17 00:00:00 2001 From: Shi Chen Date: Tue, 7 Dec 2021 14:37:51 +0800 Subject: [PATCH 1/2] correct BeginededDocuments --- .../microsoft/java/lsif/core/internal/indexer/Repository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/indexer/Repository.java b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/indexer/Repository.java index f53b43e..a4e7de6 100644 --- a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/indexer/Repository.java +++ b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/indexer/Repository.java @@ -162,7 +162,7 @@ public void removeFromBeginededDocuments(String uri) { } public ArrayList getAllBeginededDocuments() { - return new ArrayList<>(this.documentMap.values()); + return new ArrayList<>(this.beginededDocumentMap.values()); } private void addDocument(Document doc) { From fbe73e11b09636baafecf6898cdecf793c623cc1 Mon Sep 17 00:00:00 2001 From: Shi Chen Date: Tue, 7 Dec 2021 16:48:18 +0800 Subject: [PATCH 2/2] refine wording --- .../lsif/core/internal/indexer/Repository.java | 16 ++++++++-------- .../core/internal/visitors/VisitorUtils.java | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/indexer/Repository.java b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/indexer/Repository.java index a4e7de6..5c7cec5 100644 --- a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/indexer/Repository.java +++ b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/indexer/Repository.java @@ -54,7 +54,7 @@ public class Repository { // Key: documentURI // Value: Document object - private Map beginededDocumentMap = new ConcurrentHashMap<>(); + private Map begunDocumentMap = new ConcurrentHashMap<>(); // Key: groupId + artifactId // Value: PackageInformation @@ -86,7 +86,7 @@ public synchronized Document enlistDocument(LsifService service, String uri, Pro targetDocument = service.getVertexBuilder().document(uri); addDocument(targetDocument); LsifEmitter.getInstance().emit(targetDocument); - addToBeginededDocuments(targetDocument); + addToBegunDocuments(targetDocument); LsifEmitter.getInstance().emit(service.getVertexBuilder().event(Event.EventScope.DOCUMENT, Event.EventKind.BEGIN, targetDocument.getId())); LsifEmitter.getInstance().emit(service.getEdgeBuilder().contains(projVertex, targetDocument)); @@ -153,16 +153,16 @@ public synchronized MavenProject enlistMavenProject(LsifService lsif, IPath path return enlistMavenProject(lsif, pomFile); } - public void addToBeginededDocuments(Document doc) { - this.beginededDocumentMap.put(doc.getUri(), doc); + public void addToBegunDocuments(Document doc) { + this.begunDocumentMap.put(doc.getUri(), doc); } - public void removeFromBeginededDocuments(String uri) { - this.beginededDocumentMap.remove(uri); + public void removeFromBegunDocuments(String uri) { + this.begunDocumentMap.remove(uri); } - public ArrayList getAllBeginededDocuments() { - return new ArrayList<>(this.beginededDocumentMap.values()); + public ArrayList getAllBegunDocuments() { + return new ArrayList<>(this.begunDocumentMap.values()); } private void addDocument(Document doc) { diff --git a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/VisitorUtils.java b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/VisitorUtils.java index b8bf67b..cec077b 100644 --- a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/VisitorUtils.java +++ b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/VisitorUtils.java @@ -166,13 +166,13 @@ public static void emitHoverResult(Hover hover, LsifService lsif, ResultSet resu } public static void endDocument(LsifService lsif, Document doc) { - Repository.getInstance().removeFromBeginededDocuments(doc.getUri()); + Repository.getInstance().removeFromBegunDocuments(doc.getUri()); LsifEmitter.getInstance() .emit(lsif.getVertexBuilder().event(Event.EventScope.DOCUMENT, Event.EventKind.END, doc.getId())); } public static void endAllDocument(LsifService lsif) { - for (Document doc : Repository.getInstance().getAllBeginededDocuments()) { + for (Document doc : Repository.getInstance().getAllBegunDocuments()) { endDocument(lsif, doc); } }