Update preview image

PaddiM8 · Aug 25, 2024 · bc7c591 · bc7c591
1 parent d1cfd07
commit bc7c591
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 14 deletions.
diff --git a/docs/preview.png b/docs/preview.png
diff --git a/editors/vscode/src/extension.ts b/editors/vscode/src/extension.ts
@@ -12,7 +12,7 @@ let client: LanguageClient;
 export async function activate(context: ExtensionContext) {
     const serverOptions: ServerOptions = {
         run: {
-            command: "elk --lsp",
+            command: "elk-lsp",
             transport: TransportKind.stdio,
         },
         debug: {

diff --git a/preview.png b/preview.png
diff --git a/src/ElkProgram.cs b/src/ElkProgram.cs
@@ -112,6 +112,7 @@ out var error
             {
                 SemanticTokens = semanticTokens,
                 Diagnostics = diagnostics,
+                Ast = ast,
             };
         }
     }
@@ -125,9 +126,13 @@ internal static EvaluationResult Evaluate(
         Debug.Assert(scope.ModuleScope is not { Ast: null });
 
         var generated = GeneratePages(ast, scope, analysisScope, virtualMachine).ToList();
-        var result = generated
-            .Select(pair => virtualMachine?.Execute(pair.page))
-            .LastOrDefault();
+        RuntimeObject? result = null;
+        if (virtualMachine != null)
+        {
+            result = generated
+                .Select(pair => virtualMachine.Execute(pair.page!))
+                .LastOrDefault();
+        }
 
         return new EvaluationResult
         {
@@ -136,7 +141,7 @@ internal static EvaluationResult Evaluate(
         };
     }
 
-    private static IEnumerable<(Ast analysedAst, Page page)> GeneratePages(
+    private static IEnumerable<(Ast analysedAst, Page? page)> GeneratePages(
         Ast ast,
         Scope scope,
         AnalysisScope analysisScope,
@@ -154,16 +159,12 @@ internal static EvaluationResult Evaluate(
             .Concat(EvaluateModules(scope.ModuleScope.Modules, virtualMachine));
 
         var analysedAst = Analyser.Analyse(ast, scope.ModuleScope, analysisScope);
-        if (virtualMachine != null)
-        {
-            var result = virtualMachine.Generate(analysedAst);
-            pages = pages.Append((analysedAst, result));
-        }
+        var result = virtualMachine?.Generate(analysedAst);
 
-        return pages;
+        return pages.Append((analysedAst, result));
     }
 
-    private static IEnumerable<(Ast, Page)> EvaluateModules(
+    private static IEnumerable<(Ast, Page?)> EvaluateModules(
         IEnumerable<ModuleScope> modules,
         VirtualMachine? virtualMachine)
     {

diff --git a/src/Parsing/AstNodes.cs b/src/Parsing/AstNodes.cs
@@ -457,7 +457,7 @@ public class CallExpr(
     Scope scope,
     TextPos endPos)
     : Expr(
-        modulePath.FirstOrDefault()?.Position ?? identifier.Position,
+        GetStartPosition(modulePath, identifier, arguments),
         endPos,
         scope
     )
@@ -491,7 +491,19 @@ public class CallExpr(
     public FunctionExpr? EnclosingClosureProvidingFunction { get; init; }
 
     public override IEnumerable<Expr> ChildExpressions
-        => Arguments;
+        => PipedToProgram == null
+            ? Arguments
+            : Arguments.Prepend(PipedToProgram);
+
+    private static TextPos GetStartPosition(IList<Token> modulePath, Token identifier, IList<Expr> arguments)
+    {
+        var callPos = modulePath.FirstOrDefault()?.Position ?? identifier.Position;
+        var firstArgumentPosition = arguments.FirstOrDefault()?.StartPosition;
+
+        return firstArgumentPosition?.Index < callPos.Index
+            ? firstArgumentPosition
+            : callPos;
+    }
 }
 
 public class LiteralExpr(Token value, Scope scope)