Mikhail Arkhipov (MikhailArkhipov) · Sep 4, 2018 · Aug 31, 2018 · Aug 31, 2018 · Aug 31, 2018 · Aug 31, 2018
diff --git a/src/Analysis/Impl/Infrastructure/Check.cs b/src/Analysis/Impl/Infrastructure/Check.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using static System.FormattableString;
+
+namespace Microsoft.PythonTools.Analysis.Infrastructure {
+    public static class Check {
+        [DebuggerStepThrough]
+        public static void ArgumentNull(string argumentName, object argument) {
+            if (argument == null) {
+                throw new ArgumentNullException(argumentName);
+            }
+        }
+
+        [DebuggerStepThrough]
+        public static void ArgumentStringNullOrEmpty(string argumentName, string argument) {
+            Check.ArgumentNull(argumentName, argument);
+
+            if (string.IsNullOrEmpty(argument)) {
+                throw new ArgumentException(argumentName);
+            }
+        }
+
+        [DebuggerStepThrough]
+        public static void ArgumentOutOfRange(string argumentName, Func<bool> predicate) {
+            if (predicate()) {
+                throw new ArgumentOutOfRangeException(argumentName);
+            }
+        }
+
+        [DebuggerStepThrough]
+        public static void InvalidOperation(Func<bool> predicate, string message = null) {
+            if (!predicate()) {
+                throw new InvalidOperationException(message ?? string.Empty);
+            }
+        }
+
+        [DebuggerStepThrough]
+        public static void Argument(string argumentName, Func<bool> predicate) {
+            if (!predicate()) {
+                throw new ArgumentException(Invariant($"{argumentName} is not valid"));
+            }
+        }
+    }
+}
diff --git a/src/Analysis/Impl/Infrastructure/Definitions/IDocumentReader.cs b/src/Analysis/Impl/Infrastructure/Definitions/IDocumentReader.cs
@@ -0,0 +1,34 @@
+// Python Tools for Visual Studio
+// Copyright(c) Microsoft Corporation
+// All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the License); you may not use
+// this file except in compliance with the License. You may obtain a copy of the
+// License at http://www.apache.org/licenses/LICENSE-2.0
+//
+// THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
+// OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY
+// IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+// MERCHANTABLITY OR NON-INFRINGEMENT.
+//
+// See the Apache Version 2.0 License for specific language governing
+// permissions and limitations under the License.
+
+using Microsoft.PythonTools.Analysis.LanguageServer;
+using Microsoft.PythonTools.Parsing.Ast;
+
+namespace Microsoft.PythonTools.Analysis.Infrastructure {
+    public interface IDocumentReader {
+        string ReadToEnd();
+        string Read(int start, int count);
+    }
+
+    public static class DocumentReaderExtensions {
+        public static string ReadLinearSpan(this IDocumentReader reader, LinearSpan span)
+            => reader.Read(span.Start, span.Length);
+        public static string ReadRange(this IDocumentReader reader, Range range, PythonAst ast)
+            => reader.ReadLinearSpan(range.ToLinearSpan(ast));
+        public static string ReadSourceSpan(this IDocumentReader reader, SourceSpan span, PythonAst ast)
+            => reader.ReadLinearSpan(span.ToLinearSpan(ast));
+    }
+}
diff --git a/...s/Impl/Infrastructure/ITestEnvironment.cs → ...structure/Definitions/ITestEnvironment.cs b/...s/Impl/Infrastructure/ITestEnvironment.cs → ...structure/Definitions/ITestEnvironment.cs
diff --git a/src/Analysis/Impl/Infrastructure/DocumentReader.cs b/src/Analysis/Impl/Infrastructure/DocumentReader.cs
@@ -0,0 +1,52 @@
+// Python Tools for Visual Studio
+// Copyright(c) Microsoft Corporation
+// All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the License); you may not use
+// this file except in compliance with the License. You may obtain a copy of the
+// License at http://www.apache.org/licenses/LICENSE-2.0
+//
+// THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
+// OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY
+// IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+// MERCHANTABLITY OR NON-INFRINGEMENT.
+//
+// See the Apache Version 2.0 License for specific language governing
+// permissions and limitations under the License.
+
+using Microsoft.PythonTools.Analysis.LanguageServer;
+using Microsoft.PythonTools.Parsing.Ast;
+
+namespace Microsoft.PythonTools.Analysis.Infrastructure {
+    public sealed class DocumentReader : IDocumentReader {
+        private readonly IDocument _doc;
+        private readonly int _part;
+        private string _content;
+        private bool _read;
+
+        public DocumentReader(IDocument doc, int part) {
+            _doc = doc;
+            _part = part;
+        }
+
+        public string ReadToEnd() => Content;
+
+        public string Read(int start, int count) => Content?.Substring(start, count);
+
+        private string Content {
+            get {
+                if (_content == null && !_read) {
+                    var reader = _doc.ReadDocument(_part, out _);
+                    _read = true;
+                    if (reader == null) {
+                        return null;
+                    }
+                    using (reader) {
+                        _content = reader.ReadToEnd();
+                    }
+                }
+                return _content;
+            }
+        }
+    }
+}
diff --git a/...pl/Infrastructure/EnumerableExtensions.cs → ...ucture/Extensions/EnumerableExtensions.cs b/...pl/Infrastructure/EnumerableExtensions.cs → ...ucture/Extensions/EnumerableExtensions.cs
diff --git a/...mpl/Infrastructure/ExceptionExtensions.cs → ...ructure/Extensions/ExceptionExtensions.cs b/...mpl/Infrastructure/ExceptionExtensions.cs → ...ructure/Extensions/ExceptionExtensions.cs
diff --git a/src/Analysis/Impl/Infrastructure/Extensions/SourceLocationExtensions.cs b/src/Analysis/Impl/Infrastructure/Extensions/SourceLocationExtensions.cs
@@ -0,0 +1,30 @@
+// Python Tools for Visual Studio
+// Copyright(c) Microsoft Corporation
+// All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the License); you may not use
+// this file except in compliance with the License. You may obtain a copy of the
+// License at http://www.apache.org/licenses/LICENSE-2.0
+//
+// THIS CODE IS PROVIDED ON AN  *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
+// OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY
+// IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+// MERCHANTABLITY OR NON-INFRINGEMENT.
+//
+// See the Apache Version 2.0 License for specific language governing
+// permissions and limitations under the License.
+
+using Microsoft.PythonTools.Analysis.LanguageServer;
+using Microsoft.PythonTools.Parsing.Ast;
+
+namespace Microsoft.PythonTools.Analysis.Infrastructure {
+    public static class SourceLocationExtensions {
+        public static int ToIndex(this SourceLocation location, PythonAst ast) => ast.LocationToIndex(location);
+    }
+    public static class SourceSpanExtensions {
+        public static LinearSpan ToLinearSpan(this SourceSpan span, PythonAst ast)
+            => LinearSpan.FromBounds(ast.LocationToIndex(span.Start), ast.LocationToIndex(span.End));
+        public static LinearSpan ToLinearSpan(this Range range, PythonAst ast)
+            => LinearSpan.FromBounds(ast.LocationToIndex(range.start), ast.LocationToIndex(range.end));
+    }
+}
diff --git a/...Infrastructure/StringBuilderExtensions.cs → ...ure/Extensions/StringBuilderExtensions.cs b/...Infrastructure/StringBuilderExtensions.cs → ...ure/Extensions/StringBuilderExtensions.cs
diff --git a/...s/Impl/Infrastructure/StringExtensions.cs → ...astructure/Extensions/StringExtensions.cs b/...s/Impl/Infrastructure/StringExtensions.cs → ...astructure/Extensions/StringExtensions.cs
diff --git a/...ructure/TaskCompletionSourceExtensions.cs → ...ensions/TaskCompletionSourceExtensions.cs b/...ructure/TaskCompletionSourceExtensions.cs → ...ensions/TaskCompletionSourceExtensions.cs
diff --git a/...sis/Impl/Infrastructure/TaskExtensions.cs → ...frastructure/Extensions/TaskExtensions.cs b/...sis/Impl/Infrastructure/TaskExtensions.cs → ...frastructure/Extensions/TaskExtensions.cs
diff --git a/...ysis/Impl/Infrastructure/UriExtensions.cs → ...nfrastructure/Extensions/UriExtensions.cs b/...ysis/Impl/Infrastructure/UriExtensions.cs → ...nfrastructure/Extensions/UriExtensions.cs