Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Add belongsTo edge and expand group #72

Merged
merged 3 commits into from
Jan 28, 2021
Merged

fix: Add belongsTo edge and expand group #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9575c40
Add `belongsTo` edge to connect project vertex and group vertex
CsCherrYY Jan 28, 2021
646a0e0
Format file
CsCherrYY Jan 28, 2021
942b2a9
Remove redundant empty line
CsCherrYY Jan 28, 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
4 changes: 4 additions & 0 deletions ...crosoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/indexer/EdgeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,8 @@ public Edge packageInformation(Vertex from, Vertex to) {
public Edge diagnostic(Vertex from, Vertex to) {
return new Edge(generator.next(), Edge.T_DIAGNOSTIC, from.getId(), to.getId());
}

public Edge belongsTo(Vertex from, Vertex to) {
return new Edge(generator.next(), Edge.BELONGSTO, from.getId(), to.getId());
}
}
17 changes: 11 additions & 6 deletions com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/indexer/Indexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@ private void buildIndex(IPath path, IProgressMonitor monitor, LsifService lsif)

final ExecutorService threadPool = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());

Group groupVertex = lsif.getVertexBuilder().group(ResourceUtils.fixURI(path.toFile().toURI()),
ConflictResolution.TAKEDB, path.lastSegment(), ResourceUtils.fixURI(path.toFile().toURI()));
LsifEmitter.getInstance().emit(groupVertex);
LsifEmitter.getInstance().emit(
lsif.getVertexBuilder().event(Event.EventScope.Group, Event.EventKind.BEGIN, groupVertex.getId()));

for (IProject proj : projects) {
if (proj == null) {
return;
Expand All @@ -116,26 +122,25 @@ private void buildIndex(IPath path, IProgressMonitor monitor, LsifService lsif)
// ProjectConnection.getModel
JavaLanguageServerPlugin.logException(e.getMessage(), e);
}
Group groupVertex = lsif.getVertexBuilder().group(ResourceUtils.fixURI(path.toFile().toURI()), ConflictResolution.TAKEDB, javaProject.getElementName(), ResourceUtils.fixURI(path.toFile().toURI()));
LsifEmitter.getInstance().emit(groupVertex);
LsifEmitter.getInstance().emit(
lsif.getVertexBuilder().event(Event.EventScope.Group, Event.EventKind.BEGIN, groupVertex.getId()));

Project projVertex = lsif.getVertexBuilder().project(javaProject.getElementName());
LsifEmitter.getInstance().emit(projVertex);
LsifEmitter.getInstance().emit(
lsif.getVertexBuilder().event(Event.EventScope.Project, Event.EventKind.BEGIN, projVertex.getId()));

LsifEmitter.getInstance().emit(lsif.getEdgeBuilder().belongsTo(projVertex, groupVertex));
List<ICompilationUnit> sourceList = getAllSourceFiles(javaProject);

dumpParallelly(sourceList, threadPool, projVertex, lsif, hasPackageInformation, monitor);

VisitorUtils.endAllDocument(lsif);
LsifEmitter.getInstance().emit(
lsif.getVertexBuilder().event(Event.EventScope.Project, Event.EventKind.END, projVertex.getId()));
LsifEmitter.getInstance().emit(
lsif.getVertexBuilder().event(Event.EventScope.Group, Event.EventKind.END, groupVertex.getId()));
}

LsifEmitter.getInstance()
.emit(lsif.getVertexBuilder().event(Event.EventScope.Group, Event.EventKind.END, groupVertex.getId()));

threadPool.shutdown();
}

Expand Down
2 changes: 2 additions & 0 deletions com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/protocol/Edge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ public class Edge extends Element {

public final static String PACKAGEINFORMATION = "packageInformation";

public final static String BELONGSTO = "belongsTo";

private String outV;

private String inV;
Expand Down