Mikhail Arkhipov (MikhailArkhipov) · Apr 17, 2019 · Mar 1, 2019 · Mar 1, 2019 · Mar 5, 2019 · Mar 5, 2019
diff --git a/src/LanguageServer/Impl/Completion/ImportCompletion.cs b/src/LanguageServer/Impl/Completion/ImportCompletion.cs
@@ -135,8 +135,11 @@ public static CompletionResult GetCompletionsInFromImport(FromImportStatement fr
 
         private static IEnumerable<CompletionItem> GetAllImportableModules(CompletionContext context) {
             var mres = context.Analysis.Document.Interpreter.ModuleResolution;
-            var modules = mres.CurrentPathResolver.GetAllModuleNames().Distinct();
-            return modules.Select(n => CompletionItemSource.CreateCompletionItem(n, CompletionItemKind.Module));
+            var modules = mres.CurrentPathResolver.GetAllModuleNames();
+            return modules
+                .Where(n => !string.IsNullOrEmpty(n))
+                .Distinct()
+                .Select(n => CompletionItemSource.CreateCompletionItem(n, CompletionItemKind.Module));
         }
 
         private static CompletionResult GetResultFromImportSearch(IImportSearchResult importSearchResult, CompletionContext context, bool prependStar, SourceSpan? applicableSpan = null) {
@@ -164,7 +167,9 @@ private static CompletionResult GetResultFromImportSearch(IImportSearchResult im
             }
 
             if (module != null) {
-                completions.AddRange(module.GetMemberNames().Select(n => context.ItemSource.CreateCompletionItem(n, module?.GetMember(n))));
+                completions.AddRange(module.GetMemberNames()
+                    .Where(n => !string.IsNullOrEmpty(n))
+                    .Select(n => context.ItemSource.CreateCompletionItem(n, module.GetMember(n))));
             }
 
             if (importSearchResult is IImportChildrenSource children) {
@@ -187,23 +192,6 @@ private static CompletionResult GetResultFromImportSearch(IImportSearchResult im
             return new CompletionResult(completions, applicableSpan);
         }
 
-        private static IReadOnlyList<CompletionItem> GetChildModules(string[] names, CompletionContext context) {
-            if (!names.Any()) {
-                return Array.Empty<CompletionItem>();
-            }
-
-            var mres = context.Analysis.Document.Interpreter.ModuleResolution;
-            var fullName = string.Join(".", names.Take(names.Length - 1));
-
-            var import = mres.CurrentPathResolver.GetModuleImportFromModuleName(fullName);
-            if (string.IsNullOrEmpty(import?.ModulePath)) {
-                return Array.Empty<CompletionItem>();
-            }
-
-            var packages = mres.GetPackagesFromDirectory(Path.GetDirectoryName(import.ModulePath));
-            return packages.Select(n => CompletionItemSource.CreateCompletionItem(n, CompletionItemKind.Module)).ToArray();
-        }
-
         private static IEnumerable<(T1, T2)> ZipLongest<T1, T2>(IEnumerable<T1> src1, IEnumerable<T2> src2) {
             using (var e1 = src1?.GetEnumerator())
             using (var e2 = src2?.GetEnumerator()) {