Merge remote-tracking branch 'Microsoft/master'

Author: AlexanderSher

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

@@ -65,7 +65,7 @@ public void Walk() {
             var self = GetSelf();
             _selfType = (self as AstPythonConstant)?.Type as AstPythonType;
 
-            _overload.ReturnTypes.AddRange(_scope.GetTypesFromAnnotation(_target.ReturnAnnotation));
+            _overload.ReturnTypes.AddRange(_scope.GetTypesFromAnnotation(_target.ReturnAnnotation).ExcludeDefault());
 
             _scope.PushScope();
             if (self != null) {
@@ -163,7 +163,7 @@ public override bool Walk(IfStatement node) {
         }
 
         public override bool Walk(ReturnStatement node) {
-            foreach (var type in _scope.GetTypesFromValue(_scope.GetValueFromExpression(node.Expression))) {
+            foreach (var type in _scope.GetTypesFromValue(_scope.GetValueFromExpression(node.Expression)).ExcludeDefault()) {
                 _overload.ReturnTypes.Add(type);
             }
             return true; // We want to evaluate all code so all private variables in __new__ get defined

src/LanguageServer/Impl/Implementation/Server.cs

@@ -654,13 +654,6 @@ private async Task OnDocumentChangeProcessingCompleteAsync(IDocument doc, Versio
                 if (vc != null) {
                     _editorFiles.GetDocument(doc.DocumentUri).UpdateParseDiagnostics(vc, doc.DocumentUri);
                 }
-
-                if (doc is ProjectEntry entry) {
-                    var reanalyzeEntries = Analyzer.GetEntriesThatImportModule(entry.ModuleName, false);
-                    foreach (var d in reanalyzeEntries.OfType<IDocument>()) {
-                        await EnqueueItemAsync(d, parse: false);
-                    }
-                }
             } catch (BadSourceException) {
             } catch (ObjectDisposedException) when (_disposableBag.IsDisposed) {
             } catch (OperationCanceledException ex) {

src/LanguageServer/Impl/LanguageServer.cs

@@ -152,17 +152,7 @@ public async Task DidChangeConfiguration(JToken token, CancellationToken cancell
                 _idleTimeTracker?.Dispose();
                 _idleTimeTracker = new IdleTimeTracker(settings.diagnosticPublishDelay, PublishPendingDiagnostics);
 
-                _pathsWatcher?.Dispose();
-                var watchSearchPaths = GetSetting(analysis, "watchSearchPaths", true);
-                if (watchSearchPaths) {
-                    if (!_searchPaths.SetEquals(_initParams.initializationOptions.searchPaths)) {
-                        _pathsWatcher = new PathsWatcher(
-                            _initParams.initializationOptions.searchPaths,
-                            () => _server.ReloadModulesAsync(CancellationToken.None).DoNotWait(),
-                            _server
-                         );
-                    }
-                }
+                HandlePathWatchChange(token);
 
                 var errors = GetSetting(analysis, "errors", Array.Empty<string>());
                 var warnings = GetSetting(analysis, "warnings", Array.Empty<string>());

src/LanguageServer/Impl/PathsWatcher.cs

@@ -62,6 +62,7 @@ public PathsWatcher(string[] paths, Action onChanged, ILogger log) {
                     fsw.Deleted += OnChanged;
 
                     _disposableBag
+                        .Add(() => _throttleTimer?.Dispose())
                         .Add(() => fsw.Created -= OnChanged)
                         .Add(() => fsw.Deleted -= OnChanged)
                         .Add(() => fsw.EnableRaisingEvents = false)
@@ -83,7 +84,7 @@ private void OnChanged(object sender, FileSystemEventArgs e) {
 
         private void TimerProc(object o) {
             lock (_lock) {
-                if (_changedSinceLastTick) {
+                if (!_changedSinceLastTick) {
                     ThreadPool.QueueUserWorkItem(_ => _onChanged());
                     _throttleTimer?.Dispose();
                     _throttleTimer = null;