Merge branch 'master' of https://github.com/Microsoft/python-language-server into depth

Author: MikhailArkhipov

LICENSE

@@ -186,7 +186,7 @@ Apache License
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright (c) 2018 Microsoft Corporation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

src/Analysis/Engine/Impl/Analyzer/FunctionAnalysisUnit.cs

@@ -109,17 +109,21 @@ private bool ProcessAbstractDecorators(IAnalysisSet decorator) {
                 switch (d.Name) {
                     case "abstractmethod":
                         res = true;
+                        Function.IsAbstract = true;
                         break;
                     case "abstractstaticmethod":
                         Function.IsStatic = true;
+                        Function.IsAbstract = true;
                         res = true;
                         break;
                     case "abstractclassmethod":
                         Function.IsClassMethod = true;
+                        Function.IsAbstract = true;
                         res = true;
                         break;
                     case "abstractproperty":
                         Function.IsProperty = true;
+                        Function.IsAbstract = true;
                         res = true;
                         break;
                 }

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

@@ -40,6 +40,6 @@ public struct Position {
         public static bool operator >(Position p1, Position p2) => p1.line > p2.line || p1.line == p2.line && p1.character > p2.character;
         public static bool operator <(Position p1, Position p2) => p1.line < p2.line || p1.line == p2.line && p1.character < p2.character;
 
-        public override string ToString() => ((SourceLocation)this).ToString();
+        public override string ToString() => $"({line}, {character})";
     }
 }

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

@@ -24,6 +24,6 @@ public struct Range {
         public static implicit operator SourceSpan(Range r) => new SourceSpan(r.start, r.end);
         public static implicit operator Range(SourceSpan span) => new Range { start = span.Start, end = span.End };
 
-        public override string ToString() => ((SourceSpan)this).ToString();
+        public override string ToString() => $"{start} - {end}";
     }
 }

src/Analysis/Engine/Impl/Infrastructure/Extensions/StringBuilderExtensions.cs

@@ -25,19 +25,19 @@ public static StringBuilder TrimEnd(this StringBuilder sb) {
             return sb;
         }
 
-        public static StringBuilder EnsureEndsWithSpace(this StringBuilder sb, int count = 1, bool allowLeading = false) {
-            if (sb.Length == 0 && !allowLeading) {
+        public static StringBuilder EnsureEndsWithWhiteSpace(this StringBuilder sb, int whiteSpaceCount = 1) {
+            if (sb.Length == 0) {
                 return sb;
             }
 
-            for (var i = sb.Length - 1; i >= 0 && char.IsWhiteSpace(sb[i]); i--) {
-                count--;
+            for (var i = sb.Length - 1; i >= 0 && whiteSpaceCount > 0 && char.IsWhiteSpace(sb[i]); i--) {
+                whiteSpaceCount--;
             }
 
-            if (count > 0) {
-                sb.Append(new string(' ', count));
+            if (whiteSpaceCount > 0) {
+                sb.Append(' ', whiteSpaceCount);
             }
-
+            
             return sb;
         }
     }

src/Analysis/Engine/Impl/ModuleAnalysis.cs

@@ -294,15 +294,23 @@ private VariablesResult GetVariablesFromNameExpression(Expression expr, Analysis
             mainDefinition = mainDefinition ?? definitions.FirstOrDefault();
             if (mainDefinition != null) {
                 // Drop definitions in outer scopes and convert those in inner scopes to references.
+                // Exception is when variable is an import as in 
+                //   abc = 1
+                //   import abc
+                 var imports = definitions
+                    .Where(d => d.Variable.Variable.Types.Any(t => t.TypeId == BuiltinTypeId.Module) && d.Location.DocumentUri != DocumentUri)
+                    .ToArray();
+
                 // Scope levels are numbered in reverse (X == main definition level, x+1 == one up).
                 var defsToRefs = definitions
+                    .Except(imports)
                     .Where(d => d != mainDefinition && d.ScopeLevel <= mainDefinition.ScopeLevel)
                     .Select(v => new VariableScopePair(new AnalysisVariable(v.Variable.Variable, VariableType.Reference, v.Location), v.ScopeLevel));
 
                 var others = variables
                             .Where(v => (v.VariableType == VariableType.Reference || v.VariableType == VariableType.Value) &&
                                          v.ScopeLevel <= mainDefinition.ScopeLevel);
-                variables = new[] { mainDefinition }.Concat(others.Concat(defsToRefs));
+                variables = new[] { mainDefinition }.Concat(imports).Concat(others.Concat(defsToRefs));
             }
 
             return new VariablesResult(variables.Select(v => v.Variable), unit.Tree);

src/Analysis/Engine/Impl/Parsing/Tokenizer.cs

@@ -130,17 +130,9 @@ public List<TokenInfo> ReadTokens(int characterCount) {
             return tokens;
         }
 
-        public object CurrentState {
-            get {
-                return _state;
-            }
-        }
-
-        public SourceLocation CurrentPosition {
-            get {
-                return IndexToLocation(CurrentIndex);
-            }
-        }
+        public object CurrentState => _state;
+        public int CurrentLine => _newLineLocations.Count;
+        public SourceLocation CurrentPosition => IndexToLocation(CurrentIndex);
 
         public SourceLocation IndexToLocation(int index) {
             int match = _newLineLocations.BinarySearch(new NewLineLocation(index, NewLineKind.None));
@@ -2235,6 +2227,7 @@ private static void DumpToken(Token token) {
             Console.WriteLine("{0} `{1}`", token.Kind, token.Image.Replace("\r", "\\r").Replace("\n", "\\n").Replace("\t", "\\t"));
         }
 
+        internal NewLineLocation GetNewLineLocation(int line) => _newLineLocations.Count == line ? new NewLineLocation(CurrentIndex, NewLineKind.None) : _newLineLocations[line];
         internal NewLineLocation[] GetLineLocations() => _newLineLocations.ToArray();
         internal SourceLocation[] GetCommentLocations() => _commentLocations.ToArray();
 
@@ -2564,11 +2557,7 @@ private bool AtBeginning {
             }
         }
 
-        private int CurrentIndex {
-            get {
-                return _tokenStartIndex + Math.Min(_position, _end) - _start;
-            }
-        }
+        private int CurrentIndex => _tokenStartIndex + Math.Min(_position, _end) - _start;
 
         private void DiscardToken() {
             CheckInvariants();

src/Analysis/Engine/Impl/Values/BoundMethodInfo.cs

@@ -46,6 +46,7 @@ public override IAnalysisSet Call(Node node, AnalysisUnit unit, IAnalysisSet[] a
         public override IPythonProjectEntry DeclaringModule => Function.DeclaringModule;
         public override int DeclaringVersion => Function.DeclaringVersion;
         public override IEnumerable<ILocationInfo> Locations => Function.Locations;
+        public override BuiltinTypeId TypeId => BuiltinTypeId.Function; 
 
         public IEnumerable<KeyValuePair<string, string>> GetRichDescription() {
             if (Push()) {

src/Analysis/Engine/Impl/Values/BuiltinMethodInfo.cs

@@ -98,7 +98,7 @@ public override string Documentation {
                 return _doc;
             }
         }
-
+        public override BuiltinTypeId TypeId => BuiltinTypeId.BuiltinFunction;
         public override PythonMemberType MemberType => _memberType;
         public override string Name => _function.Name;
         public override ILocatedMember GetLocatedMember() => _function as ILocatedMember;

src/Analysis/Engine/Impl/Values/Definitions/IFunctionInfo.cs

@@ -25,4 +25,8 @@ public interface IFunctionInfo: IAnalysisValue {
         bool IsClosure { get; }
         IPythonProjectEntry ProjectEntry { get; }
     }
+
+    public interface IFunctionInfo2 : IFunctionInfo {
+        bool IsAbstract { get; }
+    }
 }