CompletionProvider: handle null enclosing module (closes #85)

Co-authored-by: wise-coders <[email protected]>
GroovyLanguageServer · Jun 17, 2024 · 11b8b5f · 11b8b5f
1 parent 81fcbf2
commit 11b8b5f
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/main/java/net/prominic/groovyls/providers/CompletionProvider.java b/src/main/java/net/prominic/groovyls/providers/CompletionProvider.java
@@ -153,9 +153,11 @@ private void populateItemsFromImportNode(ImportNode importNode, Position positio
 
 		ModuleNode enclosingModule = (ModuleNode) GroovyASTUtils.getEnclosingNodeOfType(importNode, ModuleNode.class,
 				ast);
-		String enclosingPackageName = enclosingModule.getPackageName();
-		List<String> importNames = enclosingModule.getImports().stream()
-				.map(otherImportNode -> otherImportNode.getClassName()).collect(Collectors.toList());
+
+		String enclosingPackageName = enclosingModule != null ? enclosingModule.getPackageName() : null;
+		List<String> importNames = enclosingModule != null ? enclosingModule.getImports().stream()
+				.map(otherImportNode -> otherImportNode.getClassName()).collect(Collectors.toList())
+				: Collections.emptyList();
 
 		List<CompletionItem> localClassItems = ast.getClassNodes().stream().filter(classNode -> {
 			String packageName = classNode.getPackageName();
@@ -408,9 +410,11 @@ private void populateTypes(ASTNode offsetNode, String namePrefix, Set<String> ex
 
 		ModuleNode enclosingModule = (ModuleNode) GroovyASTUtils.getEnclosingNodeOfType(offsetNode, ModuleNode.class,
 				ast);
-		String enclosingPackageName = enclosingModule.getPackageName();
-		List<String> importNames = enclosingModule.getImports().stream().map(importNode -> importNode.getClassName())
-				.collect(Collectors.toList());
+		String enclosingPackageName = enclosingModule != null ? enclosingModule.getPackageName() : null;
+		List<String> importNames = enclosingModule != null
+				? enclosingModule.getImports().stream().map(importNode -> importNode.getClassName())
+						.collect(Collectors.toList())
+				: Collections.emptyList();
 
 		List<CompletionItem> localClassItems = ast.getClassNodes().stream().filter(classNode -> {
 			if (isIncomplete) {