Skip to content
This repository was archived by the owner on Jun 15, 2026. It is now read-only.

fix: Duplicate end events for a document vertex#93

Merged
Shi Chen (CsCherrYY) merged 2 commits into from
Dec 7, 2021
Merged

fix: Duplicate end events for a document vertex #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5655e6f
correct BeginededDocuments
CsCherrYY Dec 7, 2021
fbe73e1
refine wording
CsCherrYY Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ...icrosoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/indexer/Repository.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ public class Repository {

// Key: documentURI
// Value: Document object
private Map<String, Document> beginededDocumentMap = new ConcurrentHashMap<>();
private Map<String, Document> begunDocumentMap = new ConcurrentHashMap<>();

// Key: groupId + artifactId
// Value: PackageInformation
Expand DownExpand Up@@ -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));
Expand DownExpand Up@@ -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<Document> getAllBeginededDocuments() {
return new ArrayList<>(this.documentMap.values());
public ArrayList<Document> getAllBegunDocuments() {
return new ArrayList<>(this.begunDocumentMap.values());
}

private void addDocument(Document doc) {
Expand Down
4 changes: 2 additions & 2 deletions ...osoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/VisitorUtils.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
}
}
Expand Down