-
Notifications
You must be signed in to change notification settings - Fork 144
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixing autocomplete #278
Merged
Merged
Fixing autocomplete #278
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
65e382d
Refactoring - adding some sense into tuples
nothrow 1afcb9e
Refactoring - adding unit tests project
nothrow 63a4d9e
Test for AutocompleteTokenizer
nothrow 6d04a9f
Added unit test for broken behavior
nothrow f8425d5
Fixing the case sensitivity in autocomplete
nothrow 7105ce5
PR fixes
nothrow File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
| using FluentAssertions; | ||
| using SwqlStudio.Autocomplete; | ||
| using Xunit; | ||
|
|
||
| namespace SwqlStudio.Tests | ||
| { | ||
| public class AutocompleteProviderTest | ||
| { | ||
| [Theory] | ||
| [MemberData(nameof(DoTheParsing_TestCases))] | ||
| public void DoTheParsing_IdentifiesAliases(string query, Dictionary<string, string> expected) | ||
| { | ||
| var provider = new AutocompleteProvider(query); | ||
| var aliases = new Dictionary<string, string>(); | ||
| provider.DoTheParsing(9, aliases); | ||
|
|
||
| aliases.Should().BeEquivalentTo(expected); | ||
| } | ||
|
|
||
| public static IEnumerable<object[]> DoTheParsing_TestCases() | ||
| { | ||
| yield return new object[] | ||
| { | ||
| "select n. from Orion.Nodes n inner join Orion.Interfaces as i", | ||
| new Dictionary<string, string> {["n"] = "Orion.Nodes", ["i"] = "Orion.Interfaces"} | ||
| }; | ||
|
|
||
| yield return new object[] | ||
| { | ||
| "SELECT n. FROM Orion.Nodes n INNER JOIN Orion.Interfaces AS i", | ||
| new Dictionary<string, string> {["n"] = "Orion.Nodes", ["i"] = "Orion.Interfaces"} | ||
| }; | ||
|
|
||
| yield return new object[] | ||
| { | ||
| "select n. from Orion.Nodes n", | ||
| new Dictionary<string, string> {["n"] = "Orion.Nodes"} | ||
| }; | ||
|
|
||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
| using FluentAssertions; | ||
| using SwqlStudio.Autocomplete; | ||
| using Xunit; | ||
|
|
||
| namespace SwqlStudio.Tests | ||
| { | ||
| public class AutocompleteTokenizerTest | ||
| { | ||
| [Fact] | ||
| public void TokenizerTestSuite() | ||
| { | ||
| var tokenizer = new AutocompleteTokenizer( | ||
| "SELECT n. Orion.Nodes 123 \"abc\""); | ||
|
|
||
| IEnumerable<(int Position, int Length, AutocompleteTokenizer.Token Token)> Enumerate() | ||
| { | ||
| foreach(var t in tokenizer) | ||
| yield return t; | ||
| } | ||
|
|
||
| Enumerate().Should().BeEquivalentTo(new [] | ||
| { | ||
| (0, 6, AutocompleteTokenizer.Token.Identifier), | ||
| (7, 1, AutocompleteTokenizer.Token.Identifier), | ||
| (8, 1, AutocompleteTokenizer.Token.Special), | ||
| (10, 5, AutocompleteTokenizer.Token.Identifier), | ||
| (15, 1, AutocompleteTokenizer.Token.Special), | ||
| (16, 5, AutocompleteTokenizer.Token.Identifier), | ||
| (22, 4, AutocompleteTokenizer.Token.Number), | ||
| (26, 5, AutocompleteTokenizer.Token.String), | ||
| (31, 0, AutocompleteTokenizer.Token.EOF), | ||
| }); | ||
|
|
||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net48</TargetFramework> | ||
|
|
||
| <IsPackable>false</IsPackable> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="FluentAssertions" Version="5.10.3" /> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" /> | ||
| <PackageReference Include="xunit" Version="2.4.1" /> | ||
| <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="coverlet.collector" Version="1.3.0"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\Src\SwqlStudio\SwqlStudio.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That makes it so much easier to read. Thanks!