diff options
| author | Stephan Herrmann | 2018-02-08 04:45:08 +0000 |
|---|---|---|
| committer | Manoj Palat | 2018-02-08 08:52:41 +0000 |
| commit | 078507813cb8fb0834f7721498d7ae004e43090e (patch) | |
| tree | 349e568e38c5c4b75010ac281b361545f86ee998 /org.eclipse.jdt.core/codeassist | |
| parent | bf3881160a8c2cad0003a22cceb7074496967f3b (diff) | |
| download | eclipse.jdt.core-078507813cb8fb0834f7721498d7ae004e43090e.tar.gz eclipse.jdt.core-078507813cb8fb0834f7721498d7ae004e43090e.tar.xz eclipse.jdt.core-078507813cb8fb0834f7721498d7ae004e43090e.zip | |
fix for bug 519417 [9][completion] should propose types & packagesM20180214-1700M20180214-0500M20180213-0600
exported from required modules
Also-by: Manoj Palat <manpalat@in.ibm.com>
Diffstat (limited to 'org.eclipse.jdt.core/codeassist')
| -rw-r--r-- | org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java index 8a54c2ef38..784d07330b 100644 --- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java +++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java @@ -8164,7 +8164,11 @@ public final class CompletionEngine setSourceRange( importReference.sourceStart, importReference.declarationSourceEnd); - this.nameEnvironment.findPackages(importName, this); + try { + this.nameEnvironment.findPackages(importName, this, this.javaProject.getAllPackageFragmentRoots(), true); + } catch (JavaModelException e) { + // silent + } setSourceRange( oldStart, oldEnd - 1, @@ -10732,7 +10736,7 @@ public final class CompletionEngine private void findPackagesInCurrentModule() { try { IPackageFragmentRoot[] moduleRoots = SearchableEnvironment.getOwnedPackageFragmentRoots(this.javaProject); - this.nameEnvironment.findPackages(CharOperation.toLowerCase(this.completionToken), this, moduleRoots); + this.nameEnvironment.findPackages(CharOperation.toLowerCase(this.completionToken), this, moduleRoots, false); } catch (JavaModelException e) { // silent } @@ -10744,7 +10748,11 @@ public final class CompletionEngine setSourceRange(packageStatement.sourceStart, packageStatement.sourceEnd); long completionPosition = packageStatement.sourcePositions[packageStatement.sourcePositions.length - 1]; setTokenRange((int) (completionPosition >>> 32), (int) completionPosition); - this.nameEnvironment.findPackages(CharOperation.toLowerCase(this.completionToken), this); + try { + this.nameEnvironment.findPackages(CharOperation.toLowerCase(this.completionToken), this, this.javaProject.getAllPackageFragmentRoots(), true); + } catch (JavaModelException e) { + // silent + } } private void findParameterizedType(TypeReference ref, Scope scope) { |