Skip to content
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.

Sign up for GitHub

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

Semantic snippets - while snippet #64893

Merged
merged 8 commits into from
Oct 26, 2022
+664 −437
Merged

Semantic snippets - while snippet #64893

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0d98240
Implemented "while" semantic snippet
DoctorKrolic Oct 21, 2022
84cc0b6
Tests
DoctorKrolic Oct 21, 2022
2250a27
Rename to loop
DoctorKrolic Oct 22, 2022
538e050
Move additional filter text to only if snippet
DoctorKrolic Oct 23, 2022
151fe8c
Rename local
DoctorKrolic Oct 24, 2022
1e918e0
Other renames
DoctorKrolic Oct 24, 2022
758e235
Update to while 1
DoctorKrolic Oct 26, 2022
0d9937b
Update to while 2
DoctorKrolic Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
411 changes: 411 additions & 0 deletions ...pletionProviders/Snippets/AbstractCSharpConditionalBlockSnippetCompletionProviderTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

380 changes: 1 addition & 379 deletions ...arpTest/Completion/CompletionProviders/Snippets/CSharpIfSnippetCompletionProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,388 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Completion;
using Microsoft.CodeAnalysis.CSharp.Completion.CompletionProviders.Snippets;
using Microsoft.CodeAnalysis.Snippets;
using Microsoft.CodeAnalysis.Test.Utilities;
using Roslyn.Test.Utilities;
using Xunit;

namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Completion.CompletionProviders.Snippets
{
[Trait(Traits.Feature, Traits.Features.Completion)]
public class CSharpIfSnippetCompletionProviderTests : AbstractCSharpSnippetCompletionProviderTests
public class CSharpIfSnippetCompletionProviderTests : AbstractCSharpConditionalBlockSnippetCompletionProviderTests
{
protected override string ItemToCommit => "if";

[WpfFact]
public async Task InsertIfSnippetInMethodTest()
{
var markupBeforeCommit =
@"class Program
{
public void Method()
{
$$
}
}";

var expectedCodeAfterCommit =
@"class Program
{
public void Method()
{
if (true)
{
$$
}
}
}";
await VerifyCustomCommitProviderAsync(markupBeforeCommit, ItemToCommit, expectedCodeAfterCommit);
}

[WpfFact]
public async Task InsertIfSnippetInGlobalContextTest()
{
var markupBeforeCommit =
@"Ins$$
";

var expectedCodeAfterCommit =
@"if (true)
{
$$
}
";
await VerifyCustomCommitProviderAsync(markupBeforeCommit, ItemToCommit, expectedCodeAfterCommit);
}

[WpfFact]
public async Task NoIfSnippetInBlockNamespaceTest()
{
var markupBeforeCommit =
@"
namespace Namespace
{
$$
class Program
{
public async Task MethodAsync()
{
}
}
}";
await VerifyItemIsAbsentAsync(markupBeforeCommit, ItemToCommit);
}

[WpfFact]
public async Task NoIfSnippetInFileScopedNamespaceTest()
{
var markupBeforeCommit =
@"
namespace Namespace;
$$
class Program
{
public async Task MethodAsync()
{
}
}
";
await VerifyItemIsAbsentAsync(markupBeforeCommit, ItemToCommit);
}

[WpfFact]
public async Task InsertIfSnippetInConstructorTest()
{
var markupBeforeCommit =
@"class Program
{
public Program()
{
var x = 5;
$$
}
}";

var expectedCodeAfterCommit =
@"class Program
{
public Program()
{
var x = 5;
if (true)
{
$$
}
}
}";
await VerifyCustomCommitProviderAsync(markupBeforeCommit, ItemToCommit, expectedCodeAfterCommit);
}

[WpfFact]
public async Task InsertIfSnippettInLocalFunctionTest()
{
var markupBeforeCommit =
@"class Program
{
public void Method()
{
var x = 5;
void LocalMethod()
{
$$
}
}
}";

var expectedCodeAfterCommit =
@"class Program
{
public void Method()
{
var x = 5;
void LocalMethod()
{
if (true)
{
$$
}
}
}
}";
await VerifyCustomCommitProviderAsync(markupBeforeCommit, ItemToCommit, expectedCodeAfterCommit);
}

[WpfFact]
public async Task InsertIfSnippetInAnonymousFunctionTest()
{
var markupBeforeCommit =
@"public delegate void Print(int value);

static void Main(string[] args)
{
Print print = delegate(int val) {
$$
};

}";

var expectedCodeAfterCommit =
@"public delegate void Print(int value);

static void Main(string[] args)
{
Print print = delegate(int val) {
if (true)
{
$$
}
};

}";
await VerifyCustomCommitProviderAsync(markupBeforeCommit, ItemToCommit, expectedCodeAfterCommit);
}

[WpfFact]
public async Task InsertIfSnippetInParenthesizedLambdaExpressionTest()
{
var markupBeforeCommit =
@"Func<int, int, bool> testForEquality = (x, y) =>
{
$$
return x == y;
};";

var expectedCodeAfterCommit =
@"Func<int, int, bool> testForEquality = (x, y) =>
{
if (true)
{
$$
}

return x == y;
};";
await VerifyCustomCommitProviderAsync(markupBeforeCommit, ItemToCommit, expectedCodeAfterCommit);
}

[WpfFact]
public async Task NoIfSnippetInSwitchExpression()
{
var markupBeforeCommit =
@"class Program
{
public void Method()
{
var operation = 2;

var result = operation switch
{
$$
1 => ""Case 1"",
2 => ""Case 2"",
3 => ""Case 3"",
4 => ""Case 4"",
};
}
}";
await VerifyItemIsAbsentAsync(markupBeforeCommit, ItemToCommit);
}

[WpfFact]
public async Task NoIfSnippetInSingleLambdaExpression()
{
var markupBeforeCommit =
@"class Program
{
public void Method()
{
Func<int, int> f = x => $$;
}
}";
await VerifyItemIsAbsentAsync(markupBeforeCommit, ItemToCommit);
}

[WpfFact]
public async Task NoIfSnippetInStringTest()
{
var markupBeforeCommit =
@"class Program
{
public void Method()
{
var str = ""$$"";
}
}";

await VerifyItemIsAbsentAsync(markupBeforeCommit, ItemToCommit);
}

[WpfFact]
public async Task NoIfSnippetInObjectInitializerTest()
{
var markupBeforeCommit =
@"class Program
{
public void Method()
{
var str = new Test($$);
}
}

class Test
{
private string val;

public Test(string val)
{
this.val = val;
}
}";

await VerifyItemIsAbsentAsync(markupBeforeCommit, ItemToCommit);
}

[WpfFact]
public async Task NoIfSnippetInParameterListTest()
{
var markupBeforeCommit =
@"class Program
{
public void Method(int x, $$)
{
}
}";

await VerifyItemIsAbsentAsync(markupBeforeCommit, ItemToCommit);
}

[WpfFact]
public async Task NoIfSnippetInRecordDeclarationTest()
{
var markupBeforeCommit =
@"public record Person
{
$$
public string FirstName { get; init; } = default!;
public string LastName { get; init; } = default!;
};";

await VerifyItemIsAbsentAsync(markupBeforeCommit, ItemToCommit);
}

[WpfFact]
public async Task NoIfSnippetInVariableDeclarationTest()
{
var markupBeforeCommit =
@"class Program
{
public void Method()
{
var x = $$
}
}";

await VerifyItemIsAbsentAsync(markupBeforeCommit, ItemToCommit);
}

[WpfFact]
public async Task InsertIfSnippetWithInvocationBeforeAndAfterCursorTest()
{
var markupBeforeCommit =
@"class Program
{
public void Method()
{
Wr$$Blah
}
}";

var expectedCodeAfterCommit =
@"class Program
{
public void Method()
{
if (true)
{
$$
}
}
}";
await VerifyCustomCommitProviderAsync(markupBeforeCommit, ItemToCommit, expectedCodeAfterCommit);
}

[WpfFact]
public async Task InsertIfSnippetWithInvocationUnderscoreBeforeAndAfterCursorTest()
{
var markupBeforeCommit =
@"class Program
{
public void Method()
{
_Wr$$Blah_
}
}";

var expectedCodeAfterCommit =
@"class Program
{
public void Method()
{
if (true)
{
$$
}
}
}";
await VerifyCustomCommitProviderAsync(markupBeforeCommit, ItemToCommit, expectedCodeAfterCommit);
}
}
}
Loading