fixed merge conflicts from master

Author: heejaechang

src/Analysis/Ast/Impl/Analyzer/AnalysisModuleKey.cs

@@ -31,11 +31,11 @@ namespace Microsoft.Python.Analysis.Analyzer {
         public AnalysisModuleKey(IPythonModule module) : this(
             module.Name,
             module.ModuleType == ModuleType.CompiledBuiltin ? null : module.FilePath,
-            module is StubPythonModule && ((StubPythonModule)module).IsTypeshed,
-            (module.IsNonUserFile() || module.IsCompiled()) && module is IDocument && ((IDocument)module).IsOpen) { }
+            IsTypeshedModule(module),
+            IsNonUserAsDocumentModule(module)) { }
 
         public AnalysisModuleKey(string name, string filePath, bool isTypeshed)
-            : this(name, filePath, isTypeshed, isNonUserAsDocument: false) { }
+            : this(name, filePath, isTypeshed, false) { }
 
         private AnalysisModuleKey(string name, string filePath, bool isTypeshed, bool isNonUserAsDocument) {
             Name = name;
@@ -44,7 +44,7 @@ private AnalysisModuleKey(string name, string filePath, bool isTypeshed, bool is
             IsNonUserAsDocument = isNonUserAsDocument;
         }
 
-        public AnalysisModuleKey GetNonUserAsDocumentKey() => new AnalysisModuleKey(Name, FilePath, IsTypeshed, isNonUserAsDocument: true);
+        public AnalysisModuleKey GetNonUserAsDocumentKey() => new AnalysisModuleKey(Name, FilePath, IsTypeshed, true);
 
         public bool Equals(AnalysisModuleKey other)
             => Name.EqualsOrdinal(other.Name) && FilePath.PathEquals(other.FilePath) && IsTypeshed == other.IsTypeshed && IsNonUserAsDocument == other.IsNonUserAsDocument;
@@ -72,5 +72,10 @@ public void Deconstruct(out string moduleName, out string filePath, out bool isT
         }
 
         public override string ToString() => $"{Name}({FilePath})";
+
+        private static bool IsTypeshedModule(IPythonModule module)
+            => module is StubPythonModule stubPythonModule && stubPythonModule.IsTypeshed;
+        private static bool IsNonUserAsDocumentModule(IPythonModule module)
+            => (module.IsNonUserFile() || module.IsCompiled()) && module is IDocument document && document.IsOpen;
     }
 }

src/Analysis/Ast/Impl/Analyzer/ProgressReporter.cs

@@ -20,8 +20,8 @@
 
 namespace Microsoft.Python.Analysis.Analyzer {
     internal sealed class ProgressReporter : IProgressReporter, IDisposable {
-        private readonly static TimeSpan s_initialDelay = TimeSpan.FromMilliseconds(50);
-        private readonly static TimeSpan s_reportingInterval = TimeSpan.FromMilliseconds(100);
+        private readonly static TimeSpan InitialDelay = TimeSpan.FromMilliseconds(50);
+        private readonly static TimeSpan ReportingInterval = TimeSpan.FromMilliseconds(100);
 
         private readonly IProgressService _progressService;
         private readonly object _lock = new object();
@@ -52,7 +52,7 @@ public void ReportRemaining(int count) {
                     // Delay reporting a bit in case the analysis is short in order to reduce UI flicker.
                     _running = true;
                     _reportTimer?.Dispose();
-                    _reportTimer = new Timer(OnReportTimer, state: null, s_initialDelay, s_reportingInterval);
+                    _reportTimer = new Timer(OnReportTimer, null, InitialDelay, ReportingInterval);
                 }
                 _lastReportedCount = count;
             }

src/Analysis/Ast/Impl/Caching/CacheFolders.cs

@@ -23,7 +23,7 @@
 using Microsoft.Python.Core.OS;
 
 namespace Microsoft.Python.Analysis.Caching {
-    internal sealed class CacheFolderService: ICacheFolderService {
+    internal sealed class CacheFolderService : ICacheFolderService {
         public CacheFolderService(IServiceContainer services, string cacheRootFolder) {
             CacheFolder = cacheRootFolder ?? GetCacheFolder(services);
         }
@@ -47,18 +47,18 @@ private static string GetCacheFolder(IServiceContainer services) {
             var localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
             var plsSubfolder = $"Microsoft{Path.DirectorySeparatorChar}Python Language Server";
             var defaultCachePath = Path.Combine(localAppData, plsSubfolder);
-            
+
             string cachePath = null;
             try {
                 const string homeVarName = "HOME";
                 var homeFolderPath = Environment.GetEnvironmentVariable(homeVarName);
 
-                if(platform.IsWindows) {
+                if (platform.IsWindows) {
                     cachePath = defaultCachePath;
                 }
 
                 if (platform.IsMac) {
-                    if (CheckVariableSet(homeVarName, homeFolderPath, logger) 
+                    if (CheckVariableSet(homeVarName, homeFolderPath, logger)
                         && CheckPathRooted(homeVarName, homeFolderPath, logger)
                         && !string.IsNullOrWhiteSpace(homeFolderPath)) {
                         cachePath = Path.Combine(homeFolderPath, "Library/Caches", plsSubfolder);

src/Core/Impl/Services/IdleTimeService.cs

@@ -19,15 +19,15 @@
 
 namespace Microsoft.Python.Core.Services {
     public sealed class IdleTimeService : IIdleTimeService, IIdleTimeTracker, IDisposable {
-        private static readonly TimeSpan s_initialDelay = TimeSpan.FromMilliseconds(50);
-        private static readonly TimeSpan s_interval = TimeSpan.FromMilliseconds(50);
-        private static readonly TimeSpan s_idleInterval = TimeSpan.FromMilliseconds(100);
+        private static readonly TimeSpan InitialDelay = TimeSpan.FromMilliseconds(50);
+        private static readonly TimeSpan Interval = TimeSpan.FromMilliseconds(50);
+        private static readonly TimeSpan IdleInterval = TimeSpan.FromMilliseconds(100);
 
         private Timer _timer;
         private DateTime _lastActivityTime;
 
         public IdleTimeService() {
-            _timer = new Timer(OnTimer, state: this, s_initialDelay, s_interval);
+            _timer = new Timer(OnTimer, this, InitialDelay, Interval);
             NotifyUserActivity();
         }
 
@@ -41,7 +41,7 @@ public void Dispose() {
         }
 
         private void OnTimer(object state) {
-            if (_timer != null && (DateTime.Now - _lastActivityTime) >= s_idleInterval) {
+            if (_timer != null && (DateTime.Now - _lastActivityTime) >= IdleInterval) {
                 Idle?.Invoke(this, EventArgs.Empty);
             }
         }