Merge pull request microsoft#36 from AlexanderSher/master

Bug and test fixes

Author: AlexanderSher

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

@@ -73,7 +73,6 @@ public void Analyze(Deque<AnalysisUnit> queue, CancellationToken cancel, Action<
  SetCurrentUnit(_unit);
  AnalyzedEntries.Add(_unit.ProjectEntry);
  _unit.Analyze(this, cancel);
- _unit.ProjectEntry.SetCompleteAnalysis();
  }
 
  if (reportQueueSize != null) {

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

@@ -19,12 +19,6 @@
 
 namespace Microsoft.PythonTools.Analysis.Infrastructure {
  internal static class TaskCompletionSourceExtensions {
- public static void TrySetResultOnThreadPool<T>(this TaskCompletionSource<T> taskCompletionSource, T result) {
- if (!taskCompletionSource.Task.IsCompleted) {
- ThreadPool.QueueUserWorkItem(new TrySetResultStateAction<T>(taskCompletionSource, result).Invoke);
- }
- }
-
  public static CancellationTokenRegistration RegisterForCancellation<T>(this TaskCompletionSource<T> taskCompletionSource, CancellationToken cancellationToken) 
  => taskCompletionSource.RegisterForCancellation(-1, cancellationToken);
 

src/Analysis/Engine/Impl/Infrastructure/PathUtils.cs

@@ -362,6 +362,8 @@ public static FileStream OpenWithRetry(string file, FileMode mode, FileAccess ac
  return null;
  } catch (DirectoryNotFoundException) when (!create) {
  return null;
+ } catch (UnauthorizedAccessException) {
+ Thread.Sleep(10);
  } catch (IOException) {
  if (create) {
  var dir = Path.GetDirectoryName(file);

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

@@ -39,6 +39,7 @@ class AstScrapedPythonModule : IPythonModule
 
  public AstScrapedPythonModule(string name, string filePath) {
  Name = name ?? throw new ArgumentNullException(nameof(name));
+ ParseErrors = Enumerable.Empty<string>();
  _filePath = filePath;
  _members = new Dictionary<string, IMember>();
  _scraped = false;

src/Analysis/Engine/Impl/ProjectEntry.cs

@@ -152,19 +152,22 @@ public IPythonParse GetCurrentParse() {
  }
  }, cancellationToken);
 
- return Task.WhenAny(timeoutTask, _analysisTcs.Task).Unwrap();
+ return Task.WhenAny(timeoutTask, task).Unwrap();
  }
 
  internal void SetCompleteAnalysis() {
  lock (this) {
- _analysisTcs.TrySetResultOnThreadPool(Analysis);
+ _analysisTcs.TrySetResult(Analysis);
  }
  }
 
  internal void ResetCompleteAnalysis() {
+ TaskCompletionSource<ModuleAnalysis> analysisTcs;
  lock (this) {
- _analysisTcs = new TaskCompletionSource<ModuleAnalysis>();
+ analysisTcs = _analysisTcs;
+ _analysisTcs = new TaskCompletionSource<ModuleAnalysis>(TaskCreationOptions.RunContinuationsAsynchronously);
  }
+ analysisTcs?.TrySetCanceled();
  }
 
  public void SetCurrentParse(PythonAst tree, IAnalysisCookie cookie, bool notify = true) {

src/Analysis/Engine/Impl/PythonAnalyzer.cs

@@ -953,6 +953,7 @@ public void AnalyzeQueuedEntries(CancellationToken cancel) {
  var ddg = new DDG();
  ddg.Analyze(Queue, cancel, _reportQueueSize, _reportQueueInterval);
  foreach (var entry in ddg.AnalyzedEntries) {
+ entry.SetCompleteAnalysis();
  entry.RaiseOnNewAnalysis();
  }
  }

src/Analysis/Engine/Test/AnalysisTest.cs

@@ -1489,21 +1489,14 @@ print abc
  }
  }
 
- [TestMethod, Priority(0)]
- public async Task LambdaInComprehension() {
+ [DataRow(PythonLanguageVersion.V27)]
+ [DataRow(PythonLanguageVersion.V31)]
+ [DataRow(PythonLanguageVersion.V33)]
+ [DataTestMethod, Priority(0)]
+ public async Task LambdaInComprehension(PythonLanguageVersion version) {
  var text = "x = [(lambda a:[a**i for i in range(a+1)])(j) for j in range(5)]";
 
- using (var server = await CreateServerAsync(PythonVersions.Required_Python27X)) {
- var analysis = await server.OpenDefaultDocumentAndGetAnalysisAsync(text);
- analysis.Should().HaveVariable("x").OfType(BuiltinTypeId.List);
- }
-
- using (var server = await CreateServerAsync(PythonVersions.Required_Python31X)) {
- var analysis = await server.OpenDefaultDocumentAndGetAnalysisAsync(text);
- analysis.Should().HaveVariable("x").OfType(BuiltinTypeId.List);
- }
-
- using (var server = await CreateServerAsync(PythonVersions.Required_Python33X)) {
+ using (var server = await CreateServerAsync(PythonVersions.GetRequiredCPythonConfiguration(version))) {
  var analysis = await server.OpenDefaultDocumentAndGetAnalysisAsync(text);
  analysis.Should().HaveVariable("x").OfType(BuiltinTypeId.List);
  }

src/Analysis/Engine/Test/PythonVersions.cs

@@ -141,6 +141,9 @@ public static class PythonVersions {
  Python27,
  Python27_x64).First();
 
+ public static InterpreterConfiguration GetRequiredCPythonConfiguration(PythonLanguageVersion version) 
+ => GetCPythonVersion(version, InterpreterArchitecture.x86) ?? GetCPythonVersion(version, InterpreterArchitecture.x64) ?? NotInstalled(version.ToString());
+
  private static IEnumerable<InterpreterConfiguration> GetVersions(params InterpreterConfiguration[] configurations) => configurations.Where(v => v != null);
 
  private static InterpreterConfiguration GetCPythonVersion(PythonLanguageVersion version, InterpreterArchitecture arch) { 

src/LanguageServer/Impl/LanguageServer.cs

@@ -562,12 +562,12 @@ private struct QueueItem {
  public bool IsAwaitable { get; }
 
  public QueueItem(bool isAwaitable, CancellationToken cancellationToken) {
- _tcs = new TaskCompletionSource<IDisposable>();
+ _tcs = new TaskCompletionSource<IDisposable>(TaskCreationOptions.RunContinuationsAsynchronously);
  IsAwaitable = isAwaitable;
  _tcs.RegisterForCancellation(cancellationToken).UnregisterOnCompletion(_tcs.Task);
  }
 
- public void SetResult(IDisposable disposable) => _tcs.TrySetResultOnThreadPool(disposable);
+ public void SetResult(IDisposable disposable) => _tcs.TrySetResult(disposable);
  }
 
  private class PrioritizerDisposable : IDisposable {

src/UnitTests/Core/Impl/TestData.cs

@@ -47,7 +47,7 @@ private static string CalculateTestDataRoot() {
  if (Directory.Exists(path)) {
  foreach (var landmark in new[] {
  "TestData",
- @"Python\Tests\TestData"
+ @"src\UnitTests\TestData"
  }) {
  var candidate = PathUtils.GetAbsoluteDirectoryPath(path, landmark);
  if (Directory.Exists(candidate)) {