IllegalArgumentException in JDTUtils.getPackageName

Signed-off-by: Snjezana Peco <[email protected]>
eclipse-jdtls · Oct 2, 2017 · d70d4bf · d70d4bf
1 parent 5fb9d1e
commit d70d4bf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/JDTUtils.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/JDTUtils.java
@@ -195,7 +195,7 @@ public static String getPackageName(IJavaProject javaProject, URI uri) {
 			if (content.isEmpty() && javaProject != null && ProjectsManager.DEFAULT_PROJECT_NAME.equals(javaProject.getProject().getName())) {
 				java.nio.file.Path path = Paths.get(uri);
 				java.nio.file.Path parent = path;
-				while (parent.getParent() != null) {
+				while (parent.getParent() != null && parent.getParent().getNameCount() > 0) {
 					parent = parent.getParent();
 					String name = parent.getName(parent.getNameCount() - 1).toString();
 					if (SRC.equals(name)) {

diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CompletionHandler.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CompletionHandler.java
@@ -17,6 +17,7 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.jdt.core.CompletionProposal;
+import org.eclipse.jdt.core.IBuffer;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.ls.core.internal.JDTUtils;
@@ -74,8 +75,11 @@ private List<CompletionItem> computeContentAssist(ICompilationUnit unit, int lin
 		collector.setAllowsRequiredProposals(CompletionProposal.TYPE_REF, CompletionProposal.TYPE_REF, true);
 
 		if (offset >-1 && !monitor.isCanceled()) {
-			unit.codeComplete(offset, collector, monitor);
-			proposals.addAll(collector.getCompletionItems());
+			IBuffer buffer = unit.getBuffer();
+			if (buffer != null && buffer.getLength() >= offset) {
+				unit.codeComplete(offset, collector, monitor);
+				proposals.addAll(collector.getCompletionItems());
+			}
 		}
 
 		return proposals;

diff --git a/org.eclipse.jdt.ls.tests/projects/eclipse/hello/Foo.java b/org.eclipse.jdt.ls.tests/projects/eclipse/hello/Foo.java
diff --git a/org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/JDTUtilsTest.java b/org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/JDTUtilsTest.java
@@ -70,6 +70,14 @@ public void testGetPackageNameURI() throws Exception {
 		assertEquals("java", packageName);
 	}
 
+	@Test
+	public void testGetPackageNameNoSrc() throws Exception {
+		URI uri = Paths.get("projects", "eclipse", "hello", "Foo.java").toUri();
+		ICompilationUnit cu = JDTUtils.resolveCompilationUnit(uri.toString());
+		String packageName = JDTUtils.getPackageName(cu.getJavaProject(), uri);
+		assertEquals("", packageName);
+	}
+
 	@Test
 	public void testResolveStandaloneCompilationUnit() throws CoreException {
 		Path helloSrcRoot = Paths.get("projects", "eclipse", "hello", "src").toAbsolutePath();