- Merge changes from

- Make EncodedLocation struct public to avoid boxing/unboxing through interfaces

Author: AlexanderSher

src/Analysis/Engine/Impl/AnalysisLimits.cs

@@ -51,10 +51,6 @@ public static AnalysisLimits GetStandardLibraryLimits() {
  return limits;
  }
 
-#if DESKTOP
-
-#endif
-
  /// <summary>
  /// The key to use with ProjectEntry.Properties to override the call
  /// depth for functions in that module.

src/Analysis/Engine/Impl/AnalysisUnit.cs

@@ -104,7 +104,7 @@ internal ModuleInfo DeclaringModule {
 
  public PythonAnalyzer State => DeclaringModule.ProjectEntry.ProjectState;
 
- internal AnalysisUnit CopyForEval() {
+ public AnalysisUnit CopyForEval() {
  return new AnalysisUnit(Ast, Tree, _scope, true);
  }
 

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

@@ -144,7 +144,7 @@ public IAnalysisSet Types {
  }
 
  internal class ReferenceableDependencyInfo : TypedDependencyInfo {
- public SmallSetWithExpiry<IEncodedLocation> _references, _assignments;
+ public SmallSetWithExpiry<EncodedLocation> _references, _assignments;
 
  public ReferenceableDependencyInfo(int version)
  : base(version) { }
@@ -153,9 +153,9 @@ public ReferenceableDependencyInfo(int version, IAnalysisSet emptySet)
  : base(version, emptySet) {
  }
 
- public bool AddReference(IEncodedLocation location) => _references.Add(location);
- public IEnumerable<IEncodedLocation> References => _references;
- public bool AddAssignment(IEncodedLocation location) => _assignments.Add(location);
- public IEnumerable<IEncodedLocation> Assignments => _assignments;
+ public bool AddReference(EncodedLocation location) => _references.Add(location);
+ public IEnumerable<EncodedLocation> References => _references;
+ public bool AddAssignment(EncodedLocation location) => _assignments.Add(location);
+ public IEnumerable<EncodedLocation> Assignments => _assignments;
  }
 }

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

@@ -18,6 +18,6 @@ namespace Microsoft.PythonTools.Analysis {
  public interface ILocatedVariableDefinition: IVariableDefinition {
  int DeclaringVersion { get; set; }
  IPythonProjectEntry Entry { get; }
- IEncodedLocation Location { get; set; }
+ EncodedLocation Location { get; set; }
  }
 }

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

@@ -70,6 +70,8 @@ public interface IPythonAnalyzer: IGroupableAnalysisProject {
  /// </param>
  IEnumerable<IPythonProjectEntry> GetEntriesThatImportModule(string moduleName, bool includeUnresolved);
 
+ AnalysisValue GetAnalysisValueFromObjects(object attr);
+
  /// <summary>
  /// Returns true if a module has been imported.
  /// </summary>

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

@@ -22,10 +22,10 @@ public interface IReferenceableContainer {
  }
 
  public interface IReferenceable {
- IEnumerable<IEncodedLocation> Definitions {
+ IEnumerable<EncodedLocation> Definitions {
  get;
  }
- IEnumerable<IEncodedLocation> References {
+ IEnumerable<EncodedLocation> References {
  get;
  }
  }

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

@@ -20,8 +20,8 @@ namespace Microsoft.PythonTools.Analysis {
  public interface IVariableDefinition: IReferenceable {
  bool VariableStillExists { get; }
  bool AddReference(Node node, AnalysisUnit unit);
- bool AddReference(IEncodedLocation location, IVersioned module);
- bool AddAssignment(IEncodedLocation location, IVersioned entry);
+ bool AddReference(EncodedLocation location, IVersioned module);
+ bool AddAssignment(EncodedLocation location, IVersioned entry);
  bool AddAssignment(Node node, AnalysisUnit unit);
  bool IsAssigned { get; }
  bool HasTypes { get; }

src/Analysis/Engine/Impl/EncodedLocation.cs

@@ -35,7 +35,7 @@ namespace Microsoft.PythonTools.Analysis {
  /// storing the line/column info directly while still allowing multiple schemes
  /// to be used.
  /// </summary>
- struct EncodedLocation : IEncodedLocation, IEquatable<EncodedLocation> {
+ public struct EncodedLocation : IEquatable<EncodedLocation>, ICanExpire {
  public EncodedLocation(ILocationResolver resolver, object location) {
  if (resolver == null && !(location is LocationInfo)) {
  throw new ArgumentNullException(nameof(resolver));
@@ -60,10 +60,7 @@ public override int GetHashCode() {
  }
 
  public override bool Equals(object obj) {
- if (obj is EncodedLocation) {
- return Equals((EncodedLocation)obj);
- }
- return false;
+ return obj is EncodedLocation location && Equals(location);
  }
 
  #region IEquatable<EncodedLocation> Members
@@ -74,13 +71,6 @@ public bool Equals(EncodedLocation other) {
 
  #endregion
 
- #region IEquatable<IEncodedLocation> Members
-
- public bool Equals(IEncodedLocation other) {
- return Location == other.Location;
- }
-
- #endregion
  public ILocationInfo GetLocationInfo() {
  if (Resolver == null) {
  return Location as ILocationInfo;

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

@@ -16,6 +16,7 @@
 
 using System;
 using System.Net;
+using System.Runtime.InteropServices;
 
 namespace Microsoft.PythonTools.Analysis.Infrastructure {
  internal static class UriExtensions {
@@ -34,13 +35,7 @@ public static string ToAbsolutePath(this Uri uri) {
  return uri.LocalPath;
  }
 
- private static bool IsWindows() {
-#if DESKTOP
- return true;
-#else
- return System.Runtime.InteropServices.RuntimeInformation
- .IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows);
-#endif
- }
+ private static bool IsWindows() 
+ => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
  }
 }