Repl fixes (#462)

* Update ReplPromptCallbacks.cs * Update ReplSessionTests.cs * Update SemanticModel.cs
Draco-lang · Sep 1, 2024 · 3bc7edd · 3bc7edd
1 parent ff864c8
commit 3bc7edd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/src/Draco.Compiler.Tests/Scripting/ReplSessionTests.cs b/src/Draco.Compiler.Tests/Scripting/ReplSessionTests.cs
@@ -24,6 +24,8 @@ public void BasicExpressions(string input, object? output)
     }
 
     [InlineData("func add(x: int32, y: int32) = x + y;")]
+    [InlineData("List()")]
+    [InlineData("System.Collections.Generic.List()")]
     [Theory]
     public void InvalidEntries(string input)
     {

diff --git a/src/Draco.Compiler/Api/Semantics/SemanticModel.cs b/src/Draco.Compiler/Api/Semantics/SemanticModel.cs
@@ -81,6 +81,7 @@ private ImmutableArray<Diagnostic> GetDiagnostics(SourceSpan? span = null)
             {
             case CompilationUnitSyntax:
             case FunctionDeclarationSyntax:
+            case ScriptEntrySyntax:
             {
                 containingSymbol?.Bind(this);
                 break;

diff --git a/src/Draco.Repl/ReplPromptCallbacks.cs b/src/Draco.Repl/ReplPromptCallbacks.cs
@@ -66,27 +66,13 @@ protected override Task<IReadOnlyList<CompletionItem>> GetCompletionItemsAsync(
         var semanticModel = script.Compilation.GetSemanticModel(tree);
 
         var cursorPosition = tree.IndexToSyntaxPosition(caret);
-        var tokenAtCaret = tree.Root
-            .TraverseSubtreesAtCursorPosition(cursorPosition)
-            .OfType<SyntaxToken>()
-            .LastOrDefault();
 
         var completionItems = this.completionService.GetCompletions(semanticModel, caret);
 
         var result = new List<CompletionItem>();
         foreach (var item in completionItems)
         {
             var replacementText = item.Edits[0].Text;
-
-            if (tokenAtCaret is not null && tokenAtCaret.Text.Length > 0)
-            {
-                // We can filter by prefix here
-                if (!replacementText.StartsWith(tokenAtCaret.Text, StringComparison.OrdinalIgnoreCase))
-                {
-                    continue;
-                }
-            }
-
             var coloring = CompletionKindToSyntaxColoring(item.Kind);
             var format = configuration.SyntaxColors.Get(coloring);
             var completion = new CompletionItem(
@@ -97,6 +83,20 @@ protected override Task<IReadOnlyList<CompletionItem>> GetCompletionItemsAsync(
         return Task.FromResult<IReadOnlyList<CompletionItem>>(result);
     }
 
+    protected override Task<bool> ShouldOpenCompletionWindowAsync(
+        string text, int caret, KeyPress keyPress, CancellationToken cancellationToken)
+    {
+        var script = this.MakeScript(text);
+        var tree = script.Compilation.SyntaxTrees.Single();
+        var semanticModel = script.Compilation.GetSemanticModel(tree);
+
+        var cursorPosition = tree.IndexToSyntaxPosition(caret);
+
+        var completionItems = this.completionService.GetCompletions(semanticModel, caret);
+
+        return Task.FromResult(completionItems.Any());
+    }
+
     private Script<object?> MakeScript(string text) => Script.Create(
         code: text,
         globalImports: session.GlobalImports,