Add a SourceTextProvider abstraction and use it for workspaces.

Also remove PhysicalWorkspace as it no longer serves a purpose.

Author: alexrp

src/driver/Verbs/RunVerb.cs

@@ -24,7 +24,7 @@ protected override async ValueTask<int> RunAsync(CancellationToken cancellationT
 
         if (workspace.GetEntryPointDocument() is not { } doc)
             throw new DriverException(
-                $"No entry point document named '{PhysicalWorkspace.EntryPointDocumentName}' found in the workspace.");
+                $"No entry point document named '{WorkspaceDocument.EntryPointPath}' found in the workspace.");
 
         // TODO: Run the program.
 

src/driver/Verbs/Verb.cs

@@ -50,7 +50,8 @@ protected static async ValueTask<Workspace> OpenWorkspaceAsync(
         {
             try
             {
-                workspace = await ProjectWorkspace.OpenAsync(directory, disableAnalysis, cancellationToken);
+                workspace = await ProjectWorkspace.OpenAsync(
+                    directory, PhysicalSourceTextProvider.Instance, disableAnalysis, cancellationToken);
             }
             catch (PathTooLongException)
             {
@@ -82,7 +83,7 @@ protected static async ValueTask<Workspace> OpenWorkspaceAsync(
         catch (FileNotFoundException)
         {
             // No configuration file, so try a simple workspace.
-            workspace = SimpleWorkspace.Open(directory, disableAnalysis);
+            workspace = SimpleWorkspace.Open(directory, PhysicalSourceTextProvider.Instance, disableAnalysis);
         }
 
         PhysicalWorkspaceWatcher.Populate(workspace);

src/driver/Workspaces/ScriptWorkspace.cs

@@ -1,9 +1,9 @@
 namespace Vezel.Celerity.Driver.Workspaces;
 
-internal sealed class ScriptWorkspace : PhysicalWorkspace
+internal sealed class ScriptWorkspace : Workspace
 {
     public ScriptWorkspace(string file)
-        : base(System.IO.Path.GetDirectoryName(file)!)
+        : base(System.IO.Path.GetDirectoryName(file)!, PhysicalSourceTextProvider.Instance)
     {
         new ManualWorkspaceWatcher(this).AddDocument(System.IO.Path.GetFileName(file));
     }

src/language/tooling/Workspaces/PhysicalSourceTextProvider.cs

@@ -0,0 +1,27 @@
+namespace Vezel.Celerity.Language.Tooling.Workspaces;
+
+public sealed class PhysicalSourceTextProvider : SourceTextProvider
+{
+    public static PhysicalSourceTextProvider Instance { get; } = new();
+
+    private PhysicalSourceTextProvider()
+    {
+    }
+
+    protected internal override ValueTask<SourceText> GetTextAsync(
+        Workspace workspace, string path, CancellationToken cancellationToken)
+    {
+        Check.Null(workspace);
+        Check.Argument(WorkspaceWatcher.IsValidPath(path), path);
+
+        return GetTextAsync();
+
+        [AsyncMethodBuilder(typeof(PoolingAsyncValueTaskMethodBuilder<>))]
+        async ValueTask<SourceText> GetTextAsync()
+        {
+            return new StringSourceText(
+                path, await File.ReadAllTextAsync(Path.Join(workspace.Path, path), cancellationToken)
+                .ConfigureAwait(false));
+        }
+    }
+}

src/language/tooling/Workspaces/PhysicalWorkspace.cs

@@ -2,7 +2,7 @@
 
 namespace Vezel.Celerity.Language.Tooling.Workspaces;
 
-public sealed class ProjectWorkspace : PhysicalWorkspace
+public sealed class ProjectWorkspace : Workspace
 {
     public const string ConfigurationFileName = "celerity.json";
 
@@ -12,23 +12,26 @@ public sealed class ProjectWorkspace : PhysicalWorkspace
 
     private readonly bool _disableAnalysis;
 
-    private ProjectWorkspace(string path, ProjectConfiguration configuration, bool disableAnalysis)
-        : base(path)
+    private ProjectWorkspace(
+        string path, SourceTextProvider textProvider, ProjectConfiguration configuration, bool disableAnalysis)
+        : base(path, textProvider)
     {
         Configuration = configuration;
         _sourceDirectory = new(System.IO.Path.Join(path, configuration.SourcePath));
         _disableAnalysis = disableAnalysis;
     }
 
-    public static ValueTask<ProjectWorkspace> OpenAsync(string path, CancellationToken cancellationToken = default)
+    public static ValueTask<ProjectWorkspace> OpenAsync(
+        string path, SourceTextProvider textProvider, CancellationToken cancellationToken = default)
     {
-        return OpenAsync(path, false, cancellationToken);
+        return OpenAsync(path, textProvider, false, cancellationToken);
     }
 
     public static ValueTask<ProjectWorkspace> OpenAsync(
-        string path, bool disableAnalysis, CancellationToken cancellationToken = default)
+        string path, SourceTextProvider textProvider, bool disableAnalysis, CancellationToken cancellationToken = default)
     {
         Check.Null(path);
+        Check.Null(textProvider);
 
         return OpenAsync();
 
@@ -43,7 +46,7 @@ async ValueTask<ProjectWorkspace> OpenAsync()
             await using (stream.ConfigureAwait(false))
                 cfg = await ProjectConfiguration.LoadAsync(stream, cancellationToken).ConfigureAwait(false);
 
-            return new(path, cfg, disableAnalysis);
+            return new(path, textProvider, cfg, disableAnalysis);
         }
     }
 
@@ -59,7 +62,7 @@ protected override WorkspaceDocumentAttributes GetDocumentAttributes(string path
             ? WorkspaceDocumentAttributes.DisableAnalyzers | WorkspaceDocumentAttributes.SuppressDiagnostics
             : WorkspaceDocumentAttributes.None;
 
-        if ((file.DirectoryName, file.Name) == (_sourceDirectory.FullName, EntryPointDocumentName))
+        if ((file.DirectoryName, file.Name) == (_sourceDirectory.FullName, WorkspaceDocument.EntryPointPath))
             return WorkspaceDocumentAttributes.EntryPoint | srcAttrs;
 
         var current = file.Directory;

src/language/tooling/Workspaces/ProjectWorkspace.cs

@@ -1,6 +1,6 @@
 namespace Vezel.Celerity.Language.Tooling.Workspaces;
 
-public sealed class SimpleWorkspace : PhysicalWorkspace
+public sealed class SimpleWorkspace : Workspace
 {
     private static readonly IEnumerable<DiagnosticAnalyzer> _diagnosticAnalyzers = new[]
     {
@@ -9,15 +9,15 @@ public sealed class SimpleWorkspace : PhysicalWorkspace
 
     private readonly bool _disableAnalysis;
 
-    private SimpleWorkspace(string path, bool disableAnalysis)
-        : base(path)
+    private SimpleWorkspace(string path, SourceTextProvider textProvider, bool disableAnalysis)
+        : base(path, textProvider)
     {
         _disableAnalysis = disableAnalysis;
     }
 
-    public static SimpleWorkspace Open(string path, bool disableAnalysis = false)
+    public static SimpleWorkspace Open(string path, SourceTextProvider textProvider, bool disableAnalysis = false)
     {
-        return new(path, disableAnalysis);
+        return new(path, textProvider, disableAnalysis);
     }
 
     protected internal override IEnumerable<DiagnosticAnalyzer> GetDiagnosticAnalyzers()
@@ -27,7 +27,7 @@ protected internal override IEnumerable<DiagnosticAnalyzer> GetDiagnosticAnalyze
 
     protected override WorkspaceDocumentAttributes GetDocumentAttributes(string path)
     {
-        var attrs = path == EntryPointDocumentName
+        var attrs = path == WorkspaceDocument.EntryPointPath
             ? WorkspaceDocumentAttributes.EntryPoint
             : WorkspaceDocumentAttributes.None;
 

src/language/tooling/Workspaces/SimpleWorkspace.cs

@@ -0,0 +1,7 @@
+namespace Vezel.Celerity.Language.Tooling.Workspaces;
+
+public abstract class SourceTextProvider
+{
+    protected internal abstract ValueTask<SourceText> GetTextAsync(
+        Workspace workspace, string path, CancellationToken cancellationToken);
+}

src/language/tooling/Workspaces/SourceTextProvider.cs

@@ -28,6 +28,8 @@ public event Action<WorkspaceDocument>? DocumentRemoved
 
     public string Path { get; }
 
+    public SourceTextProvider TextProvider { get; }
+
     public ImmutableDictionary<string, WorkspaceDocument> Documents { get; private set; } =
         ImmutableDictionary<string, WorkspaceDocument>.Empty;
 
@@ -39,11 +41,13 @@ public event Action<WorkspaceDocument>? DocumentRemoved
 
     private readonly Event<WorkspaceDocument> _documentRemoved = new();
 
-    protected Workspace(string path)
+    protected Workspace(string path, SourceTextProvider textProvider)
     {
         Check.Null(path);
+        Check.Null(textProvider);
 
         Path = path;
+        TextProvider = textProvider;
     }
 
     public WorkspaceDocument? GetEntryPointDocument()
@@ -52,8 +56,6 @@ protected Workspace(string path)
             static doc => doc.Attributes.HasFlag(WorkspaceDocumentAttributes.EntryPoint));
     }
 
-    protected internal abstract ValueTask<SourceText> LoadTextAsync(string path, CancellationToken cancellationToken);
-
     protected internal abstract IEnumerable<DiagnosticAnalyzer> GetDiagnosticAnalyzers();
 
     protected abstract WorkspaceDocumentAttributes GetDocumentAttributes(string path);

src/language/tooling/Workspaces/Workspace.cs

@@ -4,6 +4,8 @@ namespace Vezel.Celerity.Language.Tooling.Workspaces;
 
 public sealed class WorkspaceDocument
 {
+    public const string EntryPointPath = "main.cel";
+
     public Workspace Workspace { get; }
 
     public WorkspaceDocumentAttributes Attributes { get; }
@@ -63,8 +65,8 @@ async ValueTask<SourceText> GetTextAsync()
                 case SemanticTree semantics:
                     return semantics.Syntax.GetText();
                 case var path:
-                    var state = await Workspace.LoadTextAsync(Unsafe.As<string>(path), cancellationToken)
-                        .ConfigureAwait(false);
+                    var state = await Workspace.TextProvider.GetTextAsync(
+                        Workspace, Unsafe.As<string>(path), cancellationToken).ConfigureAwait(false);
 
                     Check.Operation(state != null);