More workspace fixes

Author: darrelmiller

src/Microsoft.OpenApi.Readers/OpenApiReaderError.cs

@@ -27,6 +27,12 @@ public OpenApiReaderError(OpenApiException exception) : base(exception)
 
         }
 
+        public OpenApiReaderError(ParsingContext context, string message) : base(context.GetLocation(), message)
+        {
+
+        }
+
+
         /// <summary>
         /// Create error object from YAML SyntaxErrorException
         /// </summary>

src/Microsoft.OpenApi.Readers/ParseNodes/PropertyNode.cs

@@ -73,7 +73,7 @@ public void ParseField<T>(
                 else
                 {
                     Diagnostic.Errors.Add(
-                        new OpenApiError("", $"{Name} is not a valid property at {Context.GetLocation()}"));
+                        new OpenApiReaderError(Context, $"{Name} is not a valid property"));
                 }
             }
         }

src/Microsoft.OpenApi.Readers/Services/OpenApiRemoteReferenceCollector.cs

@@ -13,7 +13,7 @@ namespace Microsoft.OpenApi.Readers.Services
     internal class OpenApiRemoteReferenceCollector : OpenApiVisitorBase
     {
         private OpenApiDocument _document;
-        private Dictionary<string, OpenApiReference> _references;
+        private Dictionary<string, OpenApiReference> _references = new Dictionary<string, OpenApiReference>();
         public OpenApiRemoteReferenceCollector(OpenApiDocument document)
         {
             _document = document;

src/Microsoft.OpenApi.Readers/V2/OpenApiSecurityRequirementDeserializer.cs

@@ -34,7 +34,7 @@ public static OpenApiSecurityRequirement LoadSecurityRequirement(ParseNode node)
                 else
                 {
                     node.Diagnostic.Errors.Add(
-                        new OpenApiError(node.Context.GetLocation(), 
+                        new OpenApiReaderError(node.Context, 
                         $"Scheme {property.Name} is not found"));
                 }
             }

src/Microsoft.OpenApi.Readers/V3/OpenApiSecurityRequirementDeserializer.cs

@@ -34,7 +34,7 @@ public static OpenApiSecurityRequirement LoadSecurityRequirement(ParseNode node)
                 else
                 {
                     node.Diagnostic.Errors.Add(
-                        new OpenApiError(node.Context.GetLocation(), $"Scheme {property.Name} is not found"));
+                        new OpenApiReaderError(node.Context, $"Scheme {property.Name} is not found"));
                 }
             }
 

src/Microsoft.OpenApi/Extensions/OpenApiElementExtensions.cs

@@ -27,6 +27,5 @@ public static IEnumerable<OpenApiError> Validate(this IOpenApiElement element, V
             walker.Walk(element);
             return validator.Errors;
         }
-
     }
 }

src/Microsoft.OpenApi/Models/OpenApiError.cs

@@ -8,7 +8,7 @@ namespace Microsoft.OpenApi.Models
     /// <summary>
     /// Error related to the Open API Document.
     /// </summary>
-    public class OpenApiError
+    public abstract class OpenApiError
     {
         /// <summary>
         /// Initializes the <see cref="OpenApiError"/> class using the message and pointer from the given exception.

src/Microsoft.OpenApi/Services/OpenApiReferenceError.cs

@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Exceptions;
+using Microsoft.OpenApi.Models;
+
+namespace Microsoft.OpenApi.Services
+{
+    public class OpenApiReferenceError : OpenApiError
+    {
+        private OpenApiReference _reference;
+        /// <summary>
+        /// Initializes the <see cref="OpenApiError"/> class using the message and pointer from the given exception.
+        /// </summary>
+        public OpenApiReferenceError(OpenApiException exception) : base(exception.Pointer, exception.Message)
+        {
+        }
+
+        public OpenApiReferenceError(OpenApiReference reference, string message) : base("", message)
+        {
+            _reference = reference;
+        }
+    }
+}

src/Microsoft.OpenApi/Services/OpenApiReferenceResolver.cs

@@ -217,13 +217,27 @@ private void ResolveTags(IList<OpenApiTag> tags)
                 }
                 catch (OpenApiException ex)
                 {
-                    _errors.Add(new OpenApiError(ex));
+                    _errors.Add(new OpenApiReferenceError(ex));
                     return null;
                 }
             }
             else if (_resolveRemoteReferences == true)
             {
-                return _currentDocument.Workspace.ResolveReference(reference) as T;
+                if (_currentDocument.Workspace == null)
+                {
+                    _errors.Add(new OpenApiReferenceError(reference,"Cannot resolve external references for documents not in workspaces."));
+                    // Leave as unresolved reference
+                    return new T()
+                    {
+                        UnresolvedReference = true,
+                        Reference = reference
+                    };
+                }
+                var target = _currentDocument.Workspace.ResolveReference(reference);
+
+                // TODO:  If it is a document fragment, then we should resolve it within the current context
+
+                return target as T;
             }
             else
             {

src/Microsoft.OpenApi/Services/OpenApiWorkspace.cs

@@ -35,11 +35,12 @@ public IEnumerable<OpenApiDocument> Documents {
 
         public bool Contains(string location)
         {
-            return true;
+            return _documents.ContainsKey(location);
         }
 
         public void AddDocument(string location, OpenApiDocument  document) 
         {
+            document.Workspace = this;
             _documents.Add(location, document);
         }
 
@@ -48,6 +49,11 @@ public void AddFragment(string location, IOpenApiFragment fragment)
 
         }
 
+        public void AddArtifact<T>(string location, T artifact)
+        {
+
+        }
+
         public IOpenApiReferenceable ResolveReference(OpenApiReference reference)
         {
             if (!_documents.TryGetValue(reference.ExternalResource,out var doc))