Mikhail Arkhipov (MikhailArkhipov) · Mar 28, 2019 · Mar 1, 2019 · Mar 1, 2019 · Mar 5, 2019 · Mar 5, 2019
diff --git a/src/Analysis/Ast/Impl/Documents/RunningDocumentTable.cs b/src/Analysis/Ast/Impl/Documents/RunningDocumentTable.cs
@@ -73,7 +73,13 @@ public IDocument OpenDocument(Uri uri, string content, string filePath = null) {
                 entry = FindDocument(null, uri);
                 if (entry == null) {
                     var resolver = _services.GetService<IPythonInterpreter>().ModuleResolution.CurrentPathResolver;
-                    var moduleType = resolver.IsLibraryFile(uri.ToAbsolutePath()) ? ModuleType.Library : ModuleType.User;
+
+                    var moduleType = ModuleType.User;
+                    var path = uri.ToAbsolutePath();
+                    if (Path.IsPathRooted(path)) {
+                        moduleType = resolver.IsLibraryFile(uri.ToAbsolutePath()) ? ModuleType.Library : ModuleType.User;
+                    }
+
                     var mco = new ModuleCreationOptions {
                         ModuleName = Path.GetFileNameWithoutExtension(uri.LocalPath),
                         Content = content,
@@ -205,7 +211,7 @@ private DocumentEntry CreateDocument(ModuleCreationOptions mco) {
                 case ModuleType.CompiledBuiltin:
                     document = new CompiledBuiltinPythonModule(mco.ModuleName, mco.Stub, _services);
                     break;
-                case ModuleType.User when TryAddModulePath(mco):
+                case ModuleType.User:
                 case ModuleType.Library when TryAddModulePath(mco):
                     document = new PythonModule(mco, _services);
                     break;

diff --git a/src/Analysis/Core/Impl/DependencyResolution/PathResolverSnapshot.cs b/src/Analysis/Core/Impl/DependencyResolution/PathResolverSnapshot.cs
@@ -694,8 +694,11 @@ private static Node UpdateNodesFromEnd(Edge lastEdge, Node newEnd) {
         }
 
         private bool TryFindModule(string modulePath, out Edge lastEdge, out StringSpan unmatchedPathSpan) {
+            lastEdge = default;
+            unmatchedPathSpan = default;
+
             if (!Path.IsPathRooted(modulePath)) {
-                throw new InvalidOperationException("Module path should be rooted");
+                return false;
             }
 
             var normalizedPath = PathUtils.NormalizePath(modulePath);

diff --git a/src/LanguageServer/Impl/Implementation/Server.Editor.cs b/src/LanguageServer/Impl/Implementation/Server.Editor.cs
@@ -38,10 +38,11 @@ public async Task<CompletionList> Completion(CompletionParams @params, Cancellat
             if(analysis != null) { 
                 var result = _completionSource.GetCompletions(analysis, @params.position);
                 res.items = result.Completions.ToArray();
+
+                await InvokeExtensionsAsync((ext, token)
+                    => (ext as ICompletionExtension)?.HandleCompletionAsync(analysis, @params.position, res.items.OfType<CompletionItemEx>().ToArray(), cancellationToken), cancellationToken);
             }
 
-            await InvokeExtensionsAsync((ext, token)
-                => (ext as ICompletionExtension)?.HandleCompletionAsync(analysis, @params.position, res.items.OfType<CompletionItemEx>().ToArray(), cancellationToken), cancellationToken);
             return res;
         }
 

diff --git a/src/LanguageServer/Test/CompletionTests.cs b/src/LanguageServer/Test/CompletionTests.cs
@@ -16,6 +16,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Microsoft.Python.Analysis;
@@ -1114,9 +1115,29 @@ public async Task NoCompletionForCurrentModuleName(bool empty) {
             var modulePath = TestData.GetNextModulePath();
             var code = empty ? string.Empty : $"{Path.GetFileNameWithoutExtension(modulePath)}.";
             var analysis = await GetAnalysisAsync(code, PythonVersions.LatestAvailable3X, null, modulePath);
+
             var cs = new CompletionSource(new PlainTextDocumentationSource(), ServerSettings.completion);
             var result = cs.GetCompletions(analysis, new SourceLocation(1, code.Length + 1));
             result.Should().NotContainLabels(analysis.Document.Name);
         }
+
+        [TestMethod, Priority(0)]
+        [Ignore]
+        public async Task OddNamedFile() {
+            const string code = @"
+import sys
+sys.
+";
+            var uri = await TestData.CreateTestSpecificFileAsync("a.b.py", code);
+            await CreateServicesAsync(PythonVersions.LatestAvailable3X, uri.AbsolutePath);
+            var rdt = Services.GetService<IRunningDocumentTable>();
+            var doc = rdt.OpenDocument(uri, null, uri.AbsolutePath);
+
+            var analysis = await doc.GetAnalysisAsync(Timeout.Infinite);
+            var cs = new CompletionSource(new PlainTextDocumentationSource(), ServerSettings.completion);
+
+            var completions = cs.GetCompletions(analysis, new SourceLocation(3, 5));
+            completions.Should().HaveLabels("argv", "path", "exit");
+        }
     }
 }
diff --git a/src/LanguageServer/Test/RdtTests.cs b/src/LanguageServer/Test/RdtTests.cs
@@ -147,6 +147,17 @@ public async Task OpenCloseAnalysis() {
             ds.Diagnostics[docLc3.Uri].Should().BeEmpty();
         }
 
+        [DataRow("a.b.py")]
+        [DataRow("a-b.py")]
+        [DataRow("01.py")]
+        [DataTestMethod, Priority(0)]
+        public async Task OpenOddNames(string fileName) {
+            var uri = await TestData.CreateTestSpecificFileAsync(fileName, "x = 1");
+
+            await CreateServicesAsync(PythonVersions.LatestAvailable3X, uri.AbsolutePath);
+            var rdt = Services.GetService<IRunningDocumentTable>();
+            rdt.OpenDocument(uri, null, uri.AbsolutePath);
+        }
 
         private void VerifyLockCount(IRunningDocumentTable rdt, Uri uri, int expected) {
             rdt.LockDocument(uri).Should().Be(expected + 1);