Merge pull request #103 from MikhailArkhipov/enc

Add ability to get document content from API

Author: Mikhail Arkhipov

src/Analysis/Engine/Impl/Definitions/IProjectEntry.cs

@@ -45,5 +45,12 @@ public interface IProjectEntry : IAnalyzable, IVersioned, IDisposable {
         Dictionary<object, object> Properties { get; }
 
         IModuleContext AnalysisContext { get; }
+
+        /// <summary>
+        /// Document object corresponding to the entry.
+        /// Can be null for entries that are not user documents
+        /// such as modules.
+        /// </summary>
+        IDocument Document { get; }
     }
 }

src/Analysis/Engine/Impl/Interpreter/Ast/AstPythonModule.cs

@@ -185,8 +185,8 @@ public string Documentation {
         public IModuleContext AnalysisContext => null;
         public bool IsAnalyzed => true;
         public void Analyze(CancellationToken cancel) { }
-
         public IEnumerable<string> ParseErrors { get; }
+        public IDocument Document => null;
 
         private static IEnumerable<string> GetChildModules(string filePath, string prefix, IPythonInterpreter interpreter) {
             if (interpreter == null || string.IsNullOrEmpty(filePath)) {

src/Analysis/Engine/Impl/ProjectEntry.cs

@@ -320,6 +320,7 @@ where lastDot > 0
 
         public IGroupableAnalysisProject AnalysisGroup => ProjectState;
 
+        #region IPythonProjectEntry
         public IModuleAnalysis Analysis { get; private set; }
 
         public string FilePath { get; }
@@ -340,6 +341,9 @@ where lastDot > 0
 
         public Dictionary<object, object> Properties { get; } = new Dictionary<object, object>();
 
+        public IDocument Document => this;
+        #endregion
+
         public void Dispose() {
             lock (this) {
                 AnalysisVersion = -1;

src/Analysis/Engine/Test/AnalysisTest.cs

@@ -4403,7 +4403,7 @@ class oar(list):
                 var completions = await server.SendCompletion(uri, 2, 8);
 
                 completions.Should().HaveItem("append")
-                    .Which.Should().HaveInsertText("append(self, value):\r\n\treturn super(oar, self).append(value)");
+                    .Which.Should().HaveInsertText("append(self, value):\r\n    return super(oar, self).append(value)");
             }
         }
 
@@ -4419,7 +4419,7 @@ class oar(list):
                 var completions = await server.SendCompletion(uri, 2, 8);
 
                 completions.Should().HaveItem("append")
-                    .Which.Should().HaveInsertText("append(self, value):\r\n\treturn super().append(value)");
+                    .Which.Should().HaveInsertText("append(self, value):\r\n    return super().append(value)");
             }
         }
 

src/LanguageServer/Impl/Definitions/IPythonLanguageServer.cs

@@ -15,6 +15,7 @@
 // permissions and limitations under the License.
 
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.PythonTools.Analysis;
@@ -27,5 +28,7 @@ public interface IPythonLanguageServer : IPythonLanguageServerProtocol {
         PythonAst GetCurrentAst(Uri documentUri);
         Task<PythonAst> GetAstAsync(Uri documentUri, CancellationToken token);
         Task<IModuleAnalysis> GetAnalysisAsync(Uri documentUri, CancellationToken token);
+        IProjectEntry GetProjectEntry(Uri documentUri);
+        IEnumerable<string> GetLoadedFiles();
     }
 }

src/LanguageServer/Impl/Implementation/CompletionAnalysis.cs

@@ -899,9 +899,7 @@ private string MakeOverrideCompletionString(string indentation, IOverloadResult
             var sb = new StringBuilder();
 
             sb.AppendLine(result.Name + "(" + string.Join(", ", result.Parameters.Select((p, i) => GetSafeParameterName(p, i))) + "):");
-
             sb.Append(indentation);
-            sb.Append('\t');
 
             if (result.Parameters.Length > 0) {
                 var parameterString = string.Join(", ", result.Parameters.Skip(1).Select((p, i) => GetSafeArgumentName(p, i + 1)));

src/LanguageServer/Impl/Implementation/ProjectFiles.cs

@@ -51,7 +51,6 @@ public IEnumerable<string> GetLoadedFiles() {
             return _projectFiles.Keys.Select(k => k.AbsoluteUri);
         }
 
-        public IProjectEntry GetEntry(TextDocumentIdentifier document) => GetEntry(document.uri);
         public IProjectEntry GetEntry(Uri documentUri, bool throwIfMissing = true) {
             ThrowIfDisposed();
 
@@ -65,7 +64,7 @@ public IProjectEntry GetEntry(Uri documentUri, bool throwIfMissing = true) {
         public void GetEntry(TextDocumentIdentifier document, int? expectedVersion, out ProjectEntry entry, out PythonAst tree) {
             ThrowIfDisposed();
 
-            entry = GetEntry(document) as ProjectEntry;
+            entry = GetEntry(document.uri) as ProjectEntry;
             if (entry == null) {
                 throw new LanguageServerException(LanguageServerException.UnsupportedDocumentType, "unsupported document");
             }

src/LanguageServer/Impl/Implementation/Server.WorkspaceSymbols.cs

@@ -45,7 +45,7 @@ await GetModuleVariablesAsync(entry as ProjectEntry, opts, @params.query, 50, to
 
         public override async Task<SymbolInformation[]> DocumentSymbol(DocumentSymbolParams @params, CancellationToken token) {
             var opts = GetMemberOptions.ExcludeBuiltins | GetMemberOptions.DeclaredOnly;
-            var entry = ProjectFiles.GetEntry(@params.textDocument);
+            var entry = ProjectFiles.GetEntry(@params.textDocument.uri);
 
             var members = await GetModuleVariablesAsync(entry as ProjectEntry, opts, string.Empty, 50, token);
             return members
@@ -57,7 +57,7 @@ public override async Task<SymbolInformation[]> DocumentSymbol(DocumentSymbolPar
 
         public override async Task<DocumentSymbol[]> HierarchicalDocumentSymbol(DocumentSymbolParams @params, CancellationToken cancellationToken) {
             var opts = GetMemberOptions.ExcludeBuiltins | GetMemberOptions.DeclaredOnly;
-            var entry = ProjectFiles.GetEntry(@params.textDocument);
+            var entry = ProjectFiles.GetEntry(@params.textDocument.uri);
 
             var members = await GetModuleVariablesAsync(entry as ProjectEntry, opts, string.Empty, 50, cancellationToken);
             return ToDocumentSymbols(members);

src/LanguageServer/Impl/Implementation/Server.cs

@@ -361,6 +361,7 @@ public Task<IModuleAnalysis> GetAnalysisAsync(Uri documentUri, CancellationToken
             return entry.GetAnalysisAsync(Timeout.Infinite, token);
         }
 
+        public IProjectEntry GetProjectEntry(Uri documentUri) => ProjectFiles.GetEntry(documentUri);
         #endregion
 
         #region Private Helpers