Skip to content

Add import on completion #167

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

Closed
wants to merge 3 commits into from
Closed

Add import on completion #167

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
1828d42
add import on completion
rafaeldeoliveira Sep 4, 2020
1f6c3b7
check if import exists
rafaeldeoliveira Oct 13, 2020
9e98b4f
fix: wrong key value, its a map of Path, not URI
rafaeldeoliveira Oct 13, 2020
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: 3 additions & 1 deletion src/main/java/org/javacs/CompilerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ public interface CompilerProvider {
CompileTask compile(Path... files);

CompileTask compile(Collection<? extends JavaFileObject> sources);


boolean containsImport(Path file, String className);

Path NOT_FOUND = Paths.get("");
}
5 changes: 2 additions & 3 deletions src/main/java/org/javacs/FileStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,8 @@ static InputStream inputStream(Path file) {
}

static BufferedReader bufferedReader(Path file) {
var uri = file.toUri();
if (activeDocuments.containsKey(uri)) {
var string = activeDocuments.get(uri).content;
if (activeDocuments.containsKey(file)) {
var string = activeDocuments.get(file).content;
return new BufferedReader(new StringReader(string));
}
try {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/javacs/JavaCompilerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ public List<String> packagePrivateTopLevelTypes(String packageName) {
return List.of("TODO");
}

private boolean containsImport(Path file, String className) {
public boolean containsImport(Path file, String className) {
var packageName = packageName(className);
if (FileStore.packageName(file).equals(packageName)) return true;
var star = packageName + ".*";
Expand Down
34 changes: 24 additions & 10 deletions src/main/java/org/javacs/completion/CompletionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
Expand Down Expand Up @@ -45,6 +46,8 @@
import org.javacs.lsp.CompletionItemKind;
import org.javacs.lsp.CompletionList;
import org.javacs.lsp.InsertTextFormat;
import org.javacs.lsp.TextEdit;
import org.javacs.rewrite.AddImport;

public class CompletionProvider {
private final CompilerProvider compiler;
Expand Down Expand Up @@ -153,15 +156,15 @@ private CompletionList compileAndComplete(Path file, String contents, long curso
var path = new FindCompletionsAt(task.task).scan(task.root(), cursor);
switch (path.getLeaf().getKind()) {
case IDENTIFIER:
return completeIdentifier(task, path, partial, endsWithParen);
return completeIdentifier(task, path, partial, endsWithParen, file);
case MEMBER_SELECT:
return completeMemberSelect(task, path, partial, endsWithParen);
case MEMBER_REFERENCE:
return completeMemberReference(task, path, partial);
case SWITCH:
return completeSwitchConstant(task, path, partial);
case IMPORT:
return completeImport(qualifiedPartialIdentifier(contents, (int) cursor));
return completeImport(qualifiedPartialIdentifier(contents, (int) cursor), file);
default:
var list = new CompletionList();
addKeywords(path, partial, list);
Expand Down Expand Up @@ -229,13 +232,13 @@ private boolean isQualifiedIdentifierChar(char c) {
return c == '.' || Character.isJavaIdentifierPart(c);
}

private CompletionList completeIdentifier(CompileTask task, TreePath path, String partial, boolean endsWithParen) {
private CompletionList completeIdentifier(CompileTask task, TreePath path, String partial, boolean endsWithParen, Path file) {
LOG.info("...complete identifiers");
var list = new CompletionList();
list.items = completeUsingScope(task, path, partial, endsWithParen);
addStaticImports(task, path.getCompilationUnit(), partial, endsWithParen, list);
if (!list.isIncomplete && partial.length() > 0 && Character.isUpperCase(partial.charAt(0))) {
addClassNames(path.getCompilationUnit(), partial, list);
addClassNames(path.getCompilationUnit(), partial, list, file);
}
addKeywords(path, partial, list);
return list;
Expand Down Expand Up @@ -332,13 +335,13 @@ private boolean memberMatchesImport(Name staticImport, Element member) {
return staticImport.contentEquals("*") || staticImport.contentEquals(member.getSimpleName());
}

private void addClassNames(CompilationUnitTree root, String partial, CompletionList list) {
private void addClassNames(CompilationUnitTree root, String partial, CompletionList list, Path file) {
var packageName = Objects.toString(root.getPackageName(), "");
var uniques = new HashSet<String>();
var previousSize = list.items.size();
for (var className : compiler.packagePrivateTopLevelTypes(packageName)) {
if (!StringSearch.matchesPartialName(className, partial)) continue;
list.items.add(classItem(className));
list.items.add(classItem(className, file));
uniques.add(className);
}
for (var className : compiler.publicTopLevelTypes()) {
Expand All @@ -348,7 +351,7 @@ private void addClassNames(CompilationUnitTree root, String partial, CompletionL
list.isIncomplete = true;
break;
}
list.items.add(classItem(className));
list.items.add(classItem(className, file));
uniques.add(className);
}
LOG.info("...found " + (list.items.size() - previousSize) + " class names");
Expand Down Expand Up @@ -545,7 +548,7 @@ private CompletionList completeSwitchConstant(CompileTask task, TreePath path, S
return new CompletionList(false, list);
}

private CompletionList completeImport(String path) {
private CompletionList completeImport(String path, Path file) {
LOG.info("...complete import");
var names = new HashSet<String>();
var list = new CompletionList();
Expand All @@ -559,7 +562,7 @@ private CompletionList completeImport(String path) {
names.add(segment);
var isClass = end == path.length();
if (isClass) {
list.items.add(classItem(className));
list.items.add(classItem(className, file));
} else {
list.items.add(packageItem(segment));
}
Expand All @@ -579,8 +582,19 @@ private CompletionItem packageItem(String name) {
return i;
}

private CompletionItem classItem(String className) {
private CompletionItem classItem(String className, Path file) {
var i = new CompletionItem();

i.additionalTextEdits = new ArrayList<>();

if (!compiler.containsImport(file, className)) {
var add = new AddImport(file, className);
TextEdit[] edits = add.rewrite(compiler).get(file);
if (edits != null) {
Collections.addAll(i.additionalTextEdits, edits);
}
}

i.label = simpleName(className).toString();
i.kind = CompletionItemKind.Class;
i.detail = className;
Expand Down